aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
diff options
context:
space:
mode:
authorFlora Cui <Flora.Cui@amd.com>2016-03-14 18:33:29 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-05-04 20:27:57 -0400
commit2cc0c0b5cd4d07a65267c28a4f7b68134abff472 (patch)
tree6f989d1e7fb5706e171c08881720ba8da8734bfc /drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
parenta3ad7a9ad8ef2e87ffa7e65d6ce0e9928b4134e9 (diff)
drm/amdgpu: change ELM/BAF to Polaris10/Polaris11
Adjust to preferred code names. Signed-off-by: Flora Cui <Flora.Cui@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@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.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 66d5f7fee485..80c1048f3324 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -50,8 +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" 53#define FIRMWARE_POLARIS10 "amdgpu/polaris10_vce.bin"
54#define FIRMWARE_BAFFIN "amdgpu/baffin_vce.bin" 54#define FIRMWARE_POLARIS11 "amdgpu/polaris11_vce.bin"
55 55
56#ifdef CONFIG_DRM_AMDGPU_CIK 56#ifdef CONFIG_DRM_AMDGPU_CIK
57MODULE_FIRMWARE(FIRMWARE_BONAIRE); 57MODULE_FIRMWARE(FIRMWARE_BONAIRE);
@@ -64,8 +64,8 @@ MODULE_FIRMWARE(FIRMWARE_TONGA);
64MODULE_FIRMWARE(FIRMWARE_CARRIZO); 64MODULE_FIRMWARE(FIRMWARE_CARRIZO);
65MODULE_FIRMWARE(FIRMWARE_FIJI); 65MODULE_FIRMWARE(FIRMWARE_FIJI);
66MODULE_FIRMWARE(FIRMWARE_STONEY); 66MODULE_FIRMWARE(FIRMWARE_STONEY);
67MODULE_FIRMWARE(FIRMWARE_ELLESMERE); 67MODULE_FIRMWARE(FIRMWARE_POLARIS10);
68MODULE_FIRMWARE(FIRMWARE_BAFFIN); 68MODULE_FIRMWARE(FIRMWARE_POLARIS11);
69 69
70static void amdgpu_vce_idle_work_handler(struct work_struct *work); 70static void amdgpu_vce_idle_work_handler(struct work_struct *work);
71 71
@@ -117,11 +117,11 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
117 case CHIP_STONEY: 117 case CHIP_STONEY:
118 fw_name = FIRMWARE_STONEY; 118 fw_name = FIRMWARE_STONEY;
119 break; 119 break;
120 case CHIP_ELLESMERE: 120 case CHIP_POLARIS10:
121 fw_name = FIRMWARE_ELLESMERE; 121 fw_name = FIRMWARE_POLARIS10;
122 break; 122 break;
123 case CHIP_BAFFIN: 123 case CHIP_POLARIS11:
124 fw_name = FIRMWARE_BAFFIN; 124 fw_name = FIRMWARE_POLARIS11;
125 break; 125 break;
126 126
127 default: 127 default: