drm/amdgpu: Cancel the delay work when suspend
authorRex Zhu <Rex.Zhu@amd.com>
Tue, 14 Aug 2018 09:31:09 +0000 (17:31 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 27 Aug 2018 16:10:41 +0000 (11:10 -0500)
Cancel the delay work to avoid the corner case that
ib test was not running when suspend

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index 99a0e478499b339a8587be1fde0679ca6414428c..9c594763ddff843be3c716844fdcd3c7cec9eaf6 100644 (file)
@@ -2722,6 +2722,8 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon)
        if (fbcon)
                amdgpu_fbdev_set_suspend(adev, 1);
 
+       cancel_delayed_work_sync(&adev->late_init_work);
+
        if (!amdgpu_device_has_dc_support(adev)) {
                /* turn off display hw */
                drm_modeset_lock_all(dev);