Commit 1b592d00 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/vcn: remove manual instance setting 



Handled by IP discovery now.

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

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

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ static int vcn_v1_0_early_init(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	adev->vcn.num_vcn_inst = 1;

	adev->vcn.num_enc_rings = 2;



	vcn_v1_0_set_dec_ring_funcs(adev);

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

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ static int vcn_v2_0_early_init(void *handle) 
{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	adev->vcn.num_vcn_inst = 1;

	if (amdgpu_sriov_vf(adev))

		adev->vcn.num_enc_rings = 1;

	else

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

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int vcn_v2_5_early_init(void *handle) 
	} else {

		u32 harvest;

		int i;

		adev->vcn.num_vcn_inst = VCN25_MAX_HW_INSTANCES_ARCTURUS;



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

			harvest = RREG32_SOC15(VCN, i, mmCC_UVD_HARVESTING);

			if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK)

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

+1 −3
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ static int vcn_v3_0_early_init(void *handle) 
		if (adev->ip_versions[UVD_HWIP] == IP_VERSION(3, 0, 0)) {

			u32 harvest;



			adev->vcn.num_vcn_inst = VCN_INSTANCES_SIENNA_CICHLID;

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

				harvest = RREG32_SOC15(VCN, i, mmCC_UVD_HARVESTING);

				if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK)
@@ -109,8 +108,7 @@ static int vcn_v3_0_early_init(void *handle) 
						AMDGPU_VCN_HARVEST_VCN1))

				/* both instances are harvested, disable the block */

				return -ENOENT;

		} else

			adev->vcn.num_vcn_inst = 1;

		}



		if (adev->ip_versions[UVD_HWIP] == IP_VERSION(3, 0, 33))

			adev->vcn.num_enc_rings = 0;