drm/amdgpu: add psp support for raven2
authorLikun Gao <Likun.Gao@amd.com>
Tue, 5 Jun 2018 06:05:45 +0000 (14:05 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 14 Sep 2018 14:36:18 +0000 (09:36 -0500)
Modified for using raven2_asd.bin to replace raven_asd.bin for raven2

Signed-off-by: Likun Gao <Likun.Gao@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c

index eae3bf8b8463d249b326734b325e2ec08eee0ed4..2cfd1bb559ddffe3207fec3fa433908c56befc2c 100644 (file)
@@ -36,6 +36,7 @@
 
 MODULE_FIRMWARE("amdgpu/raven_asd.bin");
 MODULE_FIRMWARE("amdgpu/picasso_asd.bin");
+MODULE_FIRMWARE("amdgpu/raven2_asd.bin");
 
 static int
 psp_v10_0_get_fw_type(struct amdgpu_firmware_info *ucode, enum psp_gfx_fw_type *type)
@@ -118,7 +119,10 @@ static int psp_v10_0_init_microcode(struct psp_context *psp)
 
        switch (adev->asic_type) {
        case CHIP_RAVEN:
-               chip_name = "raven";
+               if (adev->rev_id >= 0x8)
+                       chip_name = "raven2";
+               else
+                       chip_name = "raven";
                break;
        case CHIP_PICASSO:
                chip_name = "picasso";