drm/amdgpu: specify vega12 vce firmware
authorAlex Deucher <alexander.deucher@amd.com>
Fri, 1 Sep 2017 20:37:21 +0000 (16:37 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 21 Mar 2018 19:24:30 +0000 (14:24 -0500)
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>
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c

index 9152478d7528d637d11ced85afeba335fcb22ccf..a33804bd331499ba71ef6c17dc9dc4ddee9c0f7b 100644 (file)
@@ -55,6 +55,7 @@
 #define FIRMWARE_POLARIS12         "amdgpu/polaris12_vce.bin"
 
 #define FIRMWARE_VEGA10                "amdgpu/vega10_vce.bin"
+#define FIRMWARE_VEGA12                "amdgpu/vega12_vce.bin"
 
 #ifdef CONFIG_DRM_AMDGPU_CIK
 MODULE_FIRMWARE(FIRMWARE_BONAIRE);
@@ -72,6 +73,7 @@ MODULE_FIRMWARE(FIRMWARE_POLARIS11);
 MODULE_FIRMWARE(FIRMWARE_POLARIS12);
 
 MODULE_FIRMWARE(FIRMWARE_VEGA10);
+MODULE_FIRMWARE(FIRMWARE_VEGA12);
 
 static void amdgpu_vce_idle_work_handler(struct work_struct *work);
 
@@ -127,11 +129,14 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
        case CHIP_POLARIS11:
                fw_name = FIRMWARE_POLARIS11;
                break;
+       case CHIP_POLARIS12:
+               fw_name = FIRMWARE_POLARIS12;
+               break;
        case CHIP_VEGA10:
                fw_name = FIRMWARE_VEGA10;
                break;
-       case CHIP_POLARIS12:
-               fw_name = FIRMWARE_POLARIS12;
+       case CHIP_VEGA12:
+               fw_name = FIRMWARE_VEGA12;
                break;
 
        default: