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

Timestamp:

Mar 28, 2013 12:49:32 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

84603

Message:

Additions/linux/drm: added hack for detecting Debian kernels 3.2.39++

File:

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

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

@@ -65 +65 @@
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32)
 #  ifdef RHEL_RELEASE_CODE
-#   if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6,1)
+#   if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 1)
 #    define DRM_RHEL61
 #   endif
-#   if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6,3)
+#   if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 3)
 #    define DRM_RHEL63
 #   endif
-#   if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6,4)
+#   if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 4)
 #    define DRM_RHEL64
 #   endif
@@ -80 +80 @@
 #include "vboxvideo_drm.h"
 
+# ifndef RHEL_RELEASE_CODE
+#  if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 39) && LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+#   ifdef DRM_SWITCH_POWER_ON
+#    define DRM_DEBIAN_34ON32
+#   endif
+#  endif
+# endif
+
 static struct pci_device_id pciidlist[] = {
         vboxvideo_PCI_IDS
@@ -92 +100 @@
 #endif
 }
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) || defined(DRM_DEBIAN_34ON32)
 /* since linux-3.3.0-rc1 drm_driver::fops is pointer */
 static struct file_operations driver_fops =
@@ -118 +126 @@
     .get_reg_ofs = drm_core_get_reg_ofs,
 #endif
-# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_RHEL63)
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_RHEL63) && !defined(DRM_DEBIAN_34ON32)
     .fops =
     {
@@ -135 +143 @@
         .fasync = drm_fasync,
     },
-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) */
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) || defined(DRM_DEBIAN_34ON32) */
     .fops = &driver_fops,
 #endif