From cb235a2c0eb86d9965241aa187b78285cc6290e2 Mon Sep 17 00:00:00 2001 From: Sonny Jiang Date: Thu, 5 Nov 2015 15:17:18 -0500 Subject: [PATCH 0925/1110] drm/amdgpu: add UVD support for ELM/BAF MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ellesmere and Baffin are UVD 6.3 Signed-off-by: Sonny Jiang Reviewed-by: Alex Deucher Reviewed-by: Christian König Reviewed-by: Jammy Zhou --- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index cb6990a..239b764 100644 --- 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; } -- 2.7.4