aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0658-drm-amdgpu-extract-common-code-in-vi_common_early_in.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0658-drm-amdgpu-extract-common-code-in-vi_common_early_in.patch')
-rw-r--r--common/recipes-kernel/linux/files/0658-drm-amdgpu-extract-common-code-in-vi_common_early_in.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/common/recipes-kernel/linux/files/0658-drm-amdgpu-extract-common-code-in-vi_common_early_in.patch b/common/recipes-kernel/linux/files/0658-drm-amdgpu-extract-common-code-in-vi_common_early_in.patch
deleted file mode 100644
index 66fd0181..00000000
--- a/common/recipes-kernel/linux/files/0658-drm-amdgpu-extract-common-code-in-vi_common_early_in.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From a3d08fa56b2b867460e58ecdb649b49804aaa5fd 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 0658/1565] 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 9904761..2e52f3e 100644
---- a/drivers/gpu/drm/amd/amdgpu/vi.c
-+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
-@@ -1410,8 +1410,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:
-@@ -1419,8 +1417,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:
-@@ -1429,14 +1425,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
-