drm/amd/display: Don't ask PSP to load DMCUB for backdoor load

[Why]
If we're doing backdoor load then do it entirely ourselves without
invoking any of the frontdoor path to avoid potential issues with
outdated tOS.

[How]
Check the load type and don't pass it to base if we don't want it
loaded.

Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: Hersen Wu <hersenxs.wu@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 7283c990d1308b4e1ec5da40effc2767c07cdcf3..d09fabeee58f130d38c3326dc90c8bf2a5c41276 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1207,16 +1207,20 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev)
        }
 
        hdr = (const struct dmcub_firmware_header_v1_0 *)adev->dm.dmub_fw->data;
-       adev->firmware.ucode[AMDGPU_UCODE_ID_DMCUB].ucode_id =
-               AMDGPU_UCODE_ID_DMCUB;
-       adev->firmware.ucode[AMDGPU_UCODE_ID_DMCUB].fw = adev->dm.dmub_fw;
-       adev->firmware.fw_size +=
-               ALIGN(le32_to_cpu(hdr->inst_const_bytes), PAGE_SIZE);
 
-       adev->dm.dmcub_fw_version = le32_to_cpu(hdr->header.ucode_version);
+       if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
+               adev->firmware.ucode[AMDGPU_UCODE_ID_DMCUB].ucode_id =
+                       AMDGPU_UCODE_ID_DMCUB;
+               adev->firmware.ucode[AMDGPU_UCODE_ID_DMCUB].fw =
+                       adev->dm.dmub_fw;
+               adev->firmware.fw_size +=
+                       ALIGN(le32_to_cpu(hdr->inst_const_bytes), PAGE_SIZE);
 
-       DRM_INFO("Loading DMUB firmware via PSP: version=0x%08X\n",
-                adev->dm.dmcub_fw_version);
+               DRM_INFO("Loading DMUB firmware via PSP: version=0x%08X\n",
+                        adev->dm.dmcub_fw_version);
+       }
+
+       adev->dm.dmcub_fw_version = le32_to_cpu(hdr->header.ucode_version);
 
        adev->dm.dmub_srv = kzalloc(sizeof(*adev->dm.dmub_srv), GFP_KERNEL);
        dmub_srv = adev->dm.dmub_srv;