drm/amdgpu/jpeg: Remove extra asic type check (de7fe7e8) · Commits · 戴 / test

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

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

+11 −15

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@ static int amdgpu_ih_clientid_jpeg[] = {
		static int jpeg_v2_5_early_init(void *handle)
		{
		struct amdgpu_device adev = (struct amdgpu_device )handle;
		if (adev->asic_type == CHIP_ARCTURUS) {
		u32 harvest;
		int i;

		@@ -65,12 +64,9 @@ static int jpeg_v2_5_early_init(void *handle)
		if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK)
		adev->jpeg.harvest_config \|= 1 << i;
		}

		if (adev->jpeg.harvest_config == (AMDGPU_JPEG_HARVEST_JPEG0 \|
		AMDGPU_JPEG_HARVEST_JPEG1))
		return -ENOENT;
		} else
		adev->jpeg.num_jpeg_inst = 1;

		jpeg_v2_5_set_dec_ring_funcs(adev);
		jpeg_v2_5_set_irq_funcs(adev);