diff options
Diffstat (limited to 'meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0652-drm-amdgpu-extract-common-code-in-vi_common_early_in.patch')
| -rw-r--r-- | meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0652-drm-amdgpu-extract-common-code-in-vi_common_early_in.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0652-drm-amdgpu-extract-common-code-in-vi_common_early_in.patch b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0652-drm-amdgpu-extract-common-code-in-vi_common_early_in.patch new file mode 100644 index 00000000..8f120577 --- /dev/null +++ b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto/0652-drm-amdgpu-extract-common-code-in-vi_common_early_in.patch @@ -0,0 +1,56 @@ +From 36005076f5c979627c07fc0dda60e03748bf3c08 Mon Sep 17 00:00:00 2001 +From: Flora Cui <Flora.Cui@amd.com> +Date: Mon, 2 Nov 2015 21:15:55 +0800 +Subject: [PATCH 0652/1050] drm/amdgpu: extract common code in + vi_common_early_init + +Change-Id: I9ed25353c559e27bc1b1d5b50f977b0ff03de87f +Signed-off-by: Flora Cui <Flora.Cui@amd.com> +Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/vi.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c +index d8c93f14..9e379e5 100644 +--- a/drivers/gpu/drm/amd/amdgpu/vi.c ++++ b/drivers/gpu/drm/amd/amdgpu/vi.c +@@ -1413,8 +1413,6 @@ static int vi_common_early_init(void *handle) + adev->cg_flags = 0; + adev->pg_flags = 0; + adev->external_rev_id = 0x1; +- if (amdgpu_smc_load_fw && smc_enabled) +- adev->firmware.smu_load = true; + break; + case CHIP_FIJI: + case CHIP_TONGA: +@@ -1422,8 +1420,6 @@ static int vi_common_early_init(void *handle) + adev->cg_flags = 0; + adev->pg_flags = 0; + adev->external_rev_id = adev->rev_id + 0x14; +- if (amdgpu_smc_load_fw && smc_enabled) +- adev->firmware.smu_load = true; + break; + case CHIP_CARRIZO: + case CHIP_STONEY: +@@ -1432,14 +1428,15 @@ static int vi_common_early_init(void *handle) + /* Disable UVD pg */ + adev->pg_flags = /* AMDGPU_PG_SUPPORT_UVD | */AMDGPU_PG_SUPPORT_VCE; + adev->external_rev_id = adev->rev_id + 0x1; +- if (amdgpu_smc_load_fw && smc_enabled) +- adev->firmware.smu_load = true; + break; + default: + /* FIXME: not supported yet */ + return -EINVAL; + } + ++ if (amdgpu_smc_load_fw && smc_enabled) ++ adev->firmware.smu_load = true; ++ + return 0; + } + +-- +1.9.1 + |