Changes between Initial Version and Version 1 of Ticket #18677, comment 24

Timestamp:: May 8, 2020 7:30:54 AM (5 years ago)
Author:: Frank Batschulat (Oracle)

Legend:

: Unmodified
: Added
: Removed
: Modified

Ticket #18677, comment 24

-              initial
+              v1
 for the record, this had been fixed with revision r131178
+and the diffs where:
+{{{
+Index: src/VBox/Additions/linux/drm/vbox_fb.c
+===================================================================
+--- src/VBox/Additions/linux/drm/vbox_fb.c      (revision 131177)
++++ src/VBox/Additions/linux/drm/vbox_fb.c      (revision 131178)
+@@ -335,13 +335,17 @@
+        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 = (char __iomem *)bo->kmap.virtual;
+        info->screen_size = size;
+Index: src/VBox/Additions/linux/drm/vbox_ttm.c
+===================================================================
+--- src/VBox/Additions/linux/drm/vbox_ttm.c     (revision 131177)
++++ src/VBox/Additions/linux/drm/vbox_ttm.c     (revision 131178)
+@@ -310,7 +310,11 @@
+ #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)
+}}}