drm/amdgpu: add van gogh support for gpu_info and ip block setting

This patch adds van gogh support for gpu_info firmware and ip block setting.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@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 b293e02affc1a6ea2bf03986a7b035e0b7795423..5a26894dc635432369170379314a6bae6dcaaec1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -80,6 +80,7 @@ MODULE_FIRMWARE("amdgpu/renoir_gpu_info.bin");
 MODULE_FIRMWARE("amdgpu/navi10_gpu_info.bin");
 MODULE_FIRMWARE("amdgpu/navi14_gpu_info.bin");
 MODULE_FIRMWARE("amdgpu/navi12_gpu_info.bin");
+MODULE_FIRMWARE("amdgpu/vangogh_gpu_info.bin");
 
 #define AMDGPU_RESUME_MS               2000
 
@@ -1813,6 +1814,9 @@ static int amdgpu_device_parse_gpu_info_fw(struct amdgpu_device *adev)
        case CHIP_NAVI12:
                chip_name = "navi12";
                break;
+       case CHIP_VANGOGH:
+               chip_name = "vangogh";
+               break;
        }
 
        snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_gpu_info.bin", chip_name);
@@ -1987,7 +1991,11 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
        case  CHIP_NAVI12:
        case  CHIP_SIENNA_CICHLID:
        case  CHIP_NAVY_FLOUNDER:
-               adev->family = AMDGPU_FAMILY_NV;
+       case CHIP_VANGOGH:
+               if (adev->asic_type == CHIP_VANGOGH)
+                       adev->family = AMDGPU_FAMILY_VGH;
+               else
+                       adev->family = AMDGPU_FAMILY_NV;
 
                r = nv_set_ip_blocks(adev);
                if (r)