VirtualBox

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

Add/linux/vboxvideo: Cleanups.

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

Legend:

Unmodified
Added
Removed

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

    r85706 r85707  
    4040
    4141#include <drm/drm_crtc_helper.h>
    42 
    4342#if RTLNX_VER_MIN(5,1,0) || RTLNX_RHEL_MAJ_PREREQ(8,1)
    44 #include <drm/drm_probe_helper.h>
     43# include <drm/drm_probe_helper.h>
    4544#endif
    4645
    … …  
    326325        .master_drop = vbox_master_drop,
    327326#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) \
    329   && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
     327# if RTLNX_VER_MAX(4,14,0) && !RTLNX_RHEL_MAJ_PREREQ(7,5) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
    330328        .set_busid = drm_pci_set_busid,
    331329# endif

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

    r85706 r85707  
    153153
    154154#if RTLNX_VER_MAX(5,5,0)
    155 #include <drm/drmP.h>
     155# include <drm/drmP.h>
    156156#else /* >= 5.5.0 */
    157 #include <drm/drm_file.h>
    158 #include <drm/drm_drv.h>
    159 #include <drm/drm_device.h>
    160 #include <drm/drm_ioctl.h>
    161 #include <drm/drm_fourcc.h>
    162 #include <drm/drm_irq.h>
    163 #include <drm/drm_vblank.h>
     157# include <drm/drm_file.h>
     158# include <drm/drm_drv.h>
     159# include <drm/drm_device.h>
     160# include <drm/drm_ioctl.h>
     161# include <drm/drm_fourcc.h>
     162# include <drm/drm_irq.h>
     163# include <drm/drm_vblank.h>
    164164#endif /* >= 5.5.0 */
    165165#if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
    166 #include <drm/drm_encoder.h>
     166# include <drm/drm_encoder.h>
    167167#endif
    168168#include <drm/drm_fb_helper.h>
    169169#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
    170 #include <drm/drm_gem.h>
     170# include <drm/drm_gem.h>
    171171#endif
    172172
    … …  
    367367
    368368#if RTLNX_VER_MAX(3,3,0)
    369 #define DRM_MODE_FB_CMD drm_mode_fb_cmd
    370 #else
    371 #define DRM_MODE_FB_CMD drm_mode_fb_cmd2
     369# define DRM_MODE_FB_CMD drm_mode_fb_cmd
     370#else
     371# define DRM_MODE_FB_CMD drm_mode_fb_cmd2
    372372#endif
    373373
    374374#if RTLNX_VER_MAX(3,15,0) && !RTLNX_RHEL_MAJ_PREREQ(7,1)
    375 #define CRTC_FB(crtc) ((crtc)->fb)
    376 #else
    377 #define CRTC_FB(crtc) ((crtc)->primary->fb)
     375# define CRTC_FB(crtc) ((crtc)->fb)
     376#else
     377# define CRTC_FB(crtc) ((crtc)->primary->fb)
    378378#endif
    379379

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

    r85705 r85707  
    124124        vbox_bo_unreserve(bo);
    125125}
    126 #endif
     126#endif /* RTLNX_VER_MAX(4,7,0) && !RTLNX_RHEL_MAJ_PREREQ(7,4) */
    127127
    128128#ifdef CONFIG_FB_DEFERRED_IO
    … …  
    158158        .deferred_io = drm_fb_helper_deferred_io,
    159159};
    160 #endif
     160#endif /* CONFIG_FB_DEFERRED_IO */
    161161
    162162#if RTLNX_VER_MAX(4,3,0) && !RTLNX_RHEL_MAJ_PREREQ(7,3)
    … …  
    185185                          image->height);
    186186}
    187 #endif
     187#endif /* RTLNX_VER_MAX(4,3,0) && !RTLNX_RHEL_MAJ_PREREQ(7,3) */
    188188
    189189static struct fb_ops vboxfb_ops = {

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

    r85705 r85707  
    3535
    3636#if RTLNX_VER_MAX(5,1,0)
    37 #include <drm/drm_crtc_helper.h>
     37# include <drm/drm_crtc_helper.h>
    3838# if RTLNX_RHEL_MAJ_PREREQ(8,1)
    3939#  include <drm/drm_probe_helper.h>
    4040# endif
    4141#else
    42 #include <drm/drm_probe_helper.h>
     42# include <drm/drm_probe_helper.h>
    4343#endif
    4444#include <VBoxVideo.h>

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

    r85706 r85707  
    231231
    232232#if RTLNX_VER_MAX(4,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,3)
    233 #define pci_iomap_range(dev, bar, offset, maxlen) \
     233# define pci_iomap_range(dev, bar, offset, maxlen) \
    234234        ioremap(pci_resource_start(dev, bar) + (offset), maxlen)
    235235#endif
    … …  
    606606#endif
    607607
    608 #if RTLNX_VER_MAX(4,19,0) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) \
    609   && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
     608#if RTLNX_VER_MAX(4,19,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
    610609static void ttm_bo_put(struct ttm_buffer_object *bo)
    611610{

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

    r85706 r85707  
    4141#include <drm/drm_crtc_helper.h>
    4242#if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
    43 #include <drm/drm_plane_helper.h>
     43# include <drm/drm_plane_helper.h>
    4444#endif
    4545#if RTLNX_VER_MIN(5,1,0) || RTLNX_RHEL_MAJ_PREREQ(8,1)
    46 #include <drm/drm_probe_helper.h>
     46# include <drm/drm_probe_helper.h>
    4747#endif
    4848
    … …  
    410410        /* pick the encoder ids */
    411411        if (enc_id)
    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))
     412# if RTLNX_VER_MIN(4,15,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || (defined(CONFIG_SUSE_VERSION) && RTLNX_VER_MIN(4,12,0))
    415413                return drm_encoder_find(connector->dev, NULL, enc_id);
    416414# else
    … …  
    547545                sum += edid[i];
    548546        edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
    549 #if RTLNX_VER_MIN(4,19,0) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) \
    550   || RTLNX_RHEL_MAJ_PREREQ(7,7) || RTLNX_RHEL_MAJ_PREREQ(8,1)
     547#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,7) || RTLNX_RHEL_MAJ_PREREQ(8,1) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
    551548        drm_connector_update_edid_property(connector, (struct edid *)edid);
    552549#else
    … …  
    723720#endif
    724721
    725 #if RTLNX_VER_MIN(4,19,0) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5) \
    726   || RTLNX_RHEL_MAJ_PREREQ(7,7) || RTLNX_RHEL_MAJ_PREREQ(8,1)
     722#if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,7) || RTLNX_RHEL_MAJ_PREREQ(8,1) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
    727723        drm_connector_attach_encoder(connector, encoder);
    728724#else

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

    r85706 r85707  
    211211};
    212212
    213 #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    214   && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
     213#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
    215214static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
    216215                                         unsigned long size,
    … …  
    229228
    230229        tt->func = &vbox_tt_backend_func;
    231 #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    232   && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
     230#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
    233231        if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
    234232#else
    … …  
    243241
    244242#if RTLNX_VER_MAX(4,17,0)
    245 # if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    246   && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
     243# if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
    247244static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
    248245{
    … …  
    278275        .io_mem_free = &vbox_ttm_io_mem_free,
    279276#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) \
    281   && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
     277# if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
    282278        .io_mem_pfn = ttm_bo_default_io_mem_pfn,
    283279# endif
    … …  
    426422        ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
    427423                          ttm_bo_type_device, &vboxbo->placement,
    428 #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    429   && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
     424#if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
    430425                          align >> PAGE_SHIFT, false, NULL, acc_size,
    431426#else
    … …  
    456451int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
    457452{
    458 #if (RTLNX_VER_MIN(4,16,0)) || RTLNX_RHEL_MAJ_PREREQ(7,6) \
    459   || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
     453#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
    460454        struct ttm_operation_ctx ctx = { false, false };
    461455#endif
    … …  
    475469                PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
    476470
    477 #if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    478   && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
     471#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
    479472        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
    480473#else
    … …  
    494487int vbox_bo_unpin(struct vbox_bo *bo)
    495488{
    496 #if (RTLNX_VER_MIN(4,16,0)) || RTLNX_RHEL_MAJ_PREREQ(7,6) \
    497   || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
     489#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
    498490        struct ttm_operation_ctx ctx = { false, false };
    499491#endif
    … …  
    511503                PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
    512504
    513 #if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    514   && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
     505#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
    515506        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
    516507#else
    … …  
    530521int vbox_bo_push_sysram(struct vbox_bo *bo)
    531522{
    532 #if (RTLNX_VER_MIN(4,16,0)) || RTLNX_RHEL_MAJ_PREREQ(7,6) \
    533   || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
     523#if RTLNX_VER_MIN(4,16,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
    534524        struct ttm_operation_ctx ctx = { false, false };
    535525#endif
    … …  
    552542                PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
    553543
    554 #if (RTLNX_VER_MAX(4,16,0)) && !RTLNX_RHEL_MAJ_PREREQ(7,6) \
    555   && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
     544#if RTLNX_VER_MAX(4,16,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5)
    556545        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
    557546#else
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