bochs: use drm_fb_helper_set_suspend_unlocked in suspend/resume

The "initialized" member is going away. suspend/resume still works (even
if bochsfb_create is forced to fail).

Signed-off-by: Peter Wu <peter@lekensteyn.nl>
Link: http://patchwork.freedesktop.org/patch/msgid/20180906221810.20170-2-peter@lekensteyn.nl
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
index c61b40c72b6269aaa0be60cd681e3221513771fe..0e79d9acf89e95aaa613049e209008b844005069 100644 (file)
--- a/drivers/gpu/drm/bochs/bochs_drv.c
+++ b/drivers/gpu/drm/bochs/bochs_drv.c
@@ -107,11 +107,7 @@ static int bochs_pm_suspend(struct device *dev)
 
        drm_kms_helper_poll_disable(drm_dev);
 
-       if (bochs->fb.initialized) {
-               console_lock();
-               drm_fb_helper_set_suspend(&bochs->fb.helper, 1);
-               console_unlock();
-       }
+       drm_fb_helper_set_suspend_unlocked(&bochs->fb.helper, 1);
 
        return 0;
 }
@@ -124,11 +120,7 @@ static int bochs_pm_resume(struct device *dev)
 
        drm_helper_resume_force_mode(drm_dev);
 
-       if (bochs->fb.initialized) {
-               console_lock();
-               drm_fb_helper_set_suspend(&bochs->fb.helper, 0);
-               console_unlock();
-       }
+       drm_fb_helper_set_suspend_unlocked(&bochs->fb.helper, 0);
 
        drm_kms_helper_poll_enable(drm_dev);
        return 0;