From: Hawking Zhang <Hawking.Zhang@amd.com>
Date: Mon, 25 May 2020 07:27:18 +0000 (+0800)
Subject: drm/amdgpu: load pmfw prior to other non-psp fw for aldebaran
X-Git-Tag: howlett/maple/20220722_2~3286^2~12^2~254
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=428ad99e9ccd0410b106910ede61ace700bb0fe5;p=users%2Fjedix%2Flinux-maple.git

drm/amdgpu: load pmfw prior to other non-psp fw for aldebaran

PMFW should be loaded before any operation that
may toggling DF-Cstate. otherwsie, tOS has no
choice but to locally toggle DF Cstate (i.e.
disable DF-Cstate even it already enabled by VBIOS)

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Kevin Wang <kevin1.wang@amd.com>
Reviewed-by: Le Ma <Le.Ma@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 88518897c17c..a5f79b09de9c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -72,7 +72,8 @@ static void psp_check_pmfw_centralized_cstate_management(struct psp_context *psp
 	if (adev->flags & AMD_IS_APU)
 		return;
 
-	if ((adev->asic_type == CHIP_ARCTURUS) ||
+	if ((adev->asic_type == CHIP_ARCTURUS)	||
+	    (adev->asic_type == CHIP_ALDEBARAN)	||
 	    (adev->asic_type >= CHIP_NAVI12))
 		psp->pmfw_centralized_cstate_management = true;
 }