Commit 0b64a5a8 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/vcn2.5: convert to IP version checking 



Use IP versions rather than asic_type to differentiate
IP version specific features.

Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 96b8dd44

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

+2 −2
Original line number Diff line number Diff line
@@ -1720,7 +1720,7 @@ static void vcn_v2_5_set_dec_ring_funcs(struct amdgpu_device *adev) 
	for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {

		if (adev->vcn.harvest_config & (1 << i))

			continue;

		if (adev->asic_type == CHIP_ARCTURUS)

		if (adev->ip_versions[UVD_HWIP] == IP_VERSION(2, 5, 0))

			adev->vcn.inst[i].ring_dec.funcs = &vcn_v2_5_dec_ring_vm_funcs;

		else /* CHIP_ALDEBARAN */

			adev->vcn.inst[i].ring_dec.funcs = &vcn_v2_6_dec_ring_vm_funcs;
@@ -1737,7 +1737,7 @@ static void vcn_v2_5_set_enc_ring_funcs(struct amdgpu_device *adev) 
		if (adev->vcn.harvest_config & (1 << j))

			continue;

		for (i = 0; i < adev->vcn.num_enc_rings; ++i) {

			if (adev->asic_type == CHIP_ARCTURUS)

			if (adev->ip_versions[UVD_HWIP] == IP_VERSION(2, 5, 0))

				adev->vcn.inst[j].ring_enc[i].funcs = &vcn_v2_5_enc_ring_vm_funcs;

			else /* CHIP_ALDEBARAN */

				adev->vcn.inst[j].ring_enc[i].funcs = &vcn_v2_6_enc_ring_vm_funcs;