| | 2 | |
| | 3 | and the diffs where: |
| | 4 | {{{ |
| | 5 | Index: src/VBox/Additions/linux/drm/vbox_fb.c |
| | 6 | =================================================================== |
| | 7 | --- src/VBox/Additions/linux/drm/vbox_fb.c (revision 131177) |
| | 8 | +++ src/VBox/Additions/linux/drm/vbox_fb.c (revision 131178) |
| | 9 | @@ -335,13 +335,17 @@ |
| | 10 | info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0); |
| | 11 | info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0); |
| | 12 | |
| | 13 | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75) |
| | 14 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0) |
| | 15 | + drm_fb_helper_fill_info(info, &fbdev->helper, sizes); |
| | 16 | +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75) |
| | 17 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); |
| | 18 | #else |
| | 19 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth); |
| | 20 | #endif |
| | 21 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) |
| | 22 | drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width, |
| | 23 | sizes->fb_height); |
| | 24 | +#endif |
| | 25 | |
| | 26 | info->screen_base = (char __iomem *)bo->kmap.virtual; |
| | 27 | info->screen_size = size; |
| | 28 | |
| | 29 | Index: src/VBox/Additions/linux/drm/vbox_ttm.c |
| | 30 | =================================================================== |
| | 31 | --- src/VBox/Additions/linux/drm/vbox_ttm.c (revision 131177) |
| | 32 | +++ src/VBox/Additions/linux/drm/vbox_ttm.c (revision 131178) |
| | 33 | @@ -310,7 +310,11 @@ |
| | 34 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) || defined(RHEL_71) |
| | 35 | dev->anon_inode->i_mapping, |
| | 36 | #endif |
| | 37 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) |
| | 38 | DRM_FILE_PAGE_OFFSET, true); |
| | 39 | +#else |
| | 40 | + true); |
| | 41 | +#endif |
| | 42 | if (ret) { |
| | 43 | DRM_ERROR("Error initialising bo driver; %d\n", ret); |
| | 44 | #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) |
| | 45 | }}} |