drm/amdgpu: Remove extra asic type check (8214617a) · Commits · 戴 / test

vcn ip block is already selected based on ASIC type during set_ip_blocks Signed-off-by:

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

+12 −17

Original line number	Diff line number	Diff line
		@@ -80,23 +80,18 @@ static int vcn_v2_5_early_init(void *handle)
		adev->vcn.harvest_config = 0;
		adev->vcn.num_enc_rings = 1;
		} else {
		if (adev->asic_type == CHIP_ARCTURUS) {
		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)
		adev->vcn.harvest_config \|= 1 << i;
		}

		if (adev->vcn.harvest_config == (AMDGPU_VCN_HARVEST_VCN0 \|
		AMDGPU_VCN_HARVEST_VCN1))
		/* both instances are harvested, disable the block */
		return -ENOENT;
		} else
		adev->vcn.num_vcn_inst = 1;

		adev->vcn.num_enc_rings = 2;
		}