drm/amdgpu: add UVD support for ELM/BAF

Ellesmere and Baffin are UVD 6.3

Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index 76ebc109e5e7ad39e68f82679aea87dafb2cf230..9599bc6484b402c76404f08e2c277215d7c612f3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -54,6 +54,8 @@
 #define FIRMWARE_CARRIZO       "amdgpu/carrizo_uvd.bin"
 #define FIRMWARE_FIJI          "amdgpu/fiji_uvd.bin"
 #define FIRMWARE_STONEY                "amdgpu/stoney_uvd.bin"
+#define FIRMWARE_ELLESMERE     "amdgpu/ellesmere_uvd.bin"
+#define FIRMWARE_BAFFIN         "amdgpu/baffin_uvd.bin"
 
 /**
  * amdgpu_uvd_cs_ctx - Command submission parser context
@@ -85,6 +87,8 @@ MODULE_FIRMWARE(FIRMWARE_TONGA);
 MODULE_FIRMWARE(FIRMWARE_CARRIZO);
 MODULE_FIRMWARE(FIRMWARE_FIJI);
 MODULE_FIRMWARE(FIRMWARE_STONEY);
+MODULE_FIRMWARE(FIRMWARE_ELLESMERE);
+MODULE_FIRMWARE(FIRMWARE_BAFFIN);
 
 static void amdgpu_uvd_note_usage(struct amdgpu_device *adev);
 static void amdgpu_uvd_idle_work_handler(struct work_struct *work);
@@ -131,6 +135,12 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
        case CHIP_STONEY:
                fw_name = FIRMWARE_STONEY;
                break;
+       case CHIP_ELLESMERE:
+               fw_name = FIRMWARE_ELLESMERE;
+               break;
+       case CHIP_BAFFIN:
+               fw_name = FIRMWARE_BAFFIN;
+               break;
        default:
                return -EINVAL;
        }