OSDN Git Service

drm/amdgpu/vcn: add firmware support for dimgrey_cavefish
authorJames Zhu <James.Zhu@amd.com>
Fri, 2 Oct 2020 15:47:20 +0000 (11:47 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 12 Oct 2020 18:00:52 +0000 (14:00 -0400)
Add firmware support for dimgrey_cavefish.

Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c

index 075dd43..efdd995 100644 (file)
@@ -46,6 +46,7 @@
 #define FIRMWARE_SIENNA_CICHLID        "amdgpu/sienna_cichlid_vcn.bin"
 #define FIRMWARE_NAVY_FLOUNDER         "amdgpu/navy_flounder_vcn.bin"
 #define FIRMWARE_VANGOGH       "amdgpu/vangogh_vcn.bin"
+#define FIRMWARE_DIMGREY_CAVEFISH      "amdgpu/dimgrey_cavefish_vcn.bin"
 
 MODULE_FIRMWARE(FIRMWARE_RAVEN);
 MODULE_FIRMWARE(FIRMWARE_PICASSO);
@@ -59,6 +60,7 @@ MODULE_FIRMWARE(FIRMWARE_NAVI12);
 MODULE_FIRMWARE(FIRMWARE_SIENNA_CICHLID);
 MODULE_FIRMWARE(FIRMWARE_NAVY_FLOUNDER);
 MODULE_FIRMWARE(FIRMWARE_VANGOGH);
+MODULE_FIRMWARE(FIRMWARE_DIMGREY_CAVEFISH);
 
 static void amdgpu_vcn_idle_work_handler(struct work_struct *work);
 
@@ -133,6 +135,9 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
                break;
        case CHIP_VANGOGH:
                fw_name = FIRMWARE_VANGOGH;
+               break;
+       case CHIP_DIMGREY_CAVEFISH:
+               fw_name = FIRMWARE_DIMGREY_CAVEFISH;
                if ((adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) &&
                    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))
                        adev->vcn.indirect_sram = true;