Commit fb5b73ac authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

drm/amdgpu/umsch: correct IP version format 



FW uses IP_VERSION_MAJ_MIN_REV format.

Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
Reviewed-by: default avatarVeerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1c1f14a4

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

+7 −4
Original line number Diff line number Diff line
@@ -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;