diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-05-18 15:13:17 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-05-18 15:21:46 -0700 |
| commit | cb476dbdef5d75ec16dd1016a17f3f063d7e61a3 (patch) | |
| tree | a8cbf41e961a37db6a20ed148349be7adc8b9c96 /src/savage_driver.h | |
| parent | b47b0a666b1efde725fefbccc8ea1c0590f72e09 (diff) | |
Raise minimum supported Xserver version to 1.18 (ABI_VIDEODRV_VERSION 20.0)
Already effectively required by use of XNFcallocarray() introduced in
xorg/xserver@b96dc999 - xserver-1.18.0, released in Nov. 2015.
Allows dropping remnants of code for XAA and pre-pciaccess X servers
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-savage/-/merge_requests/11>
Diffstat (limited to 'src/savage_driver.h')
| -rw-r--r-- | src/savage_driver.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/savage_driver.h b/src/savage_driver.h index 134fcf5..9cd7a5a 100644 --- a/src/savage_driver.h +++ b/src/savage_driver.h @@ -51,9 +51,6 @@ #include "compiler.h" #include "vgaHW.h" #include "xf86.h" -#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 -#include "xf86Resources.h" -#endif #include "xf86Modes.h" #include "xf86Pci.h" #include "xf86_OSproc.h" @@ -64,9 +61,6 @@ #include "fboverlay.h" #include "xf86cmap.h" #include "vbe.h" -#ifdef HAVE_XAA_H -#include "xaa.h" -#endif #include "xf86fbman.h" #include "exa.h" #include "xf86xv.h" @@ -423,16 +417,9 @@ typedef struct _Savage { unsigned long pbd_high; unsigned long sbd_high; - /* Support for XAA acceleration */ -#ifdef HAVE_XAA_H - XAAInfoRecPtr AccelInfoRec; -#endif - xRectangle Rect; unsigned int SavedBciCmd; unsigned int SavedFgColor; unsigned int SavedBgColor; - unsigned int SavedSbdOffset; - unsigned int SavedSbd; SavageModeTablePtr ModeTable; @@ -601,8 +588,7 @@ void SavageSetGBD(ScrnInfoPtr); void SavageAccelSync(ScrnInfoPtr); /*int SavageHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop);*/ -/* XAA and EXA */ -Bool SavageXAAInit(ScreenPtr); +/* EXA */ Bool SavageEXAInit(ScreenPtr); /* In savage_i2c.c. */ |