| Message ID | 20171019230213.63521-16-noralf@tronnes.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
HI, On 20-10-17 01:02, Noralf Trønnes wrote: > This driver can use drm_fb_helper_lastclose() as its .lastclose callback. > > Cc: Hans de Goede <hdegoede@redhat.com> > Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Thank you for doing this, looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > drivers/staging/vboxvideo/vbox_drv.c | 2 +- > drivers/staging/vboxvideo/vbox_drv.h | 1 - > drivers/staging/vboxvideo/vbox_main.c | 12 ------------ > 3 files changed, 1 insertion(+), 14 deletions(-) > > diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c > index e18642e5027e..a4d8d7898e3d 100644 > --- a/drivers/staging/vboxvideo/vbox_drv.c > +++ b/drivers/staging/vboxvideo/vbox_drv.c > @@ -229,7 +229,7 @@ static struct drm_driver driver = { > > .load = vbox_driver_load, > .unload = vbox_driver_unload, > - .lastclose = vbox_driver_lastclose, > + .lastclose = drm_fb_helper_lastclose, > .master_set = vbox_master_set, > .master_drop = vbox_master_drop, > > diff --git a/drivers/staging/vboxvideo/vbox_drv.h b/drivers/staging/vboxvideo/vbox_drv.h > index 4b9302703b36..7273d7e9bc9b 100644 > --- a/drivers/staging/vboxvideo/vbox_drv.h > +++ b/drivers/staging/vboxvideo/vbox_drv.h > @@ -128,7 +128,6 @@ struct vbox_private { > > int vbox_driver_load(struct drm_device *dev, unsigned long flags); > void vbox_driver_unload(struct drm_device *dev); > -void vbox_driver_lastclose(struct drm_device *dev); > > struct vbox_gem_object; > > diff --git a/drivers/staging/vboxvideo/vbox_main.c b/drivers/staging/vboxvideo/vbox_main.c > index 80bd039fa08e..c3d756620fd5 100644 > --- a/drivers/staging/vboxvideo/vbox_main.c > +++ b/drivers/staging/vboxvideo/vbox_main.c > @@ -421,18 +421,6 @@ void vbox_driver_unload(struct drm_device *dev) > vbox_hw_fini(vbox); > } > > -/** > - * @note this is described in the DRM framework documentation. AST does not > - * have it, but we get an oops on driver unload if it is not present. > - */ > -void vbox_driver_lastclose(struct drm_device *dev) > -{ > - struct vbox_private *vbox = dev->dev_private; > - > - if (vbox->fbdev) > - drm_fb_helper_restore_fbdev_mode_unlocked(&vbox->fbdev->helper); > -} > - > int vbox_gem_create(struct drm_device *dev, > u32 size, bool iskernel, struct drm_gem_object **obj) > { >
diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c index e18642e5027e..a4d8d7898e3d 100644 --- a/drivers/staging/vboxvideo/vbox_drv.c +++ b/drivers/staging/vboxvideo/vbox_drv.c @@ -229,7 +229,7 @@ static struct drm_driver driver = { .load = vbox_driver_load, .unload = vbox_driver_unload, - .lastclose = vbox_driver_lastclose, + .lastclose = drm_fb_helper_lastclose, .master_set = vbox_master_set, .master_drop = vbox_master_drop, diff --git a/drivers/staging/vboxvideo/vbox_drv.h b/drivers/staging/vboxvideo/vbox_drv.h index 4b9302703b36..7273d7e9bc9b 100644 --- a/drivers/staging/vboxvideo/vbox_drv.h +++ b/drivers/staging/vboxvideo/vbox_drv.h @@ -128,7 +128,6 @@ struct vbox_private { int vbox_driver_load(struct drm_device *dev, unsigned long flags); void vbox_driver_unload(struct drm_device *dev); -void vbox_driver_lastclose(struct drm_device *dev); struct vbox_gem_object; diff --git a/drivers/staging/vboxvideo/vbox_main.c b/drivers/staging/vboxvideo/vbox_main.c index 80bd039fa08e..c3d756620fd5 100644 --- a/drivers/staging/vboxvideo/vbox_main.c +++ b/drivers/staging/vboxvideo/vbox_main.c @@ -421,18 +421,6 @@ void vbox_driver_unload(struct drm_device *dev) vbox_hw_fini(vbox); } -/** - * @note this is described in the DRM framework documentation. AST does not - * have it, but we get an oops on driver unload if it is not present. - */ -void vbox_driver_lastclose(struct drm_device *dev) -{ - struct vbox_private *vbox = dev->dev_private; - - if (vbox->fbdev) - drm_fb_helper_restore_fbdev_mode_unlocked(&vbox->fbdev->helper); -} - int vbox_gem_create(struct drm_device *dev, u32 size, bool iskernel, struct drm_gem_object **obj) {
This driver can use drm_fb_helper_lastclose() as its .lastclose callback. Cc: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Noralf Trønnes <noralf@tronnes.org> --- drivers/staging/vboxvideo/vbox_drv.c | 2 +- drivers/staging/vboxvideo/vbox_drv.h | 1 - drivers/staging/vboxvideo/vbox_main.c | 12 ------------ 3 files changed, 1 insertion(+), 14 deletions(-)