[patch] virtualbox-guest-additions-6.0.8-kernel520-fbdev_helper.patch

virtualbox-guest-additions-6.0.8-kernel520-fbdev_helper.patch (text/plain), 2.41 KB, created by Greg Turner on 2019-07-14 17:11:59 UTC

diff -urpN VirtualBox-6.0.8.orig/out/linux.amd64/release/bin/additions/src/vboxvideo/vbox_fb.c VirtualBox-6.0.8/out/linux.amd64/release/bin/additions/src/vboxvideo/vbox_fb.c
--- VirtualBox-6.0.8.orig/out/linux.amd64/release/bin/additions/src/vboxvideo/vbox_fb.c	2019-07-14 08:30:44.132046748 -0700
+++ VirtualBox-6.0.8/out/linux.amd64/release/bin/additions/src/vboxvideo/vbox_fb.c	2019-07-14 08:39:40.200336899 -0700
@@ -330,13 +330,17 @@ static int vboxfb_create(struct drm_fb_h
 	info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
 	info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)
+	drm_fb_helper_fill_info(info, &fbdev->helper, sizes);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
 	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
+	drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
+			       sizes->fb_height);
 #else
 	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
-#endif
 	drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
 			       sizes->fb_height);
+#endif
 
 	info->screen_base = bo->kmap.virtual;
 	info->screen_size = size;
diff -urpN VirtualBox-6.0.8.orig/src/VBox/Additions/linux/drm/vbox_fb.c VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_fb.c
--- VirtualBox-6.0.8.orig/src/VBox/Additions/linux/drm/vbox_fb.c	2019-05-13 06:25:42.000000000 -0700
+++ VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_fb.c	2019-07-14 08:36:51.594396120 -0700
@@ -335,13 +335,17 @@ static int vboxfb_create(struct drm_fb_h
 	info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
 	info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)
+	drm_fb_helper_fill_info(info, &fbdev->helper, sizes);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
 	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
+	drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
+			       sizes->fb_height);
 #else
 	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
-#endif
 	drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
 			       sizes->fb_height);
+#endif
 
 	info->screen_base = bo->kmap.virtual;
 	info->screen_size = size;