diff options
author | Sonny Jiang <sonny.jiang@amd.com> | 2016-03-11 14:33:40 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-05-04 20:25:29 -0400 |
commit | 1b4eeea5f79d276e41355f3860052b046cb55f2a (patch) | |
tree | e5359efc90d2665d4445e412cc2462559904a567 /drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |
parent | 38d7581764950831818b2a3b28d2e70f98d364f2 (diff) | |
download | blackbird-obmc-linux-1b4eeea5f79d276e41355f3860052b046cb55f2a.tar.gz blackbird-obmc-linux-1b4eeea5f79d276e41355f3860052b046cb55f2a.zip |
drm/amdgpu: add VCE support to ELM/BAF
Ellesmere and Baffin are VCE 3.4
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c index 4bec0c108cea..66d5f7fee485 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c @@ -50,6 +50,8 @@ #define FIRMWARE_CARRIZO "amdgpu/carrizo_vce.bin" #define FIRMWARE_FIJI "amdgpu/fiji_vce.bin" #define FIRMWARE_STONEY "amdgpu/stoney_vce.bin" +#define FIRMWARE_ELLESMERE "amdgpu/ellesmere_vce.bin" +#define FIRMWARE_BAFFIN "amdgpu/baffin_vce.bin" #ifdef CONFIG_DRM_AMDGPU_CIK MODULE_FIRMWARE(FIRMWARE_BONAIRE); @@ -62,6 +64,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_vce_idle_work_handler(struct work_struct *work); @@ -113,6 +117,12 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size) 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; |