From: Lang Yu <[email protected]> Align with FW changes.
Signed-off-by: Lang Yu <[email protected]> Signed-off-by: Alex Deucher <[email protected]> --- drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c | 3 +++ drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h | 3 +++ 2 files changed, 6 insertions(+) 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 d3dec5f21bec..67164991f541 100644 --- a/drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c @@ -279,6 +279,9 @@ static int umsch_mm_v4_0_set_hw_resources(struct amdgpu_umsch_mm *umsch) sizeof(uint32_t) * 5); set_hw_resources.osssys_version = adev->ip_versions[OSSSYS_HWIP][0]; + set_hw_resources.vcn_version = adev->ip_versions[VCN_HWIP][0]; + set_hw_resources.vpe_version = adev->ip_versions[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; diff --git a/drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h b/drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h index 086ce7792c29..beadb9e42850 100644 --- a/drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h +++ b/drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h @@ -212,6 +212,7 @@ union UMSCHAPI__SET_HW_RESOURCES { union UMSCH_API_HEADER header; uint32_t vmid_mask_mm_vcn; uint32_t vmid_mask_mm_vpe; + uint32_t collaboration_mask_vpe; uint32_t engine_mask; uint32_t logging_vmid; uint32_t vcn0_hqd_mask[MAX_VCN0_INSTANCES]; @@ -223,6 +224,8 @@ union UMSCHAPI__SET_HW_RESOURCES { uint32_t mmhub_version; uint32_t osssys_base[UMSCH_MAX_HWIP_SEGMENT]; uint32_t osssys_version; + uint32_t vcn_version; + uint32_t vpe_version; struct UMSCH_API_STATUS api_status; union { struct { -- 2.41.0
