From 1cb027950adcc23ce020e2839eef45edf0b51bd0 Mon Sep 17 00:00:00 2001 From: Hanjun Guo Date: Fri, 13 Nov 2020 11:11:13 +0800 Subject: [PATCH] drm/amdkfd: Move the ignore_crat check before the CRAT table get If the ignore_crat is set to non-zero value, it's no point getting the CRAT table, so just move the ignore_crat check before we get the CRAT table. Signed-off-by: Hanjun Guo Reviewed-by: Felix Kuehling Signed-off-by: Felix Kuehling Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c index a0acf23..e0d354b 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_crat.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_crat.c @@ -786,6 +786,11 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size) *crat_image = NULL; + if (kfd_ignore_crat()) { + pr_info("CRAT table disabled by module option\n"); + return -ENODATA; + } + /* Fetch the CRAT table from ACPI */ status = acpi_get_table(CRAT_SIGNATURE, 0, &crat_table); if (status == AE_NOT_FOUND) { @@ -798,11 +803,6 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size) return -EINVAL; } - if (kfd_ignore_crat()) { - pr_info("CRAT table disabled by module option\n"); - return -ENODATA; - } - pcrat_image = kvmalloc(crat_table->length, GFP_KERNEL); if (!pcrat_image) return -ENOMEM; -- 2.7.4