drm/amdgpu/umsch: correct IP version format

FW uses IP_VERSION_MAJ_MIN_REV format.

Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Reviewed-by: Veerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c b/drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c
index 63917e2b51b4aae67dcb8d1faa6312b7a4039fe6..8e7b763cfdb7ef72ba8c98ea4e33515ffa4e8d81 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c
@@ -285,15 +285,18 @@ static int umsch_mm_v4_0_set_hw_resources(struct amdgpu_umsch_mm *umsch)
 
        memcpy(set_hw_resources.mmhub_base, adev->reg_offset[MMHUB_HWIP][0],
               sizeof(uint32_t) * 5);
-       set_hw_resources.mmhub_version = amdgpu_ip_version(adev, MMHUB_HWIP, 0);
+       set_hw_resources.mmhub_version =
+               IP_VERSION_MAJ_MIN_REV(amdgpu_ip_version(adev, MMHUB_HWIP, 0));
 
        memcpy(set_hw_resources.osssys_base, adev->reg_offset[OSSSYS_HWIP][0],
               sizeof(uint32_t) * 5);
        set_hw_resources.osssys_version =
-               amdgpu_ip_version(adev, OSSSYS_HWIP, 0);
+               IP_VERSION_MAJ_MIN_REV(amdgpu_ip_version(adev, OSSSYS_HWIP, 0));
 
-       set_hw_resources.vcn_version = amdgpu_ip_version(adev, VCN_HWIP, 0);
-       set_hw_resources.vpe_version = amdgpu_ip_version(adev, VPE_HWIP, 0);
+       set_hw_resources.vcn_version =
+               IP_VERSION_MAJ_MIN_REV(amdgpu_ip_version(adev, VCN_HWIP, 0));
+       set_hw_resources.vpe_version =
+               IP_VERSION_MAJ_MIN_REV(amdgpu_ip_version(adev, VPE_HWIP, 0));
 
        set_hw_resources.api_status.api_completion_fence_addr = umsch->ring.fence_drv.gpu_addr;
        set_hw_resources.api_status.api_completion_fence_value = ++umsch->ring.fence_drv.sync_seq;