forked from pool/virtualbox
7243b598f1
- Version bump to 6.1.6 (released April 14 2020 by Oracle) This version fixes bsc#1169249, bsc#1169202, and bsc#1166782. This is a maintenance release. The following items were fixed and/or added: GUI: Multiple enhancements including visual elements updates Graphics: Fixed monitor resizing and multi-monitor handling bugs on X11 guests with VMSVGA graphics adapter Graphics: Enhancements in 2D and 3D acceleration and rendering USB: Multiple enhancements improving prformance and stability Serial port: Improve error handling and fix hang when host port disappears VBoxManage: Multiple fixes for guestcontrol operations API: Fix for exception handling bug in Python bindings Shared clipboard: Multiple fixes including possible crash and HTML data support Linux host and guest: Support Linux kernel 5.6 (bug #19312) File "VirtualBox-6.1.4-VBoxClient-vmsvga-x11-crash.patch" removed - fixed upstream. File "fixes_for_5.6.patch" removed - fixed upstream. File "change_default_display.patch" removed - fixed upstream. - Fix bug that deletes everything in ~/.vbox/ - Fix builds for kernel 5.7. File "fixes_for_5.7.patch" is added. OBS-URL: https://build.opensuse.org/request/show/794392 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=548
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
Index: VirtualBox-6.1.4/src/VBox/Additions/linux/drm/vbox_fb.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.4.orig/src/VBox/Additions/linux/drm/vbox_fb.c
|
|
+++ VirtualBox-6.1.4/src/VBox/Additions/linux/drm/vbox_fb.c
|
|
@@ -47,7 +47,6 @@
|
|
#include <drm/drm_crtc.h>
|
|
#include <drm/drm_fb_helper.h>
|
|
#include <drm/drm_crtc_helper.h>
|
|
-
|
|
#include <VBoxVideo.h>
|
|
|
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !defined(RHEL_74)
|
|
@@ -431,7 +430,11 @@ int vbox_fbdev_init(struct drm_device *d
|
|
drm_fb_helper_prepare(dev, &fbdev->helper, &vbox_fb_helper_funcs);
|
|
#endif
|
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0)
|
|
+ ret = drm_fb_helper_init(dev, &fbdev->helper);
|
|
+#else
|
|
ret = drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs);
|
|
+#endif
|
|
#else
|
|
ret =
|
|
drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs,
|
|
@@ -440,7 +443,11 @@ int vbox_fbdev_init(struct drm_device *d
|
|
if (ret)
|
|
return ret;
|
|
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0)
|
|
+ ret = 0;
|
|
+#else
|
|
ret = drm_fb_helper_single_add_all_connectors(&fbdev->helper);
|
|
+#endif
|
|
if (ret)
|
|
goto err_fini;
|
|
|