drm/amd/display: DMUB Firmware Load by PSP

Signed-off-by: Hersen Wu <hersenxs.wu@amd.com>
Signed-off-by: Jerry (Fangzhi) Zuo <Jerry.Zuo@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 985ffceb677498757ad6b2ab0d014c99e2276ec1..7283c990d1308b4e1ec5da40effc2767c07cdcf3 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -801,10 +801,20 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev)
 
        fw_bss_data_size = le32_to_cpu(hdr->bss_data_bytes);
 
-       memcpy(fb_info->fb[DMUB_WINDOW_0_INST_CONST].cpu_addr, fw_inst_const,
-              fw_inst_const_size);
+       /* if adev->firmware.load_type == AMDGPU_FW_LOAD_PSP,
+        * amdgpu_ucode_init_single_fw will load dmub firmware
+        * fw_inst_const part to cw0; otherwise, the firmware back door load
+        * will be done by dm_dmub_hw_init
+        */
+       if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
+               memcpy(fb_info->fb[DMUB_WINDOW_0_INST_CONST].cpu_addr, fw_inst_const,
+                               fw_inst_const_size);
+       }
+
        memcpy(fb_info->fb[DMUB_WINDOW_2_BSS_DATA].cpu_addr, fw_bss_data,
               fw_bss_data_size);
+
+       /* Copy firmware bios info into FB memory. */
        memcpy(fb_info->fb[DMUB_WINDOW_3_VBIOS].cpu_addr, adev->bios,
               adev->bios_size);