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

Commit 7a0483ac authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm/bochs: switch to generic drm fbdev emulation 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20190111053752.4004-15-kraxel@redhat.com
parent 132a4534

drivers/gpu/drm/bochs/bochs_drv.c

+1 −12
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ static int bochs_modeset = -1; 
module_param_named(modeset, bochs_modeset, int, 0444);

MODULE_PARM_DESC(modeset, "enable/disable kernel modesetting");



static bool enable_fbdev = true;

module_param_named(fbdev, enable_fbdev, bool, 0444);

MODULE_PARM_DESC(fbdev, "register fbdev device");



/* ---------------------------------------------------------------------- */

/* drm interface                                                          */
@@ -27,7 +23,6 @@ static void bochs_unload(struct drm_device *dev) 
{

	struct bochs_device *bochs = dev->dev_private;



	bochs_fbdev_fini(bochs);

	bochs_kms_fini(bochs);

	bochs_mm_fini(bochs);

	bochs_hw_fini(dev);
@@ -58,9 +53,6 @@ static int bochs_load(struct drm_device *dev) 
	if (ret)

		goto err;



	if (enable_fbdev)

		bochs_fbdev_init(bochs);



	return 0;



err:
@@ -110,9 +102,7 @@ static int bochs_pm_suspend(struct device *dev) 
{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct drm_device *drm_dev = pci_get_drvdata(pdev);

	struct bochs_device *bochs = drm_dev->dev_private;



	drm_fb_helper_set_suspend_unlocked(&bochs->fb.helper, 1);

	return drm_mode_config_helper_suspend(drm_dev);

}
@@ -120,9 +110,7 @@ static int bochs_pm_resume(struct device *dev) 
{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct drm_device *drm_dev = pci_get_drvdata(pdev);

	struct bochs_device *bochs = drm_dev->dev_private;



	drm_fb_helper_set_suspend_unlocked(&bochs->fb.helper, 0);

	return drm_mode_config_helper_resume(drm_dev);

}

#endif
@@ -167,6 +155,7 @@ static int bochs_pci_probe(struct pci_dev *pdev, 
	if (ret)

		goto err_unload;



	drm_fbdev_generic_setup(dev, 32);

	return ret;



err_unload: