mirror of
https://github.com/X11Libre/xf86-video-ati.git
synced 2026-03-24 01:24:43 +00:00
drop support for xserver version < 1.19.99.1
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
84bc1933e7
commit
c209a55f0e
@@ -44,11 +44,6 @@
|
||||
#include "radeon_bo_helper.h"
|
||||
#include "radeon_glamor.h"
|
||||
#include "radeon_reg.h"
|
||||
|
||||
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,99,1,0)
|
||||
#include <dri.h>
|
||||
#endif
|
||||
|
||||
#include "drmmode_display.h"
|
||||
|
||||
/* DPMS */
|
||||
@@ -434,9 +429,7 @@ destroy_pixmap_for_fbcon(ScrnInfoPtr pScrn)
|
||||
* avoid issues due to a GEM handle lifetime conflict between us and
|
||||
* Mesa
|
||||
*/
|
||||
if (info->use_glamor &&
|
||||
(info->ChipFamily >= CHIP_FAMILY_CAYMAN ||
|
||||
xorgGetVersion() >= XORG_VERSION_NUMERIC(1,19,99,1,0)))
|
||||
if (info->use_glamor)
|
||||
return;
|
||||
|
||||
if (info->fbcon_pixmap)
|
||||
|
||||
@@ -115,14 +115,6 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (scrn->depth == 30 &&
|
||||
xorgGetVersion() < XORG_VERSION_NUMERIC(1,19,99,1,0)) {
|
||||
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
|
||||
"Depth 30 is not supported by GLAMOR with Xorg < "
|
||||
"1.19.99.1\n");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
info->gbm = gbm_create_device(pRADEONEnt->fd);
|
||||
if (!info->gbm) {
|
||||
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
|
||||
@@ -168,11 +160,8 @@ radeon_glamor_create_textured_pixmap(PixmapPtr pixmap, struct radeon_buffer *bo)
|
||||
|
||||
if (bo->flags & RADEON_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 {
|
||||
return glamor_egl_create_textured_pixmap(pixmap,
|
||||
bo->bo.radeon->handle,
|
||||
|
||||
@@ -49,11 +49,7 @@
|
||||
|
||||
#include "xf86drmMode.h"
|
||||
|
||||
#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,19,99,1,0)
|
||||
#include <xf86Pci.h>
|
||||
#else
|
||||
#include "dri.h"
|
||||
#endif
|
||||
|
||||
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
||||
#include <xf86_OSproc.h>
|
||||
|
||||
Reference in New Issue
Block a user