]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amdgpu: add VEGAM VCE firmware support
authorLeo Liu <leo.liu@amd.com>
Wed, 11 Apr 2018 20:25:57 +0000 (15:25 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 15 May 2018 18:43:59 +0000 (13:43 -0500)
Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c

index d7261e01ff8a2f7523c32bca8f96d612a5cf6af1..e2186eda3271f1fcbb9c6c37a9643306e2cf1f04 100644 (file)
@@ -51,8 +51,9 @@
 #define FIRMWARE_FIJI          "amdgpu/fiji_vce.bin"
 #define FIRMWARE_STONEY                "amdgpu/stoney_vce.bin"
 #define FIRMWARE_POLARIS10     "amdgpu/polaris10_vce.bin"
-#define FIRMWARE_POLARIS11         "amdgpu/polaris11_vce.bin"
-#define FIRMWARE_POLARIS12         "amdgpu/polaris12_vce.bin"
+#define FIRMWARE_POLARIS11     "amdgpu/polaris11_vce.bin"
+#define FIRMWARE_POLARIS12     "amdgpu/polaris12_vce.bin"
+#define FIRMWARE_VEGAM         "amdgpu/vegam_vce.bin"
 
 #define FIRMWARE_VEGA10                "amdgpu/vega10_vce.bin"
 #define FIRMWARE_VEGA12                "amdgpu/vega12_vce.bin"
@@ -71,6 +72,7 @@ MODULE_FIRMWARE(FIRMWARE_STONEY);
 MODULE_FIRMWARE(FIRMWARE_POLARIS10);
 MODULE_FIRMWARE(FIRMWARE_POLARIS11);
 MODULE_FIRMWARE(FIRMWARE_POLARIS12);
+MODULE_FIRMWARE(FIRMWARE_VEGAM);
 
 MODULE_FIRMWARE(FIRMWARE_VEGA10);
 MODULE_FIRMWARE(FIRMWARE_VEGA12);
@@ -132,6 +134,9 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
        case CHIP_POLARIS12:
                fw_name = FIRMWARE_POLARIS12;
                break;
+       case CHIP_VEGAM:
+               fw_name = FIRMWARE_VEGAM;
+               break;
        case CHIP_VEGA10:
                fw_name = FIRMWARE_VEGA10;
                break;