drm/amdgpu/vcn: update ucode setup

Use common amdgpu_vcn_setup_ucode for ucode setup.

Signed-off-by: James Zhu <James.Zhu@amd.com>
Acked-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
index ddd844cca02e5dc123f1825e6c732703dedaab60..5eaaac531ab6673a72c0a816e7a83da0b4ea265d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
@@ -87,16 +87,7 @@ static int vcn_v4_0_3_sw_init(void *handle)
        if (r)
                return r;
 
-       if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
-               const struct common_firmware_header *hdr;
-               hdr = (const struct common_firmware_header *)adev->vcn.fw->data;
-               adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].ucode_id = AMDGPU_UCODE_ID_VCN;
-               adev->firmware.ucode[AMDGPU_UCODE_ID_VCN].fw = adev->vcn.fw;
-               adev->firmware.fw_size +=
-                       ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
-
-               DRM_DEV_INFO(adev->dev, "Will use PSP to load VCN firmware\n");
-       }
+       amdgpu_vcn_setup_ucode(adev);
 
        r = amdgpu_vcn_resume(adev);
        if (r)