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

index f3c459b7c0bbadec2f7bc0d71005500cbdfbf376..627542b22ae4ce5e207f8aea679ef8585d89edfe 100644 (file)
@@ -68,6 +68,7 @@
 #define FIRMWARE_POLARIS12     "amdgpu/polaris12_uvd.bin"
 
 #define FIRMWARE_VEGA10                "amdgpu/vega10_uvd.bin"
+#define FIRMWARE_VEGA12                "amdgpu/vega12_uvd.bin"
 
 #define mmUVD_GPCOM_VCPU_DATA0_VEGA10 (0x03c4 + 0x7e00)
 #define mmUVD_GPCOM_VCPU_DATA1_VEGA10 (0x03c5 + 0x7e00)
@@ -110,6 +111,7 @@ MODULE_FIRMWARE(FIRMWARE_POLARIS11);
 MODULE_FIRMWARE(FIRMWARE_POLARIS12);
 
 MODULE_FIRMWARE(FIRMWARE_VEGA10);
+MODULE_FIRMWARE(FIRMWARE_VEGA12);
 
 static void amdgpu_uvd_idle_work_handler(struct work_struct *work);
 
@@ -161,11 +163,14 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
        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:
                return -EINVAL;