[PATCH v5 4/4] drm/amd: don't reset dGPUs that don't go through system S3

[Limonciello, Mario]

[AMD Official Use Only]

> -----Original Message-----
> From: Limonciello, Mario <Mario.Limonciello at amd.com>
> Sent: Tuesday, January 25, 2022 22:10
> To: amd-gfx at lists.freedesktop.org
> Cc: Liang, Prike <Prike.Liang at amd.com>; Limonciello, Mario
> <Mario.Limonciello at amd.com>
> Subject: [PATCH v5 4/4] drm/amd: don't reset dGPUs that don't go through
> system S3
> 
> dGPUs connected to Intel systems configured for suspend to idle
> will not necessarily have the power rails cut at suspend and
> resetting the GPU may lead to problematic behaviors.
> 
> Fixes: 6dc8265f9803 ("drm/amdgpu: always reset the asic in suspend (v2)")
> Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1879

Testing has failed with this patch on the original issue mentioned above, so if
the rest of this series is OK, this one at least should be dropped for now.

> Signed-off-by: Mario Limonciello <mario.limonciello at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 123ec5a07dd5..66290f986544 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -2319,7 +2319,7 @@ static int amdgpu_pmops_suspend(struct device
> *dev)
>  		r = amdgpu_device_suspend(drm_dev, true);
>  		if (r)
>  			return r;
> -		if (!adev->in_s0ix)
> +		if (!adev->in_s0ix && pm_suspend_via_firmware())
>  			r = amdgpu_asic_reset(adev);
>  	}
>  	return r;
> --
> 2.25.1