aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0186-drm-amdgpu-load-MEC-ucode-manually-on-iceland.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0186-drm-amdgpu-load-MEC-ucode-manually-on-iceland.patch')
-rw-r--r--common/recipes-kernel/linux/files/0186-drm-amdgpu-load-MEC-ucode-manually-on-iceland.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/common/recipes-kernel/linux/files/0186-drm-amdgpu-load-MEC-ucode-manually-on-iceland.patch b/common/recipes-kernel/linux/files/0186-drm-amdgpu-load-MEC-ucode-manually-on-iceland.patch
deleted file mode 100644
index e0a5c61a..00000000
--- a/common/recipes-kernel/linux/files/0186-drm-amdgpu-load-MEC-ucode-manually-on-iceland.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b834b8493dec3194a848f9b4656de2378ad7b4f8 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Tue, 2 Feb 2016 16:22:15 -0500
-Subject: [PATCH 0186/1110] drm/amdgpu: load MEC ucode manually on iceland
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The smc doesn't handle it.
-
-Reviewed-by: Ken Wang <Qingqing.Wang@amd.com>
-Reviewed-by: Christian König <christian.koenig@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
----
- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-index 64a070e..1cb5741 100644
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-@@ -3851,10 +3851,16 @@ static int gfx_v8_0_cp_resume(struct amdgpu_device *adev)
- if (r)
- return -EINVAL;
-
-- r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
-- AMDGPU_UCODE_ID_CP_MEC1);
-- if (r)
-- return -EINVAL;
-+ if (adev->asic_type == CHIP_TOPAZ) {
-+ r = gfx_v8_0_cp_compute_load_microcode(adev);
-+ if (r)
-+ return r;
-+ } else {
-+ r = adev->smu.smumgr_funcs->check_fw_load_finish(adev,
-+ AMDGPU_UCODE_ID_CP_MEC1);
-+ if (r)
-+ return -EINVAL;
-+ }
- }
- }
-
---
-2.7.4
-