]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: enable Renoir VCN firmware loading
authorLeo Liu <leo.liu@amd.com>
Mon, 15 Jul 2019 13:01:51 +0000 (09:01 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 12 Aug 2019 17:47:50 +0000 (12:47 -0500)
By adding new Renoir VCN firmware

Acked-by: Huang Rui <ray.huang@amd.com>
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_vcn.c

index 47086cdbb41359d732465f04bf4b76a7cb77442a..7a6beb2e7c4e8aede558f98f9a3b37aff0affc7a 100644 (file)
@@ -47,6 +47,7 @@
 #define FIRMWARE_PICASSO       "amdgpu/picasso_vcn.bin"
 #define FIRMWARE_RAVEN2                "amdgpu/raven2_vcn.bin"
 #define FIRMWARE_ARCTURUS      "amdgpu/arcturus_vcn.bin"
+#define FIRMWARE_RENOIR        "amdgpu/renoir_vcn.bin"
 #define FIRMWARE_NAVI10        "amdgpu/navi10_vcn.bin"
 #define FIRMWARE_NAVI14        "amdgpu/navi14_vcn.bin"
 #define FIRMWARE_NAVI12        "amdgpu/navi12_vcn.bin"
@@ -55,6 +56,7 @@ MODULE_FIRMWARE(FIRMWARE_RAVEN);
 MODULE_FIRMWARE(FIRMWARE_PICASSO);
 MODULE_FIRMWARE(FIRMWARE_RAVEN2);
 MODULE_FIRMWARE(FIRMWARE_ARCTURUS);
+MODULE_FIRMWARE(FIRMWARE_RENOIR);
 MODULE_FIRMWARE(FIRMWARE_NAVI10);
 MODULE_FIRMWARE(FIRMWARE_NAVI14);
 MODULE_FIRMWARE(FIRMWARE_NAVI12);
@@ -83,6 +85,12 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
        case CHIP_ARCTURUS:
                fw_name = FIRMWARE_ARCTURUS;
                break;
+       case CHIP_RENOIR:
+               fw_name = FIRMWARE_RENOIR;
+               if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&
+                   (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))
+                       adev->vcn.indirect_sram = true;
+               break;
        case CHIP_NAVI10:
                fw_name = FIRMWARE_NAVI10;
                if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&