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

Timestamp:

Jul 11, 2019 11:59:17 AM (6 years ago)

Author:

vboxsync

Message:

Additions/linux/vboxvideo: fixes for EL 7.2 and EL 7.3.
bugref:8282: Additions/linux: track kernel changes to vboxvideo in our own tree

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -322 +322 @@
         .master_set = vbox_master_set,
         .master_drop = vbox_master_drop,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_72)
 # if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) && !defined(RHEL_75) \
   && !defined(OPENSUSE_151)
@@ -373 +373 @@
                 return -EINVAL;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
         return pci_register_driver(&vbox_pci_driver);
+#else
+        return drm_pci_init(&driver, &vbox_pci_driver);
+#endif
 }
 
 static void __exit vbox_exit(void)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
         pci_unregister_driver(&vbox_pci_driver);
+#else
+        drm_pci_exit(&driver, &vbox_pci_driver);
+#endif
 }
 

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

@@ -426 +426 @@
         spin_lock_init(&fbdev->dirty_lock);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) && !defined(RHEL_73)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) && !defined(RHEL_72)
         fbdev->helper.funcs = &vbox_fb_helper_funcs;
 #else