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 f4e4d7b..d600977 100644 (file)
--- 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)