drm/amdgpu/jpeg: Remove extra asic type check

jpeg ip block is already selected based on ASIC type during set_ip_blocks.

Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
index 7a51c615d22d68a199c5ed30ef2ff1435800be11..845306f63cdb4b7f309093d639513ec0d435b325 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c
@@ -55,22 +55,18 @@ 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;
-
-               adev->jpeg.num_jpeg_inst = JPEG25_MAX_HW_INSTANCES_ARCTURUS;
-               for (i = 0; i < adev->jpeg.num_jpeg_inst; i++) {
-                       harvest = RREG32_SOC15(JPEG, i, mmCC_UVD_HARVESTING);
-                       if (harvest & CC_UVD_HARVESTING__UVD_DISABLE_MASK)
-                               adev->jpeg.harvest_config |= 1 << i;
-               }
+       u32 harvest;
+       int i;
 
-               if (adev->jpeg.harvest_config == (AMDGPU_JPEG_HARVEST_JPEG0 |
-                                                AMDGPU_JPEG_HARVEST_JPEG1))
-                       return -ENOENT;
-       } else
-               adev->jpeg.num_jpeg_inst = 1;
+       adev->jpeg.num_jpeg_inst = JPEG25_MAX_HW_INSTANCES_ARCTURUS;
+       for (i = 0; i < adev->jpeg.num_jpeg_inst; i++) {
+               harvest = RREG32_SOC15(JPEG, i, mmCC_UVD_HARVESTING);
+               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;
 
        jpeg_v2_5_set_dec_ring_funcs(adev);
        jpeg_v2_5_set_irq_funcs(adev);