aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2015-07-27 14:24:14 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 16:50:29 -0400
commit188a9bcd6cbe55c6fea23309548741d8e34bb590 (patch)
treec3fe68b4bc170750eff56ba1d300ad6fcd5e1017 /drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
parent974ee3db0ff88e5413b734e634119d1e8a10a77f (diff)
drm/amdgpu: add support for VCE 3.x on Fiji
VCE on fiji is single pipe only. Reviewed-by: David Zhang <david1.zhang@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.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index d3ca73090e39..172571968c9e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -48,6 +48,7 @@
48#endif 48#endif
49#define FIRMWARE_TONGA "amdgpu/tonga_vce.bin" 49#define FIRMWARE_TONGA "amdgpu/tonga_vce.bin"
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 52
52#ifdef CONFIG_DRM_AMDGPU_CIK 53#ifdef CONFIG_DRM_AMDGPU_CIK
53MODULE_FIRMWARE(FIRMWARE_BONAIRE); 54MODULE_FIRMWARE(FIRMWARE_BONAIRE);
@@ -58,6 +59,7 @@ MODULE_FIRMWARE(FIRMWARE_MULLINS);
58#endif 59#endif
59MODULE_FIRMWARE(FIRMWARE_TONGA); 60MODULE_FIRMWARE(FIRMWARE_TONGA);
60MODULE_FIRMWARE(FIRMWARE_CARRIZO); 61MODULE_FIRMWARE(FIRMWARE_CARRIZO);
62MODULE_FIRMWARE(FIRMWARE_FIJI);
61 63
62static void amdgpu_vce_idle_work_handler(struct work_struct *work); 64static void amdgpu_vce_idle_work_handler(struct work_struct *work);
63 65
@@ -101,6 +103,9 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
101 case CHIP_CARRIZO: 103 case CHIP_CARRIZO:
102 fw_name = FIRMWARE_CARRIZO; 104 fw_name = FIRMWARE_CARRIZO;
103 break; 105 break;
106 case CHIP_FIJI:
107 fw_name = FIRMWARE_FIJI;
108 break;
104 109
105 default: 110 default:
106 return -EINVAL; 111 return -EINVAL;