Changeset 63755 in vbox for trunk/src/VBox

Timestamp:

Sep 7, 2016 4:55:01 PM (8 years ago)

Author:

vboxsync

Message:

bugref:4567: Linux kernel driver maintenance: update drm driver to work with Linux 4.8.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.c (modified) (1 diff)
• vbox_ttm.c (modified) (1 diff)

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

@@ -245 +245 @@
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
 static void vbox_master_drop(struct drm_device *dev,
                              struct drm_file *file_priv,
                              bool from_release)
+#else
+static void vbox_master_drop(struct drm_device *dev,
+                             struct drm_file *file_priv)
+#endif
 {
     struct vbox_private *vbox = dev->dev_private;

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

@@ -222 +222 @@
 {
     int r;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
     r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
+#else
+    r = ttm_bo_move_memcpy(bo, evict, interruptible, no_wait_gpu, new_mem);
+#endif
     return r;
 }