XLibre/xf86-video-amdgpu
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-amdgpu.git synced 2026-04-14 11:04:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop some compat stuff for ancient Xserver versions

Browse Source 
We're not going to support ancient Xserver versions anymore, so this
can be dropped.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-29 13:19:24 +02:00
committed by Enrico Weigelt
parent 2ae9d9addc
commit a82cc5f87c
4 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/amdgpu_glamor.c
View File

@@ -79,11 +79,7 @@ Bool amdgpu_glamor_pre_init(ScrnInfoPtr scrn)
pointer glamor_module;
CARD32 version;
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,20,99,0,0)
if (scrn->depth < 24) {
#else
if (scrn->depth < 15) {
#endif
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Depth %d not supported with glamor, disabling\n",
scrn->depth);
@@ -138,11 +134,8 @@ amdgpu_glamor_create_textured_pixmap(PixmapPtr pixmap, struct amdgpu_buffer *bo)
if (bo->flags & AMDGPU_BO_FLAGS_GBM) {
return glamor_egl_create_textured_pixmap_from_gbm_bo(pixmap,
bo->bo.gbm
#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,19,99,903,0)
, FALSE
#endif
);
bo->bo.gbm,
FALSE);
} else {
uint32_t bo_handle;

5
src/amdgpu_kms.c
View File

@@ -1276,11 +1276,6 @@ static void AMDGPUBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
}
}
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,0,0,0)
if (info->use_glamor)
amdgpu_glamor_flush(pScrn);
#endif
amdgpu_dirty_update(pScrn);
}

4
src/amdgpu_video.c
View File

@@ -150,7 +150,6 @@ amdgpu_crtc_covering_box(ScreenPtr pScreen, BoxPtr box, Bool screen_is_xf86_hint
return best_crtc;
}
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
static RRCrtcPtr
amdgpu_crtc_covering_box_on_secondary(ScreenPtr pScreen, BoxPtr box)
{
@@ -170,7 +169,6 @@ amdgpu_crtc_covering_box_on_secondary(ScreenPtr pScreen, BoxPtr box)
return NULL;
}
#endif
RRCrtcPtr
amdgpu_randr_crtc_covering_drawable(DrawablePtr pDraw)
@@ -185,11 +183,9 @@ amdgpu_randr_crtc_covering_drawable(DrawablePtr pDraw)
box.y2 = box.y1 + pDraw->height;
crtc = amdgpu_crtc_covering_box(pScreen, &box, TRUE);
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
if (!crtc) {
crtc = amdgpu_crtc_covering_box_on_secondary(pScreen, &box);
}
#endif
return crtc;
}

16
src/compat-api.h
View File

@@ -26,25 +26,9 @@
#ifndef COMPAT_API_H
#define COMPAT_API_H
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22,0)
#define HAVE_NOTIFY_FD 1
#endif
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout
#define BLOCKHANDLER_ARGS pScreen, pTimeout
#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr pScreen, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
#endif
#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
#define current_primary current_master
#define primary_pixmap master_pixmap
#define secondary_dst slave_dst
#define secondary_list slave_list
#define secondary_head slave_head
#define is_output_secondary is_output_slave
#endif
#endif