Changeset 48354 in vbox

Timestamp:

Sep 6, 2013 12:52:27 PM (11 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: build on SLES 11 sp 3.

File:

• trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c (modified) (6 diffs)

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

@@ -69 +69 @@
 #   endif
 #   if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 3)
-#    define DRM_RHEL63
+#    define DRM_FOPS_AS_POINTER
 #   endif
 #   if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 4)
-#    define DRM_RHEL64
+#    define DRM_NO_RECLAIM_BUFFERS
 #   endif
 #  endif
@@ -83 +83 @@
 #  if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 39) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
 #   if defined(DRM_MODE_OBJECT_PLANE) && defined(DRM_IOCTL_MODE_ADDFB2)
-#    define DRM_DEBIAN_34ON32
+#    define DRM_FOPS_AS_POINTER
 #   endif
 #  endif
 # endif
+
+#ifdef CONFIG_SUSE_KERNEL
+/* This is to cover the SLES 11 SP3 kernel back-ports. */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,61)
+#  if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
+#    define DRM_FOPS_AS_POINTER
+#    define DRM_NO_RECLAIM_BUFFERS
+#  endif
+# endif
+#endif
 
 static struct pci_device_id pciidlist[] = {
@@ -102 +112 @@
 #endif
 }
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) || defined(DRM_DEBIAN_34ON32)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_FOPS_AS_POINTER)
 /* since linux-3.3.0-rc1 drm_driver::fops is pointer */
 static struct file_operations driver_fops =
@@ -120 +130 @@
     /* .driver_features = DRIVER_USE_MTRR, */
     .load = vboxvideo_driver_load,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0) && !defined(DRM_RHEL64)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0) && !defined(DRM_NO_RECLAIM_BUFFERS)
     .reclaim_buffers = drm_core_reclaim_buffers,
 #endif
@@ -128 +138 @@
     .get_reg_ofs = drm_core_get_reg_ofs,
 #endif
-# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_RHEL63) && !defined(DRM_DEBIAN_34ON32)
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_FOPS_AS_POINTER)
     .fops =
     {
@@ -145 +155 @@
         .fasync = drm_fasync,
     },
-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) || defined(DRM_DEBIAN_34ON32) */
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_FOPS_AS_POINTER) */
     .fops = &driver_fops,
 #endif