From: Alex Deucher Date: Thu, 4 Feb 2021 14:32:17 +0000 (-0500) Subject: drm/amdgpu: reset runpm flag if device suspend fails X-Git-Tag: baikal/aarch64/sdk6.1~7223^2~1^2~26 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=997230ab9f09a1e3718e009eeeef790fd5cdf605;p=kernel.git drm/amdgpu: reset runpm flag if device suspend fails If device suspend fails when we attempt to runtime suspend, reset the runpm flag. Acked-by: Evan Quan Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 0b07cc15ebdd9..03c529630c21f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -1350,8 +1350,10 @@ static int amdgpu_pmops_runtime_suspend(struct device *dev) drm_dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; ret = amdgpu_device_suspend(drm_dev, false); - if (ret) + if (ret) { + adev->in_runpm = false; return ret; + } if (amdgpu_device_supports_atpx(drm_dev)) { /* Only need to handle PCI state in the driver for ATPX