Skip to contentSkip to conversation

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

PATCH In review Huang Rui 2 participants 2 messages Jul 28, 2021

Subsystems (2)
lore
Share & tools
lore

Huang Rui

author
#0 lore raw

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

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

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +4 -3
index e001875ea1b7..5fdeceaa979f 100644
@@ -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");
 	}
Signature · 6 lines
2.25.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by Tao Zhou on v1 1/1
#1 lore raw

[AMD Official Use Only]

________________________________
From: Huang, Ray <[email protected]>
Sent: Wednesday, July 28, 2021 5:04 PM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Yu, Lang <[email protected]>; Gong, Curry <[email protected]>; Huang, Ray <[email protected]>
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.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +4 -3
index e001875ea1b7..5fdeceaa979f 100644
@@ -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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx