Message ID | 20181219115127.31359-13-kraxel@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | drm/bochs: cleanups, atomic modesetting, generic fbdev. | expand |
On 12/19/18 1:51 PM, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > drivers/gpu/drm/bochs/bochs_drv.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c > index a9c7140e3b..f1f65324bb 100644 > --- a/drivers/gpu/drm/bochs/bochs_drv.c > +++ b/drivers/gpu/drm/bochs/bochs_drv.c > @@ -27,7 +27,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 +57,6 @@ static int bochs_load(struct drm_device *dev) > if (ret) > goto err; > > - if (enable_fbdev) > - bochs_fbdev_init(bochs); > - I think that after this change you don't need "module_param_named(fbdev, enable_fbdev, bool, 0444);" > return 0; > > err: > @@ -178,6 +174,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:
diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c index a9c7140e3b..f1f65324bb 100644 --- a/drivers/gpu/drm/bochs/bochs_drv.c +++ b/drivers/gpu/drm/bochs/bochs_drv.c @@ -27,7 +27,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 +57,6 @@ static int bochs_load(struct drm_device *dev) if (ret) goto err; - if (enable_fbdev) - bochs_fbdev_init(bochs); - return 0; err: @@ -178,6 +174,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:
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- drivers/gpu/drm/bochs/bochs_drv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)