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

Timestamp:

Mar 8, 2016 8:05:32 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: fixes for building the drm module with the Oracle UEK kernel.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_irq.c (modified) (3 diffs)

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

@@ -94 +94 @@
                                vbox->last_mode_hints);
     AssertMsgRCReturnVoid(rc, ("VBoxHGSMIGetModeHints failed, rc=%Rrc.\n", rc));
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
     drm_modeset_lock_all(dev);
+#else
+    mutex_lock(&dev->mode_config.mutex);
+#endif
     list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
         vbox_connector = to_vbox_connector(connector);
@@ -116 +120 @@
         }
     }
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
     drm_modeset_unlock_all(dev);
+#else
+    mutex_unlock(&dev->mode_config.mutex);
+#endif
 }
 
@@ -137 +145 @@
     LogFunc(("vboxvideo: %d: vbox=%p\n", __LINE__, vbox));
     vbox_update_mode_hints(vbox);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)
     ret = drm_irq_install(vbox->dev, vbox->dev->pdev->irq);
+#else
+    ret = drm_irq_install(vbox->dev);
+#endif
     if (unlikely(ret != 0)) {
         vbox_irq_fini(vbox);