diff options
author | Samuel Li <samuel.li@amd.com> | 2015-10-08 16:27:55 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-10-21 12:21:07 -0400 |
commit | cfaba566035d2f5a977b18d3287fd407bacf34bc (patch) | |
tree | 1fe154ab5c1e8dfbe6ef11ea02c74bd53d7ad1b9 /drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |
parent | a39c8cea3512bdf9d002edc9142ff35d314a690e (diff) |
drm/amdgpu: add VCE support for Stoney (v2)
Stoney is VCE 3.x single.
v2: Stoney is single pipe like Fiji
Signed-off-by: Samuel Li <samuel.li@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 | 5 |
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 74f2038ac747..03f0c3bae516 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | |||
@@ -49,6 +49,7 @@ | |||
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 | #define FIRMWARE_FIJI "amdgpu/fiji_vce.bin" |
52 | #define FIRMWARE_STONEY "amdgpu/stoney_vce.bin" | ||
52 | 53 | ||
53 | #ifdef CONFIG_DRM_AMDGPU_CIK | 54 | #ifdef CONFIG_DRM_AMDGPU_CIK |
54 | MODULE_FIRMWARE(FIRMWARE_BONAIRE); | 55 | MODULE_FIRMWARE(FIRMWARE_BONAIRE); |
@@ -60,6 +61,7 @@ MODULE_FIRMWARE(FIRMWARE_MULLINS); | |||
60 | MODULE_FIRMWARE(FIRMWARE_TONGA); | 61 | MODULE_FIRMWARE(FIRMWARE_TONGA); |
61 | MODULE_FIRMWARE(FIRMWARE_CARRIZO); | 62 | MODULE_FIRMWARE(FIRMWARE_CARRIZO); |
62 | MODULE_FIRMWARE(FIRMWARE_FIJI); | 63 | MODULE_FIRMWARE(FIRMWARE_FIJI); |
64 | MODULE_FIRMWARE(FIRMWARE_STONEY); | ||
63 | 65 | ||
64 | static void amdgpu_vce_idle_work_handler(struct work_struct *work); | 66 | static void amdgpu_vce_idle_work_handler(struct work_struct *work); |
65 | 67 | ||
@@ -106,6 +108,9 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size) | |||
106 | case CHIP_FIJI: | 108 | case CHIP_FIJI: |
107 | fw_name = FIRMWARE_FIJI; | 109 | fw_name = FIRMWARE_FIJI; |
108 | break; | 110 | break; |
111 | case CHIP_STONEY: | ||
112 | fw_name = FIRMWARE_STONEY; | ||
113 | break; | ||
109 | 114 | ||
110 | default: | 115 | default: |
111 | return -EINVAL; | 116 | return -EINVAL; |