[PATCH] drm/radeon: disable hard reset in hibernate for APUs

ckoenig.leichtzumerken@xxxxxxxxx (Christian König) · Sat, 16 Sep 2017 14:18:41 +0200



Am 15.09.2017 um 20:22 schrieb Alex Deucher:
> Fixes a hibernation regression on APUs.
>
> Bug: https://bugzilla.kernel.org/show_bug.cgi?id=191571
> Fixes: 274ad65c9d02bdc (drm/radeon: hard reset r600 and newer GPU when hibernating.)
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Acked-by: Christian KÃ¶nig <christian.koenig at amd.com>

> Cc: stable at vger.kernel.org
> ---
>   drivers/gpu/drm/radeon/radeon_device.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
> index 997131d..ffc10ca 100644
> --- a/drivers/gpu/drm/radeon/radeon_device.c
> +++ b/drivers/gpu/drm/radeon/radeon_device.c
> @@ -1663,7 +1663,7 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend,
>   	radeon_agp_suspend(rdev);
>   
>   	pci_save_state(dev->pdev);
> -	if (freeze && rdev->family >= CHIP_CEDAR) {
> +	if (freeze && rdev->family >= CHIP_CEDAR && !(rdev->flags & RADEON_IS_IGP)) {
>   		rdev->asic->asic_reset(rdev, true);
>   		pci_restore_state(dev->pdev);
>   	} else if (suspend) {