drm/amdgpu: drive all navi asics from the IP discovery table

Rather than hardcoding based on asic_type, use the IP
discovery table to configure the driver.

v2: rebase

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index bfd7becdcf197c232c8216efaf7a288e54c06be9..274ef4a514a29afe1d9da004251ce35cf0f1952a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2142,26 +2142,6 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
                if (r)
                        return r;
                break;
-       case  CHIP_NAVI14:
-       case  CHIP_NAVI12:
-       case  CHIP_SIENNA_CICHLID:
-       case  CHIP_NAVY_FLOUNDER:
-       case  CHIP_DIMGREY_CAVEFISH:
-       case  CHIP_BEIGE_GOBY:
-       case CHIP_VANGOGH:
-       case CHIP_YELLOW_CARP:
-       case CHIP_CYAN_SKILLFISH:
-               if (adev->asic_type == CHIP_VANGOGH)
-                       adev->family = AMDGPU_FAMILY_VGH;
-               else if (adev->asic_type == CHIP_YELLOW_CARP)
-                       adev->family = AMDGPU_FAMILY_YC;
-               else
-                       adev->family = AMDGPU_FAMILY_NV;
-
-               r = nv_set_ip_blocks(adev);
-               if (r)
-                       return r;
-               break;
        default:
                r = amdgpu_discovery_set_ip_blocks(adev);
                if (r)