Changeset 47341 in vbox

Timestamp:

Jul 23, 2013 12:54:56 PM (11 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: more kernel version magic and a small additional code drop.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vboxvideo_crtc.c (modified) (2 diffs)
• vboxvideo_dac.c (modified) (1 diff)
• vboxvideo_display.c (modified) (1 diff)
• vboxvideo_drv.c (modified) (2 diffs)
• vboxvideo_vga.c (modified) (1 diff)

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

@@ -76 +76 @@
 
 static bool vboxvideo_crtc_mode_fixup(struct drm_crtc *crtc,
-                  struct drm_display_mode *mode,
-                  struct drm_display_mode *adjusted_mode)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+                                     const struct drm_display_mode *mode,
+#else
+                                     struct drm_display_mode *mode,
+#endif
+                                     struct drm_display_mode *adjusted_mode)
 {
     return true;
@@ -127 +131 @@
 
 static void vboxvideo_crtc_gamma_set(struct drm_crtc *crtc, u16 *red,
-                                     u16 *green, u16 *blue, uint32_t size)
+                                     u16 *green, u16 *blue,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
+                                     uint32_t start,
+#endif
+                                     uint32_t size)
 {
     /* Dummy */

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

@@ -74 +74 @@
 
 static bool vboxvideo_dac_mode_fixup(struct drm_encoder *encoder,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)
+                                     const struct drm_display_mode *mode,
+#else
                                      struct drm_display_mode *mode,
+#endif
                                      struct drm_display_mode *adjusted_mode)
 {

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

@@ -80 +80 @@
         return -1;
     }
+
+    drm_mode_connector_attach_encoder(connector, encoder);
+
     return 0;
 }

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

@@ -65 +65 @@
 MODULE_DEVICE_TABLE(pci, pciidlist);
 
+#if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
+# define IOCTL_MEMBER unlocked_ioctl
+#else
+# define IOCTL_MEMBER ioctl
+#endif
+
+#define DRIVER_FOPS \
+    { \
+        .owner = THIS_MODULE, \
+        .open = drm_open, \
+        .release = drm_release, \
+        /* This was changed with Linux 2.6.33 but Fedora backported this \
+         * change to their 2.6.32 kernel. */ \
+        .IOCTL_MEMBER = drm_ioctl, \
+        .mmap = drm_mmap, \
+        .poll = drm_poll, \
+        .fasync = drm_fasync, \
+    }
+
+#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 = DRIVER_FOPS;
+#endif
+
 static struct drm_driver driver =
 {
@@ -70 +94 @@
     .load = vboxvideo_driver_load,
     .unload = vboxvideo_driver_unload,
+    /* As of Linux 2.6.37, always the internal functions are used. */
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 37) && !defined(DRM_RHEL61)
     .reclaim_buffers = drm_core_reclaim_buffers,
-    /* As of Linux 2.6.37, always the internal functions are used. */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) && !defined(DRM_RHEL61)
     .get_map_ofs = drm_core_get_map_ofs,
     .get_reg_ofs = drm_core_get_reg_ofs,
 #endif
     .ioctls = vboxvideo_ioctls,
-    .fops =
-    {
-        .owner = THIS_MODULE,
-        .open = drm_open,
-        .release = drm_release,
-        /* This was changed with Linux 2.6.33 but Fedora backported this
-         * change to their 2.6.32 kernel. */
-#if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
-        .unlocked_ioctl = drm_ioctl,
-#else
-        .ioctl = drm_ioctl,
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_RHEL63) && !defined(DRM_DEBIAN_34ON32)
+    .fops = DRIVER_FOPS,
+#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) || defined(DRM_DEBIAN_34ON32) */
+    .fops = &driver_fops,
 #endif
-        .mmap = drm_mmap,
-        .poll = drm_poll,
-        .fasync = drm_fasync,
-    },
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
     .pci_driver =

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

@@ -82 +82 @@
 
 static enum drm_connector_status vboxvideo_vga_detect(struct drm_connector
-                                                            *connector)
+                                                            *connector
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
+                                                      , bool force
+#endif
+                                                      )
 {
     return connector_status_connected;