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

Timestamp:

Oct 20, 2017 10:17:44 AM (7 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: make vboxvideo work with Linux 4.14.
bugref:8524: Additions/linux: play nicely with distribution-installed Additions

Changes needed to build against Linux 4.14, applying them to older versions
too where that will not hurt.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -273 +273 @@
         .master_drop = vbox_master_drop,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
         .set_busid = drm_pci_set_busid,
+# endif
 #endif
 
@@ -308 +310 @@
 static int __init vbox_init(void)
 {
-#ifdef CONFIG_VGA_CONSOLE
+#ifdef CONFIG_VGA_CONSOLE || LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
         if (vgacon_text_force() && vbox_modeset == -1)
                 return -EINVAL;
@@ -316 +318 @@
                 return -EINVAL;
 
-        return drm_pci_init(&driver, &vbox_pci_driver);
+        return pci_register_driver(&vbox_pci_driver);
 }
 
 static void __exit vbox_exit(void)
 {
-        drm_pci_exit(&driver, &vbox_pci_driver);
+        pci_unregister_driver(&vbox_pci_driver);
 }
 

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

@@ -339 +339 @@
 }
 
-static void vbox_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
-                              u16 blue, int regno)
-{
-}
-
-static void vbox_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green,
-                              u16 *blue, int regno)
-{
-        *red = regno;
-        *green = regno;
-        *blue = regno;
-}
-
 static struct drm_fb_helper_funcs vbox_fb_helper_funcs = {
-        .gamma_set = vbox_fb_gamma_set,
-        .gamma_get = vbox_fb_gamma_get,
         .fb_probe = vboxfb_create,
 };