drm/amd/powerplay: add smu support for ellesmere/baffin

Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index 8b653f2c7086..8bc4040d18cf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -681,9 +681,10 @@ static uint32_t fw_type_convert(struct cgs_device *cgs_device, uint32_t fw_type)
                 result = AMDGPU_UCODE_ID_CP_MEC1;
                 break;
         case CGS_UCODE_ID_CP_MEC_JT2:
-                if (adev->asic_type == CHIP_TONGA)
+                if (adev->asic_type == CHIP_TONGA || adev->asic_type == CHIP_BAFFIN
+                  || adev->asic_type == CHIP_ELLESMERE)
                         result = AMDGPU_UCODE_ID_CP_MEC2;
-                else if (adev->asic_type == CHIP_CARRIZO)
+                else
                         result = AMDGPU_UCODE_ID_CP_MEC1;
                 break;
         case CGS_UCODE_ID_RLC_G:
@@ -741,6 +742,12 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                 case CHIP_FIJI:
                         strcpy(fw_name, "amdgpu/fiji_smc.bin");
                         break;
+                case CHIP_BAFFIN:
+                        strcpy(fw_name, "amdgpu/baffin_smc.bin");
+                        break;
+                case CHIP_ELLESMERE:
+                        strcpy(fw_name, "amdgpu/ellesmere_smc.bin");
+                        break;
                 default:
                         DRM_ERROR("SMC firmware not supported\n");
                         return -EINVAL;