aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3877-drm-amdgpu-do-not-init-mec2-jt-for-renoir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3877-drm-amdgpu-do-not-init-mec2-jt-for-renoir.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3877-drm-amdgpu-do-not-init-mec2-jt-for-renoir.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3877-drm-amdgpu-do-not-init-mec2-jt-for-renoir.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3877-drm-amdgpu-do-not-init-mec2-jt-for-renoir.patch
new file mode 100644
index 00000000..adf65e5d
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3877-drm-amdgpu-do-not-init-mec2-jt-for-renoir.patch
@@ -0,0 +1,53 @@
+From a0c73b31b3802cae76bb4c0ac73b97359ba75909 Mon Sep 17 00:00:00 2001
+From: Hawking Zhang <Hawking.Zhang@amd.com>
+Date: Wed, 18 Sep 2019 06:46:54 +0800
+Subject: [PATCH 3877/4256] drm/amdgpu: do not init mec2 jt for renoir
+
+For ASICs like renoir/arct, driver doesn't need to load mec2 jt.
+when mec1 jt is loaded, mec2 jt will be loaded automatically
+since the write is actaully broadcasted to both.
+
+We need to more time to test other gfx9 asic. but for now we should
+be able to draw conclusion that mec2 jt is not needed for renoir and
+arct.
+
+Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
+Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 ----
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 ++-
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+index f09d8cc6e557..1963e11a37c0 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+@@ -1399,10 +1399,6 @@ static int psp_np_fw_load(struct psp_context *psp)
+ ucode->ucode_id == AMDGPU_UCODE_ID_CP_MEC2_JT))
+ /* skip mec JT when autoload is enabled */
+ continue;
+- /* Renoir only needs to load mec jump table one time */
+- if (adev->asic_type == CHIP_RENOIR &&
+- ucode->ucode_id == AMDGPU_UCODE_ID_CP_MEC2_JT)
+- continue;
+
+ psp_print_fw_hdr(psp, ucode);
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+index 08f5ca346d71..946e21869a8e 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+@@ -1320,7 +1320,8 @@ static int gfx_v9_0_init_cp_compute_microcode(struct amdgpu_device *adev,
+
+ /* TODO: Determine if MEC2 JT FW loading can be removed
+ for all GFX V9 asic and above */
+- if (adev->asic_type != CHIP_ARCTURUS) {
++ if (adev->asic_type != CHIP_ARCTURUS &&
++ adev->asic_type != CHIP_RENOIR) {
+ info = &adev->firmware.ucode[AMDGPU_UCODE_ID_CP_MEC2_JT];
+ info->ucode_id = AMDGPU_UCODE_ID_CP_MEC2_JT;
+ info->fw = adev->gfx.mec2_fw;
+--
+2.17.1
+