[AMD Official Use Only]

Reviewed-by: Tao Zhou <tao.zh...@amd.com<mailto:tao.zh...@amd.com>>
________________________________
From: Huang, Ray <ray.hu...@amd.com>
Sent: Wednesday, July 28, 2021 5:04 PM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Cc: Deucher, Alexander <alexander.deuc...@amd.com>; Zhang, Hawking 
<hawking.zh...@amd.com>; Zhou1, Tao <tao.zh...@amd.com>; Yu, Lang 
<lang...@amd.com>; Gong, Curry <curry.g...@amd.com>; Huang, Ray 
<ray.hu...@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.hu...@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

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to