daemonratte/xf86-video-ati
Watch
1
0
Fork
You've already forked xf86-video-ati
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drop support for xserver version < 1.18.3

Browse source 
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-07-14 22:06:18 +02:00 • committed by Enrico Weigelt
commit 84bc1933e7
4 changed files with 3 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/drmmode_display.c
View file

@ -626,11 +626,6 @@ drmmode_can_use_hw_cursor(xf86CrtcPtr crtc)
return FALSE;
#endif
/* HW cursor not supported with RandR 1.4 multihead up to 1.18.99.901 */
if (xorgGetVersion() <= XORG_VERSION_NUMERIC(1,18,99,901,0) &&
!xorg_list_is_empty(&crtc->scrn->pScreen->pixmap_dirty_list))
return FALSE;
return TRUE;
}
@ -1062,14 +1057,6 @@ drmmode_cursor_pixel(xf86CrtcPtr crtc, uint32_t *argb, Bool *premultiplied,
int i;
if (premultiplied) {
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 18, 4, 0, 0)
if (alpha == 0 && (*argb & 0xffffff) != 0) {
/* Doesn't look like premultiplied alpha */
*premultiplied = FALSE;
return FALSE;
}
#endif
if (!(*apply_gamma))
return TRUE;

37
src/radeon_dri3.c
View file

@ -117,38 +117,6 @@ radeon_dri3_open(ScreenPtr screen, RRProviderPtr provider, int *out)
return ret;
}
#if DRI3_SCREEN_INFO_VERSION >= 1 && XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(1,18,99,1,0)
static int
radeon_dri3_open_client(ClientPtr client, ScreenPtr screen,
RRProviderPtr provider, int *out)
{
const char *cmdname = GetClientCmdName(client);
Bool is_ssh = FALSE;
/* If the executable name is "ssh", assume that this client connection
* is forwarded from another host via SSH
*/
if (cmdname) {
char *cmd = strdup(cmdname);
/* Cut off any colon and whatever comes after it, see
* https://lists.freedesktop.org/archives/xorg-devel/2015-December/048164.html
*/
cmd = strtok(cmd, ":");
is_ssh = strcmp(basename(cmd), "ssh") == 0;
free(cmd);
}
if (!is_ssh)
return radeon_dri3_open(screen, provider, out);
return BadAccess;
}
#endif /* DRI3_SCREEN_INFO_VERSION >= 1 && XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(1,18,99,1,0) */
static PixmapPtr radeon_dri3_pixmap_from_fd(ScreenPtr screen,
int fd,
CARD16 width,
@ -253,13 +221,8 @@ static int radeon_dri3_fd_from_pixmap(ScreenPtr screen,
}
static dri3_screen_info_rec radeon_dri3_screen_info = {
#if DRI3_SCREEN_INFO_VERSION >= 1 && XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(1,18,99,1,0)
.version = 1,
.open_client = radeon_dri3_open_client,
#else
.version = 0,
.open = radeon_dri3_open,
#endif
.pixmap_from_fd = radeon_dri3_pixmap_from_fd,
.fd_from_pixmap = radeon_dri3_fd_from_pixmap
};

9
src/radeon_glamor.c
View file

@ -81,13 +81,8 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
s = xf86GetOptValString(info->Options, OPTION_ACCELMETHOD);
if (!s) {
if (xorgGetVersion() >= XORG_VERSION_NUMERIC(1,18,3,0,0)) {
if (info->ChipFamily < CHIP_FAMILY_R600)
return FALSE;
} else {
if (info->ChipFamily < CHIP_FAMILY_TAHITI)
return FALSE;
}
if (info->ChipFamily < CHIP_FAMILY_R600)
return FALSE;
}
if (s && strcasecmp(s, "glamor") != 0) {

5
src/radeon_kms.c
View file

@ -2391,10 +2391,7 @@ Bool RADEONScreenInit_KMS(ScreenPtr pScreen, int argc, char **argv)
#endif
if (!pScreen->isGPU) {
if (xorgGetVersion() >= XORG_VERSION_NUMERIC(1,18,3,0,0))
value = info->use_glamor;
else
value = FALSE;
value = info->use_glamor;
from = X_DEFAULT;
if (!info->r600_shadow_fb) {