[Pkg-virtualbox-commits] [virtualbox] 01/01: Cherry-pick upstream fixes for new kernel 4.14

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit 731d628393426d91ac8e901b0ef76dc6571f2930
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Oct 20 16:51:03 2017 +0200

    Cherry-pick upstream fixes for new kernel 4.14
---
 debian/changelog           |  7 +++++
 debian/patches/69143.patch | 66 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 74 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1dced96..4aff83b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virtualbox (5.2.0-dfsg-1~exp6) UNRELEASED; urgency=medium
+
+  * Cherry-pick fixes for new kernel 4.14
+    - 69143.patch
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 20 Oct 2017 16:50:34 +0200
+
 virtualbox (5.2.0-dfsg-1~exp5) experimental; urgency=medium
 
   * Fixup guest-* generation
diff --git a/debian/patches/69143.patch b/debian/patches/69143.patch
new file mode 100644
index 0000000..f066b8d
--- /dev/null
+++ b/debian/patches/69143.patch
@@ -0,0 +1,66 @@
+Origin: https://www.virtualbox.org/log/vbox/trunk/src?rev=69146
+Index: src/VBox/Additions/linux/drm/vbox_fb.c
+===================================================================
+--- a/src/VBox/Additions/linux/drm/vbox_fb.c
++++ b/src/VBox/Additions/linux/drm/vbox_fb.c
+@@ -338,22 +338,7 @@ static int vboxfb_create(struct drm_fb_helper *helper,
+ 	return 0;
+ }
+ 
+-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,
+ };
+ 
+Index: src/VBox/Additions/linux/drm/vbox_drv.c
+===================================================================
+--- a/src/VBox/Additions/linux/drm/vbox_drv.c
++++ b/src/VBox/Additions/linux/drm/vbox_drv.c
+@@ -272,7 +272,9 @@ static struct drm_driver driver = {
+ 	.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(4, 14, 0)
+ 	.set_busid = drm_pci_set_busid,
++# endif
+ #endif
+ 
+ 	.fops = &vbox_fops,
+@@ -307,7 +309,7 @@ static struct drm_driver driver = {
+ 
+ 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;
+ #endif
+@@ -315,12 +317,12 @@ static int __init vbox_init(void)
+ 	if (vbox_modeset == 0)
+ 		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);
+ }
+ 
+ module_init(vbox_init);
diff --git a/debian/patches/series b/debian/patches/series
index b9151bb..9f88d54 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 35-libvdeplug-soname.patch
 36-fix-vnc-version-string.patch
 37-python-3.6-support.patch
+69143.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git