Ticket #19516: fixes_for_5.7.patch
| File fixes_for_5.7.patch, 1.2 KB (added by , 4 years ago) |
|---|
-
src/VBox/Additions/linux/drm/vbox_fb.c
old new 47 47 #include <drm/drm_crtc.h> 48 48 #include <drm/drm_fb_helper.h> 49 49 #include <drm/drm_crtc_helper.h> 50 51 50 #include <VBoxVideo.h> 52 51 53 52 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !defined(RHEL_74) … … int vbox_fbdev_init(struct drm_device *d 431 430 drm_fb_helper_prepare(dev, &fbdev->helper, &vbox_fb_helper_funcs); 432 431 #endif 433 432 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75) 433 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0) 434 ret = drm_fb_helper_init(dev, &fbdev->helper); 435 #else 434 436 ret = drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs); 437 #endif 435 438 #else 436 439 ret = 437 440 drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs, … … int vbox_fbdev_init(struct drm_device *d 440 443 if (ret) 441 444 return ret; 442 445 446 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0) 447 ret = 0; 448 #else 443 449 ret = drm_fb_helper_single_add_all_connectors(&fbdev->helper); 450 #endif 444 451 if (ret) 445 452 goto err_fini; 446 453

