From: Rex Zhu Date: Tue, 14 Aug 2018 09:31:09 +0000 (+0800) Subject: drm/amdgpu: Cancel the delay work when suspend X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a54594752ad48de75dc0158f0c9b124177235efc;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Rex Zhu Signed-off-by: Alex Deucher --- 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) 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);