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

Timestamp:

Jun 3, 2016 9:45:56 AM (9 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: Linux 4.7 fixes

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (1 diff)
• vbox_fb.c (modified) (1 diff)
• vbox_main.c (modified) (2 diffs)
• vbox_mode.c (modified) (1 diff)

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

@@ -286 +286 @@
     int ret;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) 
+    ret = ttm_bo_reserve(&bo->bo, true, no_wait, NULL);
+#else
     ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0);
+#endif
     if (ret)
     {

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

@@ -75 +75 @@
                  int x, int y, int width, int height)
 {
-    struct drm_device *dev = fbdev->helper.dev;
     int i;
 

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

@@ -203 +203 @@
 
     LogFunc(("vboxvideo: %d\n", __LINE__));
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+    obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]);
+#else
     obj = drm_gem_object_lookup(dev, filp, mode_cmd->handles[0]);
+#endif
     if (obj == NULL)
         return ERR_PTR(-ENOENT);
@@ -546 +550 @@
              dev, (unsigned)handle));
     mutex_lock(&dev->struct_mutex);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+    obj = drm_gem_object_lookup(file, handle);
+#else
     obj = drm_gem_object_lookup(dev, file, handle);
+#endif
     if (obj == NULL) {
         ret = -ENOENT;

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

@@ -720 +720 @@
         return -EINVAL;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+    obj = drm_gem_object_lookup(file_priv, handle);
+#else
     obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+#endif
     if (obj)
     {