[PATCH] Revert "drm/amd/pm: fixes a random hang in S4 for SMU v13.0.4/11"

[Mario Limonciello]

On 4/29/2024 08:38, Alex Deucher wrote:
> This reverts commit 31729e8c21ecfd671458e02b6511eb68c2225113.
> 
> This causes problems with reboots/shutdowns for some users.
> 
> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3351
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Cc: Tim Huang <Tim.Huang at amd.com>

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.

> ---
>   drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 12 +-----------
>   1 file changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
> index 88f1a0d878f33..e8119918ef6b1 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
> @@ -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;
>   }