1 files changed, 37 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2208-drm-amdgpu-psp-skip-mec-jt-when-autoload-is-enabled.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2208-drm-amdgpu-psp-skip-mec-jt-when-autoload-is-enabled.patch
new file mode 100644
index 00000000..1fd9cea0
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2208-drm-amdgpu-psp-skip-mec-jt-when-autoload-is-enabled.patch
@@ -0,0 +1,37 @@
+From a94aeb4bbf90ca70d96a4f7384c0cff614f815d6 Mon Sep 17 00:00:00 2001
+From: Hawking Zhang <Hawking.Zhang@amd.com>
+Date: Thu, 13 Dec 2018 01:29:53 +0800
+Subject: [PATCH 2208/2940] drm/amdgpu/psp: skip mec jt when autoload is
+ enabled
+
+When autoload is enabled, there is no need to load mec jt,
+RLC will handle it automatically
+
+Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
+Acked-by: Alex Deucher <alexander.deucher@amd.com>
+Reviewed-by: Jack Xiao <Jack.Xiao@amd.com>
+Reviewed-by: Le Ma <Le.Ma@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+index 73f44e0fca6a..164fcf9f1c64 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+@@ -942,6 +942,11 @@ static int psp_np_fw_load(struct psp_context *psp)
+ 		    || ucode->ucode_id == AMDGPU_UCODE_ID_RLC_G))
+ 			/*skip ucode loading in SRIOV VF */
+ 			continue;
++		if (psp->autoload_supported &&
++		    (ucode->ucode_id == AMDGPU_UCODE_ID_CP_MEC1_JT ||
++		     ucode->ucode_id == AMDGPU_UCODE_ID_CP_MEC2_JT))
++			/* skip mec JT when autoload is enabled */
++			continue;
+ 
+ 		ret = psp_prep_load_ip_fw_cmd_buf(ucode, psp->cmd);
+ 		if (ret)
+-- 
+2.17.1
+