aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2017-09-01 16:35:30 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-03-21 15:24:24 -0400
commit2327e6261ab2bc8dd6fa6b15e1d85c09e912631a (patch)
tree41c9aa59b7cd8a0547ff16db1d59995dfacc9b05 /drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
parent6b9c6e1b15418e0fb349b537e647ec607ae98fb7 (diff)
drm/amdgpu: specify vega12 uvd 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_uvd.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index f3c459b7c0bb..627542b22ae4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -68,6 +68,7 @@
68#define FIRMWARE_POLARIS12 "amdgpu/polaris12_uvd.bin" 68#define FIRMWARE_POLARIS12 "amdgpu/polaris12_uvd.bin"
69 69
70#define FIRMWARE_VEGA10 "amdgpu/vega10_uvd.bin" 70#define FIRMWARE_VEGA10 "amdgpu/vega10_uvd.bin"
71#define FIRMWARE_VEGA12 "amdgpu/vega12_uvd.bin"
71 72
72#define mmUVD_GPCOM_VCPU_DATA0_VEGA10 (0x03c4 + 0x7e00) 73#define mmUVD_GPCOM_VCPU_DATA0_VEGA10 (0x03c4 + 0x7e00)
73#define mmUVD_GPCOM_VCPU_DATA1_VEGA10 (0x03c5 + 0x7e00) 74#define mmUVD_GPCOM_VCPU_DATA1_VEGA10 (0x03c5 + 0x7e00)
@@ -110,6 +111,7 @@ MODULE_FIRMWARE(FIRMWARE_POLARIS11);
110MODULE_FIRMWARE(FIRMWARE_POLARIS12); 111MODULE_FIRMWARE(FIRMWARE_POLARIS12);
111 112
112MODULE_FIRMWARE(FIRMWARE_VEGA10); 113MODULE_FIRMWARE(FIRMWARE_VEGA10);
114MODULE_FIRMWARE(FIRMWARE_VEGA12);
113 115
114static void amdgpu_uvd_idle_work_handler(struct work_struct *work); 116static void amdgpu_uvd_idle_work_handler(struct work_struct *work);
115 117
@@ -161,11 +163,14 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
161 case CHIP_POLARIS11: 163 case CHIP_POLARIS11:
162 fw_name = FIRMWARE_POLARIS11; 164 fw_name = FIRMWARE_POLARIS11;
163 break; 165 break;
166 case CHIP_POLARIS12:
167 fw_name = FIRMWARE_POLARIS12;
168 break;
164 case CHIP_VEGA10: 169 case CHIP_VEGA10:
165 fw_name = FIRMWARE_VEGA10; 170 fw_name = FIRMWARE_VEGA10;
166 break; 171 break;
167 case CHIP_POLARIS12: 172 case CHIP_VEGA12:
168 fw_name = FIRMWARE_POLARIS12; 173 fw_name = FIRMWARE_VEGA12;
169 break; 174 break;
170 default: 175 default:
171 return -EINVAL; 176 return -EINVAL;