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) |
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 @@ | |||
50 | #define FIRMWARE_CARRIZO "amdgpu/carrizo_vce.bin" | 50 | #define FIRMWARE_CARRIZO "amdgpu/carrizo_vce.bin" |
51 | #define FIRMWARE_FIJI "amdgpu/fiji_vce.bin" | 51 | #define FIRMWARE_FIJI "amdgpu/fiji_vce.bin" |
52 | #define FIRMWARE_STONEY "amdgpu/stoney_vce.bin" | 52 | #define FIRMWARE_STONEY "amdgpu/stoney_vce.bin" |
53 | #define FIRMWARE_ELLESMERE "amdgpu/ellesmere_vce.bin" | ||
54 | #define FIRMWARE_BAFFIN "amdgpu/baffin_vce.bin" | ||
53 | 55 | ||
54 | #ifdef CONFIG_DRM_AMDGPU_CIK | 56 | #ifdef CONFIG_DRM_AMDGPU_CIK |
55 | MODULE_FIRMWARE(FIRMWARE_BONAIRE); | 57 | MODULE_FIRMWARE(FIRMWARE_BONAIRE); |
@@ -62,6 +64,8 @@ MODULE_FIRMWARE(FIRMWARE_TONGA); | |||
62 | MODULE_FIRMWARE(FIRMWARE_CARRIZO); | 64 | MODULE_FIRMWARE(FIRMWARE_CARRIZO); |
63 | MODULE_FIRMWARE(FIRMWARE_FIJI); | 65 | MODULE_FIRMWARE(FIRMWARE_FIJI); |
64 | MODULE_FIRMWARE(FIRMWARE_STONEY); | 66 | MODULE_FIRMWARE(FIRMWARE_STONEY); |
67 | MODULE_FIRMWARE(FIRMWARE_ELLESMERE); | ||
68 | MODULE_FIRMWARE(FIRMWARE_BAFFIN); | ||
65 | 69 | ||
66 | static void amdgpu_vce_idle_work_handler(struct work_struct *work); | 70 | static void amdgpu_vce_idle_work_handler(struct work_struct *work); |
67 | 71 | ||
@@ -113,6 +117,12 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size) | |||
113 | case CHIP_STONEY: | 117 | case CHIP_STONEY: |
114 | fw_name = FIRMWARE_STONEY; | 118 | fw_name = FIRMWARE_STONEY; |
115 | break; | 119 | break; |
120 | case CHIP_ELLESMERE: | ||
121 | fw_name = FIRMWARE_ELLESMERE; | ||
122 | break; | ||
123 | case CHIP_BAFFIN: | ||
124 | fw_name = FIRMWARE_BAFFIN; | ||
125 | break; | ||
116 | 126 | ||
117 | default: | 127 | default: |
118 | return -EINVAL; | 128 | return -EINVAL; |