VirtualBox

Changeset 89690 in vbox for trunk/src/VBox/Additions/linux


Ignore:
Timestamp:
Jun 14, 2021 6:33:10 PM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
145138
Message:

Linux host&guest drivers: fix build for SLES 15 SP3, bugref:4567.

Location:
trunk/src/VBox/Additions/linux/drm
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/linux/drm/vbox_drv.c

    r89689 r89690  
    263263};
    264264
    265 #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
     265#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3)
    266266static void
    267267#else
    … …  
    287287        mutex_unlock(&vbox->hw_mutex);
    288288
    289 #if RTLNX_VER_MAX(5,9,0) && !RTLNX_RHEL_MAJ_PREREQ(8,4)
     289#if RTLNX_VER_MAX(5,9,0) && !RTLNX_RHEL_MAJ_PREREQ(8,4) && !RTLNX_SUSE_MAJ_PREREQ(15,3)
    290290        return 0;
    291291#endif
    … …  
    311311
    312312static struct drm_driver driver = {
    313 #if RTLNX_VER_MAX(5,4,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
     313#if RTLNX_VER_MAX(5,4,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3) && !RTLNX_SUSE_MAJ_PREREQ(15,3)
    314314        .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
    315315# if RTLNX_VER_MAX(5,1,0) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
    … …  
    317317# endif
    318318            DRIVER_PRIME,
    319 #else  /* >= 5.4.0 && RHEL >= 8.3 */
     319#else  /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */
    320320                .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
    321321#endif /* <  5.4.0 */

  • trunk/src/VBox/Additions/linux/drm/vbox_drv.h

    r89278 r89690  
    152152#endif
    153153
    154 #if RTLNX_VER_MIN(5,5,0) || RTLNX_RHEL_MIN(8,3)
     154#if RTLNX_VER_MIN(5,5,0) || RTLNX_RHEL_MIN(8,3) || RTLNX_SUSE_MAJ_PREREQ(15,3)
    155155# include <drm/drm_file.h>
    156156# include <drm/drm_drv.h>
    … …  
    160160# include <drm/drm_irq.h>
    161161# include <drm/drm_vblank.h>
    162 #else /* < 5.5.0 || RHEL < 8.3 */
     162#else /* < 5.5.0 || RHEL < 8.3 || SLES < 15-SP3 */
    163163# include <drm/drmP.h>
    164164#endif

  • trunk/src/VBox/Additions/linux/drm/vbox_fb.c

    r88405 r89690  
    411411                        vbox_bo_unreserve(bo);
    412412                }
    413 #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
     413#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3)
    414414                drm_gem_object_put(afb->obj);
    415415#else
    … …  
    444444        drm_fb_helper_prepare(dev, &fbdev->helper, &vbox_fb_helper_funcs);
    445445#endif
    446 #if RTLNX_VER_MIN(5,7,0) || RTLNX_RHEL_MIN(8,4)
     446#if RTLNX_VER_MIN(5,7,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3)
    447447        ret = drm_fb_helper_init(dev, &fbdev->helper);
    448448#elif RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
    … …  
    456456                return ret;
    457457
    458 #if RTLNX_VER_MAX(5,7,0) && !RTLNX_RHEL_MAJ_PREREQ(8,4)
     458#if RTLNX_VER_MAX(5,7,0) && !RTLNX_RHEL_MAJ_PREREQ(8,4) && !RTLNX_SUSE_MAJ_PREREQ(15,3)
    459459        ret = drm_fb_helper_single_add_all_connectors(&fbdev->helper);
    460460        if (ret)

  • trunk/src/VBox/Additions/linux/drm/vbox_main.c

    r88405 r89690  
    4747
    4848        if (vbox_fb->obj)
    49 #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
     49#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3)
    5050                drm_gem_object_put(vbox_fb->obj);
    5151#else
    … …  
    226226        kfree(vbox_fb);
    227227err_unref_obj:
    228 #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
     228#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3)
    229229        drm_gem_object_put(obj);
    230230#else
    … …  
    597597
    598598        ret = drm_gem_handle_create(file, gobj, &handle);
    599 #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
     599#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3)
    600600        drm_gem_object_put(gobj);
    601601#else
    … …  
    634634static inline u64 vbox_bo_mmap_offset(struct vbox_bo *bo)
    635635{
    636 #if RTLNX_VER_MIN(5,4,0) || RTLNX_RHEL_MIN(8,3)
     636#if RTLNX_VER_MIN(5,4,0) || RTLNX_RHEL_MIN(8,3) || RTLNX_SUSE_MAJ_PREREQ(15,3)
    637637        return drm_vma_node_offset_addr(&bo->bo.base.vma_node);
    638638#elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0)

  • trunk/src/VBox/Additions/linux/drm/vbox_mode.c

    r88405 r89690  
    399399                                                    *connector)
    400400{
    401 #if RTLNX_VER_MIN(5,5,0) || RTLNX_RHEL_MIN(8,3)
     401#if RTLNX_VER_MIN(5,5,0) || RTLNX_RHEL_MIN(8,3) || RTLNX_SUSE_MAJ_PREREQ(15,3)
    402402        struct drm_encoder *encoder;
    403403
    … …  
    889889        vbox_bo_unreserve(bo);
    890890out_unref_obj:
    891 #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
     891#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3)
    892892        drm_gem_object_put(obj);
    893893#else

  • trunk/src/VBox/Additions/linux/drm/vbox_ttm.c

    r89278 r89690  
    421421                                 dev->anon_inode->i_mapping,
    422422#endif
    423 #if RTLNX_VER_MIN(5,5,0) || RTLNX_RHEL_MIN(8,3)
     423#if RTLNX_VER_MIN(5,5,0) || RTLNX_RHEL_MIN(8,3) || RTLNX_SUSE_MAJ_PREREQ(15,3)
    424424                                 dev->vma_offset_manager,
    425425#elif RTLNX_VER_MAX(5,2,0) && !RTLNX_RHEL_MAJ_PREREQ(8,2)
    … …  
    627627static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo)
    628628{
    629 #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4)
     629#if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3)
    630630        return bo->bo.mem.start << PAGE_SHIFT;
    631631#else
Note: See TracChangeset for help on using the changeset viewer.

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