aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
diff options
context:
space:
mode:
authorRex Zhu <Rex.Zhu@amd.com>2018-08-14 05:31:09 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-08-27 12:10:41 -0400
commita54594752ad48de75dc0158f0c9b124177235efc (patch)
treefd08b58e9ac4b9cd75dcc0e9a669fb80390221f4 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
parent6dddaeef4f9e0445a75261f88e29de5a24e302c6 (diff)
drm/amdgpu: Cancel the delay work when suspend
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 99a0e478499b..9c594763ddff 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2722,6 +2722,8 @@ int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon)
2722 if (fbcon) 2722 if (fbcon)
2723 amdgpu_fbdev_set_suspend(adev, 1); 2723 amdgpu_fbdev_set_suspend(adev, 1);
2724 2724
2725 cancel_delayed_work_sync(&adev->late_init_work);
2726
2725 if (!amdgpu_device_has_dc_support(adev)) { 2727 if (!amdgpu_device_has_dc_support(adev)) {
2726 /* turn off display hw */ 2728 /* turn off display hw */
2727 drm_modeset_lock_all(dev); 2729 drm_modeset_lock_all(dev);