From a92ea7b15a232e78f732035897b0aa7aaaad5d6d727f2e026016fc88ac05908b Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 1 Jun 2019 20:27:45 +0000 Subject: [PATCH] Accepting request 706522 from home:lwfinger:branches:openSUSE:Factory - Kernel 5.2, now in Kernel_HEAD_stardard, has some API changes. These are handled in the new file "fixes_for_5.2.patch". OBS-URL: https://build.opensuse.org/request/show/706522 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=491 --- fixes_for_5.2.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++ virtualbox.changes | 6 ++++++ virtualbox.spec | 3 +++ 3 files changed, 56 insertions(+) create mode 100644 fixes_for_5.2.patch diff --git a/fixes_for_5.2.patch b/fixes_for_5.2.patch new file mode 100644 index 0000000..4866c7e --- /dev/null +++ b/fixes_for_5.2.patch @@ -0,0 +1,47 @@ +Index: 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 ++++ VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_fb.c +@@ -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); + #else + drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth); + #endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) + 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; +Index: VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c +=================================================================== +--- VirtualBox-6.0.8.orig/src/VBox/Additions/linux/drm/vbox_ttm.c ++++ VirtualBox-6.0.8/src/VBox/Additions/linux/drm/vbox_ttm.c +@@ -298,7 +298,6 @@ int vbox_mm_init(struct vbox_private *vb + if (ret) + return ret; + #endif +- + ret = ttm_bo_device_init(&vbox->ttm.bdev, + #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) + vbox->ttm.bo_global_ref.ref.object, +@@ -307,7 +306,11 @@ int vbox_mm_init(struct vbox_private *vb + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) || defined(RHEL_71) + dev->anon_inode->i_mapping, + #endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) + DRM_FILE_PAGE_OFFSET, true); ++#else ++ true); ++#endif + if (ret) { + DRM_ERROR("Error initialising bo driver; %d\n", ret); + #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) diff --git a/virtualbox.changes b/virtualbox.changes index ac2e2a2..31cc013 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 30 02:58:13 UTC 2019 - Larry Finger + +- Kernel 5.2, now in Kernel_HEAD_stardard, has some API changes. These are + handled in the new file "fixes_for_5.2.patch". + ------------------------------------------------------------------- Tue May 28 03:58:33 UTC 2019 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 18ac7b3..9829fb3 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -145,6 +145,8 @@ Patch129: fixes_for_Leap15.1.patch Patch130: fixes_for_Leap42.3.patch # Fixes for Qt5.13 Patch131: fixes_for_qt5.13.patch +# Fixes for kernel 5.2 +Patch132: fixes_for_5.2.patch #endif Patch999: virtualbox-fix-ui-background-color.patch # @@ -457,6 +459,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %if %{qt5ver} >= 51300 %patch131 -p1 %endif +%patch132 -p1 # make VB UI background colors look sane again %patch999 -p1