[PATCH] drm/amdgpu/swsmu: don't bail early on hw_setup on resume

Alex Deucher alexander.deucher at amd.com
Fri Mar 26 04:37:31 UTC 2021


The SMU comes back up with DPM enabled by the sbios, but the
driver still has to set up the SMU/driver mailbox, etc.

Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index d4b804c7b986..462917d4d5e2 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -1102,7 +1102,7 @@ static int smu_smc_hw_setup(struct smu_context *smu)
 	uint32_t pcie_gen = 0, pcie_width = 0;
 	int ret = 0;
 
-	if (adev->in_suspend && smu_is_dpm_running(smu)) {
+	if (!smu->is_apu && adev->in_suspend && smu_is_dpm_running(smu)) {
 		dev_info(adev->dev, "dpm has been enabled\n");
 		/* this is needed specifically */
 		if ((adev->asic_type >= CHIP_SIENNA_CICHLID) &&
-- 
2.30.2



More information about the amd-gfx mailing list