From: Viknesh Velavan <[email protected]> VCN 4.0.6 uses the same driver as VCN 4.0.5 but was missing the secure_submission_supported flag, this prevents secure (TMZ) decode playback.
Add IP_VERSION(4, 0, 6) to the existing check. Signed-off-by: Viknesh Velavan <[email protected]> Reviewed-by: Leo Liu <[email protected]> --- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c index 621f21445626..e44486a2d081 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c @@ -1491,7 +1491,8 @@ static void vcn_v4_0_5_set_unified_ring_funcs(struct amdgpu_device *adev) if (adev->vcn.harvest_config & (1 << i)) continue; - if (amdgpu_ip_version(adev, VCN_HWIP, 0) == IP_VERSION(4, 0, 5)) + if (amdgpu_ip_version(adev, VCN_HWIP, 0) == IP_VERSION(4, 0, 5) || + amdgpu_ip_version(adev, VCN_HWIP, 0) == IP_VERSION(4, 0, 6)) vcn_v4_0_5_unified_ring_vm_funcs.secure_submission_supported = true; adev->vcn.inst[i].ring_enc[0].funcs = &vcn_v4_0_5_unified_ring_vm_funcs; -- 2.17.1
