aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2017-09-01 16:37:21 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-03-21 15:24:30 -0400
commit9aa52bc48754237c692a07479f44fa6beda8b692 (patch)
tree005c5fcd3db791f71b4d8cfe88b45983feea7b86 /drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
parent2327e6261ab2bc8dd6fa6b15e1d85c09e912631a (diff)
drm/amdgpu: specify vega12 vce firmware
Declare firmware and add support for the file. Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 9152478d7528..a33804bd3314 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -55,6 +55,7 @@
55#define FIRMWARE_POLARIS12 "amdgpu/polaris12_vce.bin" 55#define FIRMWARE_POLARIS12 "amdgpu/polaris12_vce.bin"
56 56
57#define FIRMWARE_VEGA10 "amdgpu/vega10_vce.bin" 57#define FIRMWARE_VEGA10 "amdgpu/vega10_vce.bin"
58#define FIRMWARE_VEGA12 "amdgpu/vega12_vce.bin"
58 59
59#ifdef CONFIG_DRM_AMDGPU_CIK 60#ifdef CONFIG_DRM_AMDGPU_CIK
60MODULE_FIRMWARE(FIRMWARE_BONAIRE); 61MODULE_FIRMWARE(FIRMWARE_BONAIRE);
@@ -72,6 +73,7 @@ MODULE_FIRMWARE(FIRMWARE_POLARIS11);
72MODULE_FIRMWARE(FIRMWARE_POLARIS12); 73MODULE_FIRMWARE(FIRMWARE_POLARIS12);
73 74
74MODULE_FIRMWARE(FIRMWARE_VEGA10); 75MODULE_FIRMWARE(FIRMWARE_VEGA10);
76MODULE_FIRMWARE(FIRMWARE_VEGA12);
75 77
76static void amdgpu_vce_idle_work_handler(struct work_struct *work); 78static void amdgpu_vce_idle_work_handler(struct work_struct *work);
77 79
@@ -127,11 +129,14 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
127 case CHIP_POLARIS11: 129 case CHIP_POLARIS11:
128 fw_name = FIRMWARE_POLARIS11; 130 fw_name = FIRMWARE_POLARIS11;
129 break; 131 break;
132 case CHIP_POLARIS12:
133 fw_name = FIRMWARE_POLARIS12;
134 break;
130 case CHIP_VEGA10: 135 case CHIP_VEGA10:
131 fw_name = FIRMWARE_VEGA10; 136 fw_name = FIRMWARE_VEGA10;
132 break; 137 break;
133 case CHIP_POLARIS12: 138 case CHIP_VEGA12:
134 fw_name = FIRMWARE_POLARIS12; 139 fw_name = FIRMWARE_VEGA12;
135 break; 140 break;
136 141
137 default: 142 default: