[PATCH 2/2] drm/amdgpu: Enable TA firmware loading for dimgrey_cavefish

[Deucher, Alexander]

[AMD Official Use Only - Internal Distribution Only]

Series is:
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
________________________________
From: Bhawanpreet Lakha <Bhawanpreet.Lakha at amd.com>
Sent: Wednesday, November 11, 2020 6:04 PM
To: Deucher, Alexander <Alexander.Deucher at amd.com>; Clements, John <John.Clements at amd.com>
Cc: Kazlauskas, Nicholas <Nicholas.Kazlauskas at amd.com>; amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>; Lakha, Bhawanpreet <Bhawanpreet.Lakha at amd.com>
Subject: [PATCH 2/2] drm/amdgpu: Enable TA firmware loading for dimgrey_cavefish

Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index 03e88dbf92be..edd2d6bd1d86 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -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;
--
2.25.1

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20201112/4311554a/attachment-0001.htm>