Commit 1cb02795 authored by Hanjun Guo's avatar Hanjun Guo Committed by Alex Deucher
Browse files

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: default avatarHanjun Guo <guohanjun@huawei.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7a489407

drivers/gpu/drm/amd/amdkfd/kfd_crat.c

+5 −5
Original line number Diff line number Diff line
@@ -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;