From: Hawking Zhang <Hawking.Zhang@amd.com>
Date: Wed, 12 Dec 2018 17:29:53 +0000 (+0800)
Subject: drm/amdgpu/psp: skip mec jt when autoload is enabled
X-Git-Tag: v5.3-rc1~81^2~10^2~386
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=119eb6db542f9d81ba9e488175ac171f3b29aee2;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index f4e4d7b918c8d..d6009772ad8d6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -939,6 +939,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)