Revert "drm/amd/pm: fixes a random hang in S4 for SMU v13.0.4/11"
Subsystems (3)
Alex Deucher
maintainerPATCH 1/1 Revert "drm/amd/pm: fixes a random hang in S4 for SMU v13.0.4/11"
This reverts commit 31729e8c21ecfd671458e02b6511eb68c2225113.
This causes problems with reboots/shutdowns for some users.
Signed-off-by Alex Deucher <[email protected]>
Cc Tim Huang <[email protected]>
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +1 -11
@@ -226,18 +226,8 @@ static int smu_v13_0_4_system_features_control(struct smu_context *smu, bool en)struct amdgpu_device *adev = smu->adev;int ret =0 ; -if (!en && !adev->in_s0ix) { -/* Adds a GFX reset as workaround just before sending the -* MP1_UNLOAD message to prevent GC/RLC/PMFW from entering -* an invalid state. -*/ - ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_GfxDeviceDriverReset, -SMU_RESET_MODE_2 ,NULL ); -if (ret) -return ret; - +if (!en && !adev->in_s0ix) ret =smu_cmn_send_smc_msg (smu, SMU_MSG_PrepareMp1ForUnload,NULL ); - }return ret; }
Signature · 1 line
2.44.0
Quoted 7 lines · Alex Deucher
This reverts commit
31729e8c21ecfd671458e02b6511eb68c2225113.This causes problems with reboots/shutdowns for some users.
Signed-off-by Alex Deucher <[email protected]>Cc Tim Huang <[email protected]>
It would be unfortunate to drop as it did fix S4 for a number of users too. Rather than dropping could the check be made for adev->in_s4?
In any case; whichever solution happens should also CC stable because the problematic commit did go to stable eventually.
Quoted 28 lines
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +1
-11@@ -226,18 +226,8 @@ static int smu_v13_0_4_system_features_control(struct smu_context *smu, bool en)struct amdgpu_device *adev = smu->adev;int ret =0 ; -if (!en && !adev->in_s0ix) { -/* Adds a GFX reset as workaround just before sending the -* MP1_UNLOAD message to prevent GC/RLC/PMFW from entering -* an invalid state. -*/ - ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_GfxDeviceDriverReset, -SMU_RESET_MODE_2 ,NULL ); -if (ret) -return ret; - +if (!en && !adev->in_s0ix) ret =smu_cmn_send_smc_msg (smu, SMU_MSG_PrepareMp1ForUnload,NULL ); - }return ret; }