Changeset 56467 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Jun 17, 2015 7:02:41 AM (9 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: build fixes to the KMS driver for recent kernels.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (2 diffs)
• vbox_fb.c (modified) (1 diff)
• vbox_mode.c (modified) (3 diffs)
• vbox_ttm.c (modified) (7 diffs)

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

@@ -63 +63 @@
 #include <drm/ttm/ttm_memory.h>
 #include <drm/ttm/ttm_module.h>
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
+# include <drm/drm_gem.h>
+#endif
 
 /* #include "vboxvideo.h" */
@@ -206 +210 @@
     struct ttm_bo_kmap_obj kmap;
     struct drm_gem_object gem;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
     u32 placements[3];
+#else
+    struct ttm_place placements[3];
+#endif
     int pin_count;
 };

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

@@ -446 +446 @@
 
     vbox->fbdev = afbdev;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
     afbdev->helper.funcs = &vbox_fb_helper_funcs;
+#else
+    drm_fb_helper_prepare(dev, &afbdev->helper, &vbox_fb_helper_funcs);
+#endif
     ret = drm_fb_helper_init(dev, &afbdev->helper, vbox->cCrtcs, vbox->cCrtcs);
     if (ret)

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

@@ -54 +54 @@
 #include <linux/export.h>
 #include <drm/drm_crtc_helper.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
+# include <drm/drm_plane_helper.h>
+#endif
 
 static int vbox_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv,
@@ -443 +446 @@
     pVBoxConnector = to_vbox_connector(pConnector);
     device_remove_file(pConnector->dev->dev, &pVBoxConnector->deviceAttribute);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
     drm_sysfs_connector_remove(pConnector);
+#else
+    drm_connector_unregister(pConnector);
+#endif
     drm_connector_cleanup(pConnector);
     kfree(pConnector);
@@ -537 +544 @@
     pConnector->doublescan_allowed = 0;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
     drm_sysfs_connector_add(pConnector);
+#else
+    drm_connector_register(pConnector);
+#endif
 
     /* The connector supports hot-plug detection: we promise to call

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

@@ -48 +48 @@
 #include "vbox_drv.h"
 #include <ttm/ttm_page_alloc.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
+# define PLACEMENT_FLAGS(placement) (placement)
+#else
+# define PLACEMENT_FLAGS(placement) (placement).flags
+#endif
 
 static inline struct vbox_private *
@@ -345 +351 @@
 {
     u32 c = 0;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
     bo->placement.fpfn = 0;
     bo->placement.lpfn = 0;
+#else
+    unsigned i;
+#endif
+
     bo->placement.placement = bo->placements;
     bo->placement.busy_placement = bo->placements;
     if (domain & TTM_PL_FLAG_VRAM)
-        bo->placements[c++] = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;
+        PLACEMENT_FLAGS(bo->placements[c++]) = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_VRAM;
     if (domain & TTM_PL_FLAG_SYSTEM)
-        bo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
+        PLACEMENT_FLAGS(bo->placements[c++]) = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
     if (!c)
-        bo->placements[c++] = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
+        PLACEMENT_FLAGS(bo->placements[c++]) = TTM_PL_MASK_CACHING | TTM_PL_FLAG_SYSTEM;
     bo->placement.num_placement = c;
     bo->placement.num_busy_placement = c;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
+    for (i = 0; i < c; ++i)
+    {
+        bo->placements[i].fpfn = 0;
+        bo->placements[i].lpfn = 0;
+    }
+#endif
 }
 
@@ -410 +428 @@
               ttm_bo_type_device, &vboxbo->placement,
               align >> PAGE_SHIFT, false, NULL, acc_size,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
+              NULL,
+#endif
               NULL, vbox_bo_ttm_destroy);
     if (ret)
@@ -437 +458 @@
     vbox_ttm_placement(bo, pl_flag);
     for (i = 0; i < bo->placement.num_placement; i++)
-        bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
+        PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
     ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
     if (ret)
@@ -461 +482 @@
 
     for (i = 0; i < bo->placement.num_placement ; i++)
-        bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT;
+        PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
     ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
     if (ret)
@@ -489 +510 @@
     vbox_ttm_placement(bo, TTM_PL_FLAG_SYSTEM);
     for (i = 0; i < bo->placement.num_placement ; i++)
-        bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
+        PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
 
     ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
@@ -506 +527 @@
 
     if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
-        return drm_mmap(filp, vma);
+        return -EINVAL;
 
     file_priv = filp->private_data;