Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70c0ef7b authored by Peter Wu's avatar Peter Wu Committed by Gerd Hoffmann
Browse files

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: default avatarPeter Wu <peter@lekensteyn.nl>
Link: http://patchwork.freedesktop.org/patch/msgid/20180906221810.20170-2-peter@lekensteyn.nl


Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent eae06120

drivers/gpu/drm/bochs/bochs_drv.c

+2 −10
Original line number Diff line number Diff line
@@ -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;