[PATCH] Revert "drm/amd/pm: keep the BACO feature enabled for suspend"

[PATCH] Revert "drm/amd/pm: keep the BACO feature enabled for suspend"

[Alex Deucher]

This reverts commit eaa090538e8d21801c6d5f94590c3799e6a528b5.

Commit ebc002e3ee78 ("drm/amdgpu: don't use BACO for reset in S3")
stops using BACO for reset during suspend, so it's no longer
necessary to leave BACO enabled during suspend.  This fixes
resume from suspend on the navy flounder dGPU in the ASUS ROG
Strix G513QY.

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2008
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1982
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 395f266be690..956062496202 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -1390,14 +1390,8 @@ static int smu_disable_dpms(struct smu_context *smu)
 {
 	struct amdgpu_device *adev = smu->adev;
 	int ret = 0;
-	/*
-	 * TODO: (adev->in_suspend && !adev->in_s0ix) is added to pair
-	 * the workaround which always reset the asic in suspend.
-	 * It's likely that workaround will be dropped in the future.
-	 * Then the change here should be dropped together.
-	 */
 	bool use_baco = !smu->is_apu &&
-		(((amdgpu_in_reset(adev) || (adev->in_suspend && !adev->in_s0ix)) &&
+		((amdgpu_in_reset(adev) &&
 		  (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) ||
 		 ((adev->in_runpm || adev->in_s4) && amdgpu_asic_supports_baco(adev)));
 
-- 
2.35.1

Re: [PATCH] Revert "drm/amd/pm: keep the BACO feature enabled for suspend"

[Lazar, Lijo]

On 5/10/2022 7:21 PM, Alex Deucher wrote:
> This reverts commit eaa090538e8d21801c6d5f94590c3799e6a528b5.
> 
> Commit ebc002e3ee78 ("drm/amdgpu: don't use BACO for reset in S3")
> stops using BACO for reset during suspend, so it's no longer
> necessary to leave BACO enabled during suspend.  This fixes
> resume from suspend on the navy flounder dGPU in the ASUS ROG
> Strix G513QY.
> 
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2008
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1982
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>

Thanks,
Lijo

> ---
>   drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 +-------
>   1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> index 395f266be690..956062496202 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> @@ -1390,14 +1390,8 @@ static int smu_disable_dpms(struct smu_context *smu)
>   {
>   	struct amdgpu_device *adev = smu->adev;
>   	int ret = 0;
> -	/*
> -	 * TODO: (adev->in_suspend && !adev->in_s0ix) is added to pair
> -	 * the workaround which always reset the asic in suspend.
> -	 * It's likely that workaround will be dropped in the future.
> -	 * Then the change here should be dropped together.
> -	 */
>   	bool use_baco = !smu->is_apu &&
> -		(((amdgpu_in_reset(adev) || (adev->in_suspend && !adev->in_s0ix)) &&
> +		((amdgpu_in_reset(adev) &&
>   		  (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) ||
>   		 ((adev->in_runpm || adev->in_s4) && amdgpu_asic_supports_baco(adev)));
>   
> 

Re: Revert "drm/amd/pm: keep the BACO feature enabled for suspend"

[Limonciello, Mario]

On 5/10/2022 08:51, Alex Deucher wrote:
> This reverts commit eaa090538e8d21801c6d5f94590c3799e6a528b5.
> 
> Commit ebc002e3ee78 ("drm/amdgpu: don't use BACO for reset in S3")
> stops using BACO for reset during suspend, so it's no longer
> necessary to leave BACO enabled during suspend.  This fixes
> resume from suspend on the navy flounder dGPU in the ASUS ROG
> Strix G513QY.
> 
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2008
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1982
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>

Make sure to CC stable as ebc002e3ee78 also was.

Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
>   drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 +-------
>   1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> index 395f266be690..956062496202 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> @@ -1390,14 +1390,8 @@ static int smu_disable_dpms(struct smu_context *smu)
>   {
>   	struct amdgpu_device *adev = smu->adev;
>   	int ret = 0;
> -	/*
> -	 * TODO: (adev->in_suspend && !adev->in_s0ix) is added to pair
> -	 * the workaround which always reset the asic in suspend.
> -	 * It's likely that workaround will be dropped in the future.
> -	 * Then the change here should be dropped together.
> -	 */
>   	bool use_baco = !smu->is_apu &&
> -		(((amdgpu_in_reset(adev) || (adev->in_suspend && !adev->in_s0ix)) &&
> +		((amdgpu_in_reset(adev) &&
>   		  (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) ||
>   		 ((adev->in_runpm || adev->in_s4) && amdgpu_asic_supports_baco(adev)));
>