]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amdgpu: add raven2 vcn firmware support
authorFeifei Xu <Feifei.Xu@amd.com>
Fri, 15 Jun 2018 21:01:41 +0000 (16:01 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 14 Sep 2018 14:36:15 +0000 (09:36 -0500)
Specify raven2 vcn firmware on amdgpu_vce_sw_init.

Signed-off-by: Feifei Xu <Feifei.Xu@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_vcn.c

index 93ffba2cbec4a73d4f504597acd2828c76248f6c..a74498ce87ff6d02c6af5e71f9bc05468274c779 100644 (file)
 /* Firmware Names */
 #define FIRMWARE_RAVEN         "amdgpu/raven_vcn.bin"
 #define FIRMWARE_PICASSO       "amdgpu/picasso_vcn.bin"
+#define FIRMWARE_RAVEN2                "amdgpu/raven2_vcn.bin"
 
 MODULE_FIRMWARE(FIRMWARE_RAVEN);
 MODULE_FIRMWARE(FIRMWARE_PICASSO);
+MODULE_FIRMWARE(FIRMWARE_RAVEN2);
 
 static void amdgpu_vcn_idle_work_handler(struct work_struct *work);
 
@@ -61,7 +63,10 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
 
        switch (adev->asic_type) {
        case CHIP_RAVEN:
-               fw_name = FIRMWARE_RAVEN;
+        if (adev->rev_id >= 8)
+                       fw_name = FIRMWARE_RAVEN2;
+               else
+                       fw_name = FIRMWARE_RAVEN;
                break;
        case CHIP_PICASSO:
                fw_name = FIRMWARE_PICASSO;