Changeset 83073 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 14, 2020 11:35:05 AM (5 years ago)

Author:

vboxsync

Message:

GA/Linux: ticketref:19145 kernel 5.5-rc1/rc2 - we need changes, portions contributed by Larry Finger

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -37 +37 @@
 #include <linux/vt_kern.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc_helper.h>
 

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

@@ -49 +49 @@
 #include <linux/io.h>
 #include <linux/string.h>
+#include <linux/pci.h>
 
 #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
@@ -104 +105 @@
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
 #include <drm/drmP.h>
+#else /* >= KERNEL_VERSION(5, 5, 0) */
+#include <drm/drm_file.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_device.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_vblank.h>
+#endif /* >= KERNEL_VERSION(5, 5, 0) */
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
 #include <drm/drm_encoder.h>

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

@@ -43 +43 @@
 #include <linux/init.h>
 
-#include <drm/drmP.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_fb_helper.h>

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

@@ -399 +399 @@
                                                     *connector)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+        struct drm_encoder *encoder;
+
+        /* There is only one encoder per connector */
+        drm_connector_for_each_possible_encoder(connector, encoder)
+            return encoder;
+#else /* KERNEL_VERSION < 5.5 */
         int enc_id = connector->encoder_ids[0];
 
         /* pick the encoder ids */
         if (enc_id)
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) || \
-    (defined(CONFIG_SUSE_VERSION) && \
-        LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)) || \
-    defined(RHEL_76)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) || \
+     (defined(CONFIG_SUSE_VERSION) && \
+         LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)) || \
+     defined(RHEL_76)
                 return drm_encoder_find(connector->dev, NULL, enc_id);
-#else
+# else
                 return drm_encoder_find(connector->dev, enc_id);
-#endif
-
+# endif
+#endif /* KERNEL_VERSION < 5.5 */
         return NULL;
 }

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

@@ -311 +311 @@
                                  dev->anon_inode->i_mapping,
 #endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
-                                 DRM_FILE_PAGE_OFFSET, true);
-#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
+                                 dev->vma_offset_manager,
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
+                                 DRM_FILE_PAGE_OFFSET,
+#endif
                                  true);
-#endif
         if (ret) {
                 DRM_ERROR("Error initialising bo driver; %d\n", ret);