Changeset 59964 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Mar 9, 2016 11:20:48 AM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: additional kernel module build fixes.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

r59635	r59964
218	218	.unload = vbox_driver_unload,
219	219	.lastclose = vbox_driver_lastclose,
220		#if LINUX_VERSION_CODE > ~~KERNEL_VERSION(3, 17~~, 0)
	220	#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
221	221	.set_busid = drm_pci_set_busid,
222	222	#endif

-              r59951
+              r59964
+{
     struct drm_device *dev = fbdev->helper.dev;
-    struct vbox_private *vbox = dev->dev_private;
     int i;
 …
     struct fb_info *info;
     __u32 pitch;
-    unsigned int fb_pitch;
     int size, ret;
     struct device *device = &dev->pdev->dev;

-              r59947
+              r59964
     struct vbox_private *vbox = fb->dev->dev_private;
     unsigned i;
-    unsigned long flags;
     LogFunc(("vboxvideo: %d: fb=%p, num_rects=%u, vbox=%p\n", __LINE__, fb,
 …
     struct vbox_private *vbox = dev->dev_private;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)
     if (vbox->fbdev)
         drm_fb_helper_restore_fbdev_mode_unlocked(&vbox->fbdev->helper);
+#else
+    mutex_lock(&dev->mode_config.mutex);
+    if (vbox->fbdev)
+        drm_fb_helper_restore_fbdev_mode(&vbox->fbdev->helper);
+    mutex_unlock(&dev->mode_config.mutex);
+#endif
+}

-              r59947
+              r59964
+}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+static struct drm_encoder *drm_encoder_find(struct drm_device *dev, uint32_t id)
+{
+     struct drm_mode_object *mo;
+     mo = drm_mode_object_find(dev, id, DRM_MODE_OBJECT_ENCODER);
+     return mo ? obj_to_encoder(mo) : NULL;
+}
+#endif
 static struct drm_encoder *vbox_best_single_encoder(struct drm_connector *connector)
 …
     struct vbox_connector *vbox_connector;
     struct drm_connector *connector;
-    int rc;
     LogFunc(("vboxvideo: %d: dev=%p, encoder=%p\n", __LINE__, dev,

Note: See TracChangeset for help on using the changeset viewer.