VirtualBox

Ticket #19516: fixes_for_5.7.patch

File fixes_for_5.7.patch, 1.2 KB (added by Frank Batschulat (Oracle), 4 years ago)
  • src/VBox/Additions/linux/drm/vbox_fb.c

    old new  
    4747#include <drm/drm_crtc.h>
    4848#include <drm/drm_fb_helper.h>
    4949#include <drm/drm_crtc_helper.h>
    50 
    5150#include <VBoxVideo.h>
    5251
    5352#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !defined(RHEL_74)
    int vbox_fbdev_init(struct drm_device *d  
    431430        drm_fb_helper_prepare(dev, &fbdev->helper, &vbox_fb_helper_funcs);
    432431#endif
    433432#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
    434436        ret = drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs);
     437#endif
    435438#else
    436439        ret =
    437440            drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs,
    int vbox_fbdev_init(struct drm_device *d  
    440443        if (ret)
    441444                return ret;
    442445
     446#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0)
     447        ret = 0;
     448#else
    443449        ret = drm_fb_helper_single_add_all_connectors(&fbdev->helper);
     450#endif
    444451        if (ret)
    445452                goto err_fini;
    446453

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy