Changeset 59635 in vbox

Timestamp:

Feb 10, 2016 8:00:52 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: bring back the lastclose call-back, as we get an oops when the driver is unloaded if it is not there.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (1 diff)
• vbox_drv.h (modified) (1 diff)
• vbox_main.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/vbox_drv.c

@@ -217 +217 @@
     .load = vbox_driver_load,
     .unload = vbox_driver_unload,
+    .lastclose = vbox_driver_lastclose,
 #if LINUX_VERSION_CODE > KERNEL_VERSION(3, 17, 0)
     .set_busid = drm_pci_set_busid,

trunk/src/VBox/Additions/linux/drm/vbox_drv.h

@@ -123 +123 @@
 int vbox_driver_load(struct drm_device *dev, unsigned long flags);
 int vbox_driver_unload(struct drm_device *dev);
+void vbox_driver_lastclose(struct drm_device *dev);
 
 struct vbox_gem_object;

trunk/src/VBox/Additions/linux/drm/vbox_main.c

@@ -402 +402 @@
 }
 
+/** @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,