drm/amdgpu: Enable TA firmware loading for dimgrey_cavefish
authorBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Wed, 11 Nov 2020 22:55:49 +0000 (17:55 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 13 Nov 2020 22:29:46 +0000 (17:29 -0500)
Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c

index 03e88db..edd2d6b 100644 (file)
@@ -62,7 +62,7 @@ MODULE_FIRMWARE("amdgpu/navy_flounder_ta.bin");
 MODULE_FIRMWARE("amdgpu/vangogh_asd.bin");
 MODULE_FIRMWARE("amdgpu/vangogh_toc.bin");
 MODULE_FIRMWARE("amdgpu/dimgrey_cavefish_sos.bin");
-MODULE_FIRMWARE("amdgpu/dimgrey_cavefish_asd.bin");
+MODULE_FIRMWARE("amdgpu/dimgrey_cavefish_ta.bin");
 
 /* address block */
 #define smnMP1_FIRMWARE_FLAGS          0x3010024
@@ -192,15 +192,11 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                break;
        case CHIP_SIENNA_CICHLID:
        case CHIP_NAVY_FLOUNDER:
+       case CHIP_DIMGREY_CAVEFISH:
                err = psp_init_sos_microcode(psp, chip_name);
                if (err)
                        return err;
-               err = psp_init_ta_microcode(&adev->psp, chip_name);
-               if (err)
-                       return err;
-               break;
-       case CHIP_DIMGREY_CAVEFISH:
-               err = psp_init_sos_microcode(psp, chip_name);
+               err = psp_init_ta_microcode(psp, chip_name);
                if (err)
                        return err;
                break;