VirtualBox

Changeset 85705 in vbox for trunk/src/VBox/Additions


Ignore:
Timestamp:
Aug 11, 2020 7:17:09 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
139845
Message:

Add/linux/vboxvideo: Use RTLNX_RHEL_* macros, eliminating the RHEL_XY ones.

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

Legend:

Unmodified
Added
Removed

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

    r85704 r85705  
    4141#include <drm/drm_crtc_helper.h>
    4242
    43 #if RTLNX_VER_MIN(5,1,0) || defined(RHEL_81)
     43#if RTLNX_VER_MIN(5,1,0) || RTLNX_RHEL_MAJ_PREREQ(8,1)
    4444#include <drm/drm_probe_helper.h>
    4545#endif
    … …  
    108108}
    109109
    110 #if RTLNX_VER_MAX(4,9,0) && !defined(RHEL_74)
     110#if RTLNX_VER_MAX(4,9,0) && !RTLNX_RHEL_MAJ_PREREQ(7,4)
    111111static void drm_fb_helper_set_suspend_unlocked(struct drm_fb_helper *fb_helper,
    112112                                        bool suspend)
    … …  
    226226};
    227227
    228 #if RTLNX_VER_MAX(4,7,0) && !defined(RHEL_74)
     228#if RTLNX_VER_MAX(4,7,0) && !RTLNX_RHEL_MAJ_PREREQ(7,4)
    229229/* This works around a bug in X servers prior to 1.18.4, which sometimes
    230230 * submit more dirty rectangles than the kernel is willing to handle and
    … …  
    242242        return rc;
    243243}
    244 #endif /* RTLNX_VER_MAX(4,7,0) && !RHEL_74 */
     244#endif /* RTLNX_VER_MAX(4,7,0) && !RTLNX_RHEL_MAJ_PREREQ(7,4) */
    245245
    246246static const struct file_operations vbox_fops = {
    … …  
    248248        .open = drm_open,
    249249        .release = drm_release,
    250 #if RTLNX_VER_MAX(4,7,0) && !defined(RHEL_74)
     250#if RTLNX_VER_MAX(4,7,0) && !RTLNX_RHEL_MAJ_PREREQ(7,4)
    251251        .unlocked_ioctl = vbox_ioctl,
    252252#else
    … …  
    255255        .mmap = vbox_mmap,
    256256        .poll = drm_poll,
    257 #if RTLNX_VER_MAX(3,12,0) && !defined(RHEL_70)
     257#if RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0)
    258258        .fasync = drm_fasync,
    259259#endif
    … …  
    286286}
    287287
    288 #if RTLNX_VER_MAX(4,8,0) && !defined(RHEL_74)
     288#if RTLNX_VER_MAX(4,8,0) && !RTLNX_RHEL_MAJ_PREREQ(7,4)
    289289static void vbox_master_drop(struct drm_device *dev,
    290290                             struct drm_file *file_priv, bool from_release)
    … …  
    308308        .driver_features =
    309309            DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
    310 # if RTLNX_VER_MAX(5,1,0) && !defined(RHEL_81)
     310# if RTLNX_VER_MAX(5,1,0) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
    311311            DRIVER_IRQ_SHARED |
    312 # endif /* < 5.1.0 && !defined(RHEL_81) */
     312# endif
    313313            DRIVER_PRIME,
    314314#else  /* >= 5.4.0 */
    … …  
    325325        .master_set = vbox_master_set,
    326326        .master_drop = vbox_master_drop,
    327 #if RTLNX_VER_MIN(3,18,0) || defined(RHEL_72)
    328 # if RTLNX_VER_MAX(4,14,0) && !defined(RHEL_75) \
     327#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
     328# if RTLNX_VER_MAX(4,14,0) && !RTLNX_RHEL_MAJ_PREREQ(7,5) \
    329329  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
    330330        .set_busid = drm_pci_set_busid,
    … …  
    348348        .dumb_create = vbox_dumb_create,
    349349        .dumb_map_offset = vbox_dumb_mmap_offset,
    350 #if RTLNX_VER_MAX(3,12,0) && !defined(RHEL_73)
     350#if RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,3)
    351351        .dumb_destroy = vbox_dumb_destroy,
    352352#else
    … …  
    376376                return -EINVAL;
    377377
    378 #if RTLNX_VER_MIN(3,18,0) || defined(RHEL_73)
     378#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,3)
    379379        return pci_register_driver(&vbox_pci_driver);
    380380#else
    … …  
    385385static void __exit vbox_exit(void)
    386386{
    387 #if RTLNX_VER_MIN(3,18,0) || defined(RHEL_73)
     387#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,3)
    388388        pci_unregister_driver(&vbox_pci_driver);
    389389#else

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

    r85704 r85705  
    136136#include <linux/pci.h>
    137137
    138 /** @def VBOX_RHEL_MAJ_PREREQ
    139  * Require a minium minor release number for the given RedHat release.
    140  * @param a_iMajor      RHEL_MAJOR must _equal_ this.
    141  * @param a_iMinor      RHEL_MINOR must be greater or equal to this.
    142  */
    143 #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
    144 # define VBOX_RHEL_MAJ_PREREQ(a_iMajor, a_iMinor) ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))
    145 # if RHEL_MAJOR == 8 && RHEL_MINOR >= 2
    146 #  define RHEL_82
    147 # endif
    148 # if RHEL_MAJOR == 8 && RHEL_MINOR >= 1
    149 #  define RHEL_81
    150 # endif
    151 # if RHEL_MAJOR == 8 && RHEL_MINOR >= 0
    152 #  define RHEL_80
    153 # endif
    154 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 7
    155 #  define RHEL_77
    156 # endif
    157 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 6
    158 #  define RHEL_76
    159 # endif
    160 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 5
    161 #  define RHEL_75
    162 # endif
    163 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 4
    164 #  define RHEL_74
    165 # endif
    166 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 3
    167 #  define RHEL_73
    168 # endif
    169 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 2
    170 #  define RHEL_72
    171 # endif
    172 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 1
    173 #  define RHEL_71
    174 # endif
    175 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 0
    176 #  define RHEL_70
    177 # endif
    178 #else
    179 # define VBOX_RHEL_MAJ_PREREQ(a_iMajor, a_iMinor) 0
    180 #endif
    181 
    182138#if defined(CONFIG_SUSE_VERSION)
    183139# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 1
    … …  
    189145#endif
    190146
    191 #if RTLNX_VER_MAX(3,14,0) || defined(RHEL_71)
     147#if RTLNX_VER_MAX(3,14,0) || RTLNX_RHEL_MAJ_PREREQ(7,1)
    192148#define U8_MAX          ((u8)~0U)
    193149#define S8_MAX          ((s8)(U8_MAX>>1))
    … …  
    215171#include <drm/drm_vblank.h>
    216172#endif /* >= 5.5.0 */
    217 #if RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
     173#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
    218174#include <drm/drm_encoder.h>
    219175#endif
    220176#include <drm/drm_fb_helper.h>
    221 #if RTLNX_VER_MIN(3,18,0) || defined(RHEL_72)
     177#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
    222178#include <drm/drm_gem.h>
    223179#endif
    … …  
    235191#include "product-generated.h"
    236192
    237 #if RTLNX_VER_MAX(4,12,0) && !defined(RHEL_75)
     193#if RTLNX_VER_MAX(4,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,5)
    238194static inline void drm_gem_object_put_unlocked(struct drm_gem_object *obj)
    239195{
    … …  
    242198#endif
    243199
    244 #if RTLNX_VER_MAX(4,12,0) && !defined(RHEL_75)
     200#if RTLNX_VER_MAX(4,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,5)
    245201static inline void drm_gem_object_put(struct drm_gem_object *obj)
    246202{
    … …  
    276232#define VBOX_REFRESH_PERIOD (HZ / 2)
    277233
    278 #if RTLNX_VER_MAX(3,13,0) && !defined(RHEL_72)
     234#if RTLNX_VER_MAX(3,13,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
    279235static inline void *devm_kcalloc(struct device *dev, size_t n, size_t size,
    280236                                 gfp_t flags)
    … …  
    307263
    308264        struct {
    309 #if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
     265#if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
    310266                struct drm_global_reference mem_global_ref;
    311267                struct ttm_bo_global_ref bo_global_ref;
    … …  
    356312int vbox_driver_load(struct drm_device *dev);
    357313#endif
    358 #if RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
     314#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
    359315void vbox_driver_unload(struct drm_device *dev);
    360316#else
    … …  
    424380#endif
    425381
    426 #if RTLNX_VER_MAX(3,15,0) && !defined(RHEL_71)
     382#if RTLNX_VER_MAX(3,15,0) && !RTLNX_RHEL_MAJ_PREREQ(7,1)
    427383#define CRTC_FB(crtc) ((crtc)->fb)
    428384#else
    … …  
    440396int vbox_framebuffer_init(struct drm_device *dev,
    441397                          struct vbox_framebuffer *vbox_fb,
    442 #if RTLNX_VER_MIN(4,5,0) || defined(RHEL_73)
     398#if RTLNX_VER_MIN(4,5,0) || RTLNX_RHEL_MAJ_PREREQ(7,3)
    443399                          const struct DRM_MODE_FB_CMD *mode_cmd,
    444400#else
    … …  
    456412        struct ttm_bo_kmap_obj kmap;
    457413        struct drm_gem_object gem;
    458 #if RTLNX_VER_MAX(3,18,0) && !defined(RHEL_72)
     414#if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
    459415        u32 placements[3];
    460416#else
    … …  
    476432                     struct drm_device *dev,
    477433                     struct drm_mode_create_dumb *args);
    478 #if RTLNX_VER_MAX(3,12,0) && !defined(RHEL_73)
     434#if RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,3)
    479435int vbox_dumb_destroy(struct drm_file *file,
    480436                      struct drm_device *dev, u32 handle);
    … …  
    504460        int ret;
    505461
    506 #if RTLNX_VER_MIN(4,7,0) || defined(RHEL_74)
     462#if RTLNX_VER_MIN(4,7,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
    507463        ret = ttm_bo_reserve(&bo->bo, true, no_wait, NULL);
    508464#else
    … …  
    530486void vbox_gem_prime_unpin(struct drm_gem_object *obj);
    531487struct sg_table *vbox_gem_prime_get_sg_table(struct drm_gem_object *obj);
    532 #if RTLNX_VER_MAX(3,18,0) && !defined(RHEL_72)
     488#if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
    533489struct drm_gem_object *vbox_gem_prime_import_sg_table(
    534490        struct drm_device *dev, size_t size, struct sg_table *table);

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

    r85704 r85705  
    5151#include <VBoxVideo.h>
    5252
    53 #if RTLNX_VER_MAX(4,7,0) && !defined(RHEL_74)
     53#if RTLNX_VER_MAX(4,7,0) && !RTLNX_RHEL_MAJ_PREREQ(7,4)
    5454/**
    5555 * Tell the host about dirty rectangles to update.
    … …  
    127127
    128128#ifdef CONFIG_FB_DEFERRED_IO
    129 # if RTLNX_VER_MAX(4,7,0) && !defined(RHEL_74)
     129# if RTLNX_VER_MAX(4,7,0) && !RTLNX_RHEL_MAJ_PREREQ(7,4)
    130130static void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagelist)
    131131{
    … …  
    160160#endif
    161161
    162 #if RTLNX_VER_MAX(4,3,0) && !defined(RHEL_73)
     162#if RTLNX_VER_MAX(4,3,0) && !RTLNX_RHEL_MAJ_PREREQ(7,3)
    163163static void drm_fb_helper_sys_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
    164164{
    … …  
    226226}
    227227
    228 #if RTLNX_VER_MAX(4,3,0) && !defined(RHEL_73)
     228#if RTLNX_VER_MAX(4,3,0) && !RTLNX_RHEL_MAJ_PREREQ(7,3)
    229229static struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *helper)
    230230{
    … …  
    336336        info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
    337337
    338 #if RTLNX_VER_MIN(5,2,0) || defined(RHEL_82)
     338#if RTLNX_VER_MIN(5,2,0) || RTLNX_RHEL_MAJ_PREREQ(8,2)
    339339        /*
    340340         * The corresponding 5.2-rc1 Linux DRM kernel changes have been
    … …  
    342342         */
    343343        drm_fb_helper_fill_info(info, &fbdev->helper, sizes);
    344 #elif RTLNX_VER_MIN(4,11,0) || VBOX_RHEL_MAJ_PREREQ(7, 5)
     344#elif RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7, 5)
    345345        drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
    346346#else
    347347        drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
    348348#endif
    349 #if RTLNX_VER_MAX(5,2,0) && !defined(RHEL_82)
     349#if RTLNX_VER_MAX(5,2,0) && !RTLNX_RHEL_MAJ_PREREQ(8,2)
    350350        drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,
    351351                               sizes->fb_height);
    … …  
    371371};
    372372
    373 #if RTLNX_VER_MAX(4,3,0) && !defined(RHEL_73)
     373#if RTLNX_VER_MAX(4,3,0) && !RTLNX_RHEL_MAJ_PREREQ(7,3)
    374374static void drm_fb_helper_unregister_fbi(struct drm_fb_helper *fb_helper)
    375375{
    … …  
    430430        spin_lock_init(&fbdev->dirty_lock);
    431431
    432 #if RTLNX_VER_MAX(3,17,0) && !defined(RHEL_72)
     432#if RTLNX_VER_MAX(3,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
    433433        fbdev->helper.funcs = &vbox_fb_helper_funcs;
    434434#else
    … …  
    437437#if RTLNX_VER_MIN(5,7,0)
    438438        ret = drm_fb_helper_init(dev, &fbdev->helper);
    439 #elif RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
     439#elif RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
    440440        ret = drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs);
    441441#else /* < 4.11.0 */

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

    r85704 r85705  
    3636#if RTLNX_VER_MAX(5,1,0)
    3737#include <drm/drm_crtc_helper.h>
    38 # if defined(RHEL_81)
     38# if RTLNX_RHEL_MAJ_PREREQ(8,1)
    3939#  include <drm/drm_probe_helper.h>
    4040# endif
    … …  
    206206        INIT_WORK(&vbox->hotplug_work, vbox_hotplug_worker);
    207207        vbox_update_mode_hints(vbox);
    208 #if RTLNX_VER_MIN(3,16,0) || defined(RHEL_71)
     208#if RTLNX_VER_MIN(3,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,1)
    209209        return drm_irq_install(vbox->dev, vbox->dev->pdev->irq);
    210210#else

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

    r85704 r85705  
    164164int vbox_framebuffer_init(struct drm_device *dev,
    165165                          struct vbox_framebuffer *vbox_fb,
    166 #if RTLNX_VER_MIN(4,5,0) || defined(RHEL_73)
     166#if RTLNX_VER_MIN(4,5,0) || RTLNX_RHEL_MAJ_PREREQ(7,3)
    167167                          const struct DRM_MODE_FB_CMD *mode_cmd,
    168168#else
    … …  
    173173        int ret;
    174174
    175 #if RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
     175#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
    176176        drm_helper_mode_fill_fb_struct(dev, &vbox_fb->base, mode_cmd);
    177177#else
    … …  
    191191                struct drm_device *dev,
    192192                struct drm_file *filp,
    193 #if RTLNX_VER_MIN(4,5,0) || defined(RHEL_73)
     193#if RTLNX_VER_MIN(4,5,0) || RTLNX_RHEL_MAJ_PREREQ(7,3)
    194194                const struct drm_mode_fb_cmd2 *mode_cmd)
    195195#else
    … …  
    201201        int ret = -ENOMEM;
    202202
    203 #if RTLNX_VER_MIN(4,7,0) || defined(RHEL_74)
     203#if RTLNX_VER_MIN(4,7,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
    204204        obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]);
    205205#else
    … …  
    230230};
    231231
    232 #if RTLNX_VER_MAX(4,0,0) && !defined(RHEL_73)
     232#if RTLNX_VER_MAX(4,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,3)
    233233#define pci_iomap_range(dev, bar, offset, maxlen) \
    234234        ioremap(pci_resource_start(dev, bar) + (offset), maxlen)
    … …  
    512512}
    513513
    514 #if RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
     514#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
    515515void vbox_driver_unload(struct drm_device *dev)
    516516#else
    … …  
    526526        vbox_mm_fini(vbox);
    527527        vbox_hw_fini(vbox);
    528 #if RTLNX_VER_MAX(4,11,0) && !defined(RHEL_75)
     528#if RTLNX_VER_MAX(4,11,0) && !RTLNX_RHEL_MAJ_PREREQ(7,5)
    529529        return 0;
    530530#endif
    … …  
    539539        struct vbox_private *vbox = dev->dev_private;
    540540
    541 #if RTLNX_VER_MIN(3,16,0) || defined(RHEL_71)
     541#if RTLNX_VER_MIN(3,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,1)
    542542        if (vbox->fbdev)
    543543                drm_fb_helper_restore_fbdev_mode_unlocked(&vbox->fbdev->helper);
    … …  
    598598}
    599599
    600 #if RTLNX_VER_MAX(3,12,0) && !defined(RHEL_73)
     600#if RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,3)
    601601int vbox_dumb_destroy(struct drm_file *file,
    602602                      struct drm_device *dev, u32 handle)
    … …  
    607607
    608608#if RTLNX_VER_MAX(4,19,0) && !defined(OPENSUSE_151) && !defined(OPENSUSE_125) \
    609   && !defined(RHEL_77) && !defined(RHEL_81)
     609  && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
    610610static void ttm_bo_put(struct ttm_buffer_object *bo)
    611611{
    … …  
    625625#if RTLNX_VER_MIN(5,4,0)
    626626        return drm_vma_node_offset_addr(&bo->bo.base.vma_node);
    627 #elif RTLNX_VER_MAX(3,12,0) && !defined(RHEL_70)
     627#elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0)
    628628        return bo->bo.addr_space_offset;
    629629#else
    … …  
    642642
    643643        mutex_lock(&dev->struct_mutex);
    644 #if RTLNX_VER_MIN(4,7,0) || defined(RHEL_74)
     644#if RTLNX_VER_MIN(4,7,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
    645645        obj = drm_gem_object_lookup(file, handle);
    646646#else

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

    r85704 r85705  
    4040#include <linux/export.h>
    4141#include <drm/drm_crtc_helper.h>
    42 #if RTLNX_VER_MIN(3,18,0) || defined(RHEL_72)
     42#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
    4343#include <drm/drm_plane_helper.h>
    4444#endif
    45 #if RTLNX_VER_MIN(5,1,0) || defined(RHEL_81)
     45#if RTLNX_VER_MIN(5,1,0) || RTLNX_RHEL_MAJ_PREREQ(8,1)
    4646#include <drm/drm_probe_helper.h>
    4747#endif
    … …  
    7070        width = mode->hdisplay ? mode->hdisplay : 640;
    7171        height = mode->vdisplay ? mode->vdisplay : 480;
    72 #if RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
     72#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
    7373        bpp = crtc->enabled ? CRTC_FB(crtc)->format->cpp[0] * 8 : 32;
    7474        pitch = crtc->enabled ? CRTC_FB(crtc)->pitches[0] : width * bpp / 8;
    … …  
    9494                VBoxVideoSetModeRegisters(
    9595                        width, height, pitch * 8 / bpp,
    96 #if RTLNX_VER_MIN(4,11,0) || defined(RHEL_75)
     96#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
    9797                        CRTC_FB(crtc)->format->cpp[0] * 8,
    9898#else
    … …  
    285285static int vbox_crtc_page_flip(struct drm_crtc *crtc,
    286286                               struct drm_framebuffer *fb,
    287 #if RTLNX_VER_MIN(4,12,0) || defined(RHEL_75)
     287#if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
    288288                               struct drm_pending_vblank_event *event,
    289289                               uint32_t page_flip_flags,
    290290                               struct drm_modeset_acquire_ctx *ctx)
    291 #elif RTLNX_VER_MIN(3,12,0) || defined(RHEL_70)
     291#elif RTLNX_VER_MIN(3,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,0)
    292292                               struct drm_pending_vblank_event *event,
    293293                               uint32_t page_flip_flags)
    … …  
    311311
    312312        if (event)
    313 #if RTLNX_VER_MIN(3,19,0) || defined(RHEL_72)
     313#if RTLNX_VER_MIN(3,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
    314314                drm_crtc_send_vblank_event(crtc, event);
    315315#else
    … …  
    386386}
    387387
    388 #if RTLNX_VER_MAX(3,13,0) && !defined(RHEL_71)
     388#if RTLNX_VER_MAX(3,13,0) && !RTLNX_RHEL_MAJ_PREREQ(7,1)
    389389static struct drm_encoder *drm_encoder_find(struct drm_device *dev, u32 id)
    390390{
    … …  
    410410        /* pick the encoder ids */
    411411        if (enc_id)
    412 # if RTLNX_VER_MIN(4,15,0) || \
    413      (defined(CONFIG_SUSE_VERSION) && \
    414          RTLNX_VER_MIN(4,12,0)) || \
    415      defined(RHEL_76)
     412# if RTLNX_VER_MIN(4,15,0) \
     413  || RTLNX_RHEL_MAJ_PREREQ(7,6) \
     414  || (defined(CONFIG_SUSE_VERSION) && RTLNX_VER_MIN(4,12,0))
    416415                return drm_encoder_find(connector->dev, NULL, enc_id);
    417416# else
    … …  
    469468
    470469        drm_encoder_init(dev, &vbox_encoder->base, &vbox_enc_funcs,
    471 #if RTLNX_VER_MIN(4,5,0) || defined(RHEL_73)
     470#if RTLNX_VER_MIN(4,5,0) || RTLNX_RHEL_MAJ_PREREQ(7,3)
    472471                         DRM_MODE_ENCODER_DAC, NULL);
    473472#else
    … …  
    549548        edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
    550549#if RTLNX_VER_MIN(4,19,0) || defined(OPENSUSE_151) || defined(OPENSUSE_125) \
    551   || defined(RHEL_77) || defined(RHEL_81)
     550  || RTLNX_RHEL_MAJ_PREREQ(7,7) || RTLNX_RHEL_MAJ_PREREQ(8,1)
    552551        drm_connector_update_edid_property(connector, (struct edid *)edid);
    553552#else
    … …  
    607606        vbox_set_edid(connector, preferred_width, preferred_height);
    608607
    609 #if RTLNX_VER_MIN(3,19,0) || defined(RHEL_72)
     608#if RTLNX_VER_MIN(3,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
    610609        if (vbox_connector->vbox_crtc->x_hint != -1)
    611610                drm_object_property_set_value(&connector->base,
    … …  
    628627}
    629628
    630 #if RTLNX_VER_MAX(3,14,0) && !defined(RHEL_71)
     629#if RTLNX_VER_MAX(3,14,0) && !RTLNX_RHEL_MAJ_PREREQ(7,1)
    631630static int vbox_mode_valid(struct drm_connector *connector,
    632631#else
    … …  
    640639static void vbox_connector_destroy(struct drm_connector *connector)
    641640{
    642 #if RTLNX_VER_MAX(3,17,0) && !defined(RHEL_72)
     641#if RTLNX_VER_MAX(3,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
    643642        drm_sysfs_connector_remove(connector);
    644643#else
    … …  
    711710        connector->doublescan_allowed = 0;
    712711
    713 #if RTLNX_VER_MIN(3,19,0) || defined(RHEL_72)
     712#if RTLNX_VER_MIN(3,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
    714713        drm_mode_create_suggested_offset_properties(dev);
    715714        drm_object_attach_property(&connector->base,
    … …  
    718717                                   dev->mode_config.suggested_y_property, 0);
    719718#endif
    720 #if RTLNX_VER_MAX(3,17,0) && !defined(RHEL_72)
     719#if RTLNX_VER_MAX(3,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
    721720        drm_sysfs_connector_add(connector);
    722721#else
    … …  
    725724
    726725#if RTLNX_VER_MIN(4,19,0) || defined(OPENSUSE_151) || defined(OPENSUSE_125) \
    727   || defined(RHEL_77) || defined(RHEL_81)
     726  || RTLNX_RHEL_MAJ_PREREQ(7,7) || RTLNX_RHEL_MAJ_PREREQ(8,1)
    728727        drm_connector_attach_encoder(connector, encoder);
    729728#else
    … …  
    833832        }
    834833
    835 #if RTLNX_VER_MIN(4,7,0) || defined(RHEL_74)
     834#if RTLNX_VER_MIN(4,7,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
    836835        obj = drm_gem_object_lookup(file_priv, handle);
    837836#else

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

    r85704 r85705  
    5050}
    5151
    52 #if RTLNX_VER_MAX(3,18,0) && !defined(RHEL_72)
     52#if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
    5353struct drm_gem_object *vbox_gem_prime_import_sg_table(
    5454        struct drm_device *dev, size_t size, struct sg_table *table)

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

    r85704 r85705  
    3636#include <drm/ttm/ttm_page_alloc.h>
    3737
    38 #if RTLNX_VER_MAX(3,18,0) && !defined(RHEL_72)
     38#if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
    3939#define PLACEMENT_FLAGS(placement) (placement)
    4040#else
    … …  
    4747}
    4848
    49 #if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
     49#if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
    5050static int vbox_ttm_mem_global_init(struct drm_global_reference *ref)
    5151{
    … …  
    211211};
    212212
    213 #if (RTLNX_VER_MAX(4,17,0)) && !defined(RHEL_76) \
     213#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    214214  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
    215215static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
    … …  
    229229
    230230        tt->func = &vbox_tt_backend_func;
    231 #if (RTLNX_VER_MAX(4,17,0)) && !defined(RHEL_76) \
     231#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    232232  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
    233233        if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
    … …  
    243243
    244244#if RTLNX_VER_MAX(4,17,0)
    245 # if (RTLNX_VER_MAX(4,16,0)) && !defined(RHEL_76) \
     245# if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    246246  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
    247247static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
    … …  
    270270#endif
    271271        .init_mem_type = vbox_bo_init_mem_type,
    272 #if RTLNX_VER_MIN(4,10,0) || defined(RHEL_74)
     272#if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
    273273        .eviction_valuable = ttm_bo_eviction_valuable,
    274274#endif
    … …  
    277277        .io_mem_reserve = &vbox_ttm_io_mem_reserve,
    278278        .io_mem_free = &vbox_ttm_io_mem_free,
    279 #if RTLNX_VER_MIN(4,12,0) || defined(RHEL_75)
    280 # if (RTLNX_VER_MAX(4,16,0)) && !defined(RHEL_76) \
     279#if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
     280# if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    281281  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
    282282        .io_mem_pfn = ttm_bo_default_io_mem_pfn,
    283283# endif
    284284#endif
    285 #if (RTLNX_VER_RANGE(4,7,0,  4,11,0) || defined(RHEL_74)) && !defined(RHEL_75)
     285#if (RTLNX_VER_RANGE(4,7,0,  4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)) && !RTLNX_RHEL_MAJ_PREREQ(7,5)
    286286        .lru_tail = &ttm_bo_default_lru_tail,
    287287        .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
    … …  
    295295        struct ttm_bo_device *bdev = &vbox->ttm.bdev;
    296296
    297 #if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
     297#if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
    298298        ret = vbox_ttm_global_init(vbox);
    299299        if (ret)
    … …  
    301301#endif
    302302        ret = ttm_bo_device_init(&vbox->ttm.bdev,
    303 #if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
     303#if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
    304304                                 vbox->ttm.bo_global_ref.ref.object,
    305305#endif
    306306                                 &vbox_bo_driver,
    307 #if RTLNX_VER_MIN(3,15,0) || defined(RHEL_71)
     307#if RTLNX_VER_MIN(3,15,0) || RTLNX_RHEL_MAJ_PREREQ(7,1)
    308308                                 dev->anon_inode->i_mapping,
    309309#endif
    310310#if RTLNX_VER_MIN(5,5,0)
    311311                                 dev->vma_offset_manager,
    312 #elif RTLNX_VER_MAX(5,2,0) && !defined(RHEL_82)
     312#elif RTLNX_VER_MAX(5,2,0) && !RTLNX_RHEL_MAJ_PREREQ(8,2)
    313313                                 DRM_FILE_PAGE_OFFSET,
    314314#endif
    … …  
    316316        if (ret) {
    317317                DRM_ERROR("Error initialising bo driver; %d\n", ret);
    318 #if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
     318#if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
    319319                goto err_ttm_global_release;
    320320#else
    … …  
    342342err_device_release:
    343343        ttm_bo_device_release(&vbox->ttm.bdev);
    344 #if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
     344#if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
    345345err_ttm_global_release:
    346346        vbox_ttm_global_release(vbox);
    … …  
    359359#endif
    360360        ttm_bo_device_release(&vbox->ttm.bdev);
    361 #if RTLNX_VER_MAX(5,0,0) && !defined(RHEL_77) && !defined(RHEL_81)
     361#if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
    362362        vbox_ttm_global_release(vbox);
    363363#endif
    … …  
    367367{
    368368        u32 c = 0;
    369 #if RTLNX_VER_MAX(3,18,0) && !defined(RHEL_72)
     369#if RTLNX_VER_MAX(3,18,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
    370370        bo->placement.fpfn = 0;
    371371        bo->placement.lpfn = 0;
    … …  
    390390        bo->placement.num_busy_placement = c;
    391391
    392 #if RTLNX_VER_MIN(3,18,0) || defined(RHEL_72)
     392#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
    393393        for (i = 0; i < c; ++i) {
    394394                bo->placements[i].fpfn = 0;
    … …  
    415415
    416416        vboxbo->bo.bdev = &vbox->ttm.bdev;
    417 #if RTLNX_VER_MAX(3,15,0) && !defined(RHEL_71)
     417#if RTLNX_VER_MAX(3,15,0) && !RTLNX_RHEL_MAJ_PREREQ(7,1)
    418418        vboxbo->bo.bdev->dev_mapping = dev->dev_mapping;
    419419#endif
    … …  
    426426        ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
    427427                          ttm_bo_type_device, &vboxbo->placement,
    428 #if RTLNX_VER_MAX(4,17,0) && !defined(RHEL_76) \
     428#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    429429  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
    430430                          align >> PAGE_SHIFT, false, NULL, acc_size,
    … …  
    432432                          align >> PAGE_SHIFT, false, acc_size,
    433433#endif
    434 #if RTLNX_VER_MIN(3,18,0) || defined(RHEL_72)
     434#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
    435435                          NULL, NULL, vbox_bo_ttm_destroy);
    436436#else
    … …  
    456456int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
    457457{
    458 #if (RTLNX_VER_MIN(4,16,0)) || defined(RHEL_76) \
     458#if (RTLNX_VER_MIN(4,16,0)) || RTLNX_RHEL_MAJ_PREREQ(7,6) \
    459459  || defined(OPENSUSE_151) || defined(OPENSUSE_125)
    460460        struct ttm_operation_ctx ctx = { false, false };
    … …  
    475475                PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
    476476
    477 #if (RTLNX_VER_MAX(4,16,0)) && !defined(RHEL_76) \
     477#if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    478478  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
    479479        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
    … …  
    494494int vbox_bo_unpin(struct vbox_bo *bo)
    495495{
    496 #if (RTLNX_VER_MIN(4,16,0)) || defined(RHEL_76) \
     496#if (RTLNX_VER_MIN(4,16,0)) || RTLNX_RHEL_MAJ_PREREQ(7,6) \
    497497  || defined(OPENSUSE_151) || defined(OPENSUSE_125)
    498498        struct ttm_operation_ctx ctx = { false, false };
    … …  
    511511                PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
    512512
    513 #if (RTLNX_VER_MAX(4,16,0)) && !defined(RHEL_76) \
     513#if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    514514  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
    515515        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
    … …  
    530530int vbox_bo_push_sysram(struct vbox_bo *bo)
    531531{
    532 #if (RTLNX_VER_MIN(4,16,0)) || defined(RHEL_76) \
     532#if (RTLNX_VER_MIN(4,16,0)) || RTLNX_RHEL_MAJ_PREREQ(7,6) \
    533533  || defined(OPENSUSE_151) || defined(OPENSUSE_125)
    534534        struct ttm_operation_ctx ctx = { false, false };
    … …  
    552552                PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
    553553
    554 #if (RTLNX_VER_MAX(4,16,0)) && !defined(RHEL_76) \
     554#if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    555555  && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
    556556        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
Note: See TracChangeset for help on using the changeset viewer.

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