Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 689846 | Differences between
and this patch

Collapse All | Expand All

(-)VirtualBox-6.0.8.orig/out/linux.amd64/release/bin/additions/src/vboxvideo/vbox_fb.c (-2 / +6 lines)
Lines 330-342 static int vboxfb_create(struct drm_fb_h Link Here
330
	info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
330
	info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
331
	info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
331
	info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
332
332
333
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
333
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)
334
	drm_fb_helper_fill_info(info, &fbdev->helper, sizes);
335
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
334
	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
336
	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
337
	drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
338
			       sizes->fb_height);
335
#else
339
#else
336
	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
340
	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
337
#endif
338
	drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
341
	drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
339
			       sizes->fb_height);
342
			       sizes->fb_height);
343
#endif
340
344
341
	info->screen_base = bo->kmap.virtual;
345
	info->screen_base = bo->kmap.virtual;
342
	info->screen_size = size;
346
	info->screen_size = size;
(-)VirtualBox-6.0.8.orig/src/VBox/Additions/linux/drm/vbox_fb.c (-2 / +6 lines)
Lines 335-347 static int vboxfb_create(struct drm_fb_h Link Here
335
	info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
335
	info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
336
	info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
336
	info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
337
337
338
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
338
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)
339
	drm_fb_helper_fill_info(info, &fbdev->helper, sizes);
340
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
339
	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
341
	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
342
	drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
343
			       sizes->fb_height);
340
#else
344
#else
341
	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
345
	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
342
#endif
343
	drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
346
	drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
344
			       sizes->fb_height);
347
			       sizes->fb_height);
348
#endif
345
349
346
	info->screen_base = bo->kmap.virtual;
350
	info->screen_base = bo->kmap.virtual;
347
	info->screen_size = size;
351
	info->screen_size = size;

Return to bug 689846