drm/amdgpu: reset runpm flag if device suspend fails
authorAlex Deucher <alexander.deucher@amd.com>
Thu, 4 Feb 2021 14:32:17 +0000 (09:32 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 9 Feb 2021 20:30:13 +0000 (15:30 -0500)
If device suspend fails when we attempt to runtime suspend,
reset the runpm flag.

Acked-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

index 0b07cc15ebdd98f1433b55e3385cd7d3a3739236..03c529630c21f3601ce022f40b8bb9575f65230f 100644 (file)
@@ -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