[PATCH] drm/amdgpu: enable psp front door loading by default for cyan_skillfish2

[Zhou1, Tao]

[AMD Official Use Only]

Reviewed-by: Tao Zhou <tao.zhou1 at amd.com<mailto:tao.zhou1 at amd.com>>
________________________________
From: Huang, Ray <Ray.Huang at amd.com>
Sent: Wednesday, July 28, 2021 5:04 PM
To: amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>
Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; Zhang, Hawking <Hawking.Zhang at amd.com>; Zhou1, Tao <Tao.Zhou1 at amd.com>; Yu, Lang <Lang.Yu at amd.com>; Gong, Curry <Curry.Gong at amd.com>; Huang, Ray <Ray.Huang at amd.com>
Subject: [PATCH] drm/amdgpu: enable psp front door loading by default for cyan_skillfish2

The function is ready on psp firmware, and enable it by default.

Signed-off-by: Huang Rui <ray.huang at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index e001875ea1b7..5fdeceaa979f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -410,10 +410,11 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
                 else
                         return AMDGPU_FW_LOAD_PSP;
         case CHIP_CYAN_SKILLFISH:
-               if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2 &&
-                   load_type > 1)
+               if (!(load_type &&
+                     adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2))
+                       return AMDGPU_FW_LOAD_DIRECT;
+               else
                         return AMDGPU_FW_LOAD_PSP;
-               return AMDGPU_FW_LOAD_DIRECT;
         default:
                 DRM_ERROR("Unknown firmware load type\n");
         }
--
2.25.1

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