Skip to content

Commit fb5b73a

Browse files
Lang Yualexdeucher
authored andcommitted
drm/amdgpu/umsch: correct IP version format
FW uses IP_VERSION_MAJ_MIN_REV format. Signed-off-by: Lang Yu <[email protected]> Reviewed-by: Veerabadhran Gopalakrishnan <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 1c1f14a commit fb5b73a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,15 +285,18 @@ static int umsch_mm_v4_0_set_hw_resources(struct amdgpu_umsch_mm *umsch)
285285

286286
memcpy(set_hw_resources.mmhub_base, adev->reg_offset[MMHUB_HWIP][0],
287287
sizeof(uint32_t) * 5);
288-
set_hw_resources.mmhub_version = amdgpu_ip_version(adev, MMHUB_HWIP, 0);
288+
set_hw_resources.mmhub_version =
289+
IP_VERSION_MAJ_MIN_REV(amdgpu_ip_version(adev, MMHUB_HWIP, 0));
289290

290291
memcpy(set_hw_resources.osssys_base, adev->reg_offset[OSSSYS_HWIP][0],
291292
sizeof(uint32_t) * 5);
292293
set_hw_resources.osssys_version =
293-
amdgpu_ip_version(adev, OSSSYS_HWIP, 0);
294+
IP_VERSION_MAJ_MIN_REV(amdgpu_ip_version(adev, OSSSYS_HWIP, 0));
294295

295-
set_hw_resources.vcn_version = amdgpu_ip_version(adev, VCN_HWIP, 0);
296-
set_hw_resources.vpe_version = amdgpu_ip_version(adev, VPE_HWIP, 0);
296+
set_hw_resources.vcn_version =
297+
IP_VERSION_MAJ_MIN_REV(amdgpu_ip_version(adev, VCN_HWIP, 0));
298+
set_hw_resources.vpe_version =
299+
IP_VERSION_MAJ_MIN_REV(amdgpu_ip_version(adev, VPE_HWIP, 0));
297300

298301
set_hw_resources.api_status.api_completion_fence_addr = umsch->ring.fence_drv.gpu_addr;
299302
set_hw_resources.api_status.api_completion_fence_value = ++umsch->ring.fence_drv.sync_seq;

0 commit comments

Comments
 (0)