Remove DGA support

DGA was so 2004.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Bob Terek <xorg@esoterek.com>
Tested-by: Antoine Martin <antoine@nagafix.co.uk>
This commit is contained in:
Aaron Plattner 2017-08-05 21:31:13 +07:00
parent 7c3b090e80
commit 87249af5fa
5 changed files with 0 additions and 203 deletions

View File

@ -46,7 +46,6 @@ AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"]) AH_TOP([#include "xorg-server.h"])
# Define a configure option for an alternate module directory # Define a configure option for an alternate module directory
AC_ARG_ENABLE(dga, AS_HELP_STRING([--disable-dga], [Build DGA extension (default: yes)]), [DGA=$enableval], [DGA=yes])
AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ], AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ],
[ moduledir="$withval" ], [ moduledir="$withval" ],
[ moduledir="$libdir/xorg/modules" ]) [ moduledir="$libdir/xorg/modules" ])
@ -57,13 +56,6 @@ AC_SUBST(moduledir)
XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
if test "x$DGA" = xyes; then
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
AC_DEFINE(USE_DGA, 1, [Support DGA extension])
fi
AC_SUBST([DGA])
AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
# Obtain compiler/linker options for the driver dependencies # Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4.99.901] xproto fontsproto $REQUIRED_MODULES) PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4.99.901] xproto fontsproto $REQUIRED_MODULES)

View File

@ -37,8 +37,3 @@ dummy_drv_la_SOURCES = \
dummy_cursor.c \ dummy_cursor.c \
dummy_driver.c \ dummy_driver.c \
dummy.h dummy.h
if DGA
dummy_drv_la_SOURCES += \
dummy_dga.c
endif

View File

@ -28,9 +28,6 @@ extern Bool DUMMYCursorInit(ScreenPtr pScrn);
extern void DUMMYShowCursor(ScrnInfoPtr pScrn); extern void DUMMYShowCursor(ScrnInfoPtr pScrn);
extern void DUMMYHideCursor(ScrnInfoPtr pScrn); extern void DUMMYHideCursor(ScrnInfoPtr pScrn);
/* in dummy_dga.c */
Bool DUMMYDGAInit(ScreenPtr pScreen);
/* globals */ /* globals */
typedef struct _color typedef struct _color
{ {
@ -41,10 +38,6 @@ typedef struct _color
typedef struct dummyRec typedef struct dummyRec
{ {
DGAModePtr DGAModes;
int numDGAModes;
Bool DGAactive;
int DGAViewportStatus;
/* options */ /* options */
OptionInfoPtr Options; OptionInfoPtr Options;
Bool swCursor; Bool swCursor;

View File

@ -1,175 +0,0 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "xf86.h"
#include "xf86_OSproc.h"
#include "dgaproc.h"
#include "dummy.h"
static Bool DUMMY_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
int *, int *, int *);
static Bool DUMMY_SetMode(ScrnInfoPtr, DGAModePtr);
static int DUMMY_GetViewport(ScrnInfoPtr);
static void DUMMY_SetViewport(ScrnInfoPtr, int, int, int);
static
DGAFunctionRec DUMMYDGAFuncs = {
DUMMY_OpenFramebuffer,
NULL,
DUMMY_SetMode,
DUMMY_SetViewport,
DUMMY_GetViewport,
NULL,
NULL,
NULL,
#if 0
DUMMY_BlitTransRect
#else
NULL
#endif
};
Bool
DUMMYDGAInit(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
DUMMYPtr pDUMMY = DUMMYPTR(pScrn);
DGAModePtr modes = NULL, newmodes = NULL, currentMode;
DisplayModePtr pMode, firstMode;
int Bpp = pScrn->bitsPerPixel >> 3;
int num = 0, imlines, pixlines;
imlines = (pScrn->videoRam * 1024) /
(pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
pixlines = imlines;
pMode = firstMode = pScrn->modes;
while(pMode) {
newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
if(!newmodes) {
free(modes);
return FALSE;
}
modes = newmodes;
currentMode = modes + num;
num++;
currentMode->mode = pMode;
currentMode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE;
if(pMode->Flags & V_DBLSCAN)
currentMode->flags |= DGA_DOUBLESCAN;
if(pMode->Flags & V_INTERLACE)
currentMode->flags |= DGA_INTERLACED;
currentMode->byteOrder = pScrn->imageByteOrder;
currentMode->depth = pScrn->depth;
currentMode->bitsPerPixel = pScrn->bitsPerPixel;
currentMode->red_mask = pScrn->mask.red;
currentMode->green_mask = pScrn->mask.green;
currentMode->blue_mask = pScrn->mask.blue;
currentMode->visualClass = (Bpp == 1) ? PseudoColor : TrueColor;
currentMode->viewportWidth = pMode->HDisplay;
currentMode->viewportHeight = pMode->VDisplay;
currentMode->xViewportStep = 1;
currentMode->yViewportStep = 1;
currentMode->viewportFlags = DGA_FLIP_RETRACE;
currentMode->offset = 0;
currentMode->address = (unsigned char *)pDUMMY->FBBase;
currentMode->bytesPerScanline =
((pScrn->displayWidth * Bpp) + 3) & ~3L;
currentMode->imageWidth = pScrn->displayWidth;
currentMode->imageHeight = imlines;
currentMode->pixmapWidth = currentMode->imageWidth;
currentMode->pixmapHeight = pixlines;
currentMode->maxViewportX = currentMode->imageWidth -
currentMode->viewportWidth;
currentMode->maxViewportY = currentMode->imageHeight -
currentMode->viewportHeight;
pMode = pMode->next;
if(pMode == firstMode)
break;
}
pDUMMY->numDGAModes = num;
pDUMMY->DGAModes = modes;
return DGAInit(pScreen, &DUMMYDGAFuncs, modes, num);
}
static DisplayModePtr DUMMYSavedDGAModes[MAXSCREENS];
static Bool
DUMMY_SetMode(
ScrnInfoPtr pScrn,
DGAModePtr pMode
){
int index = pScrn->pScreen->myNum;
DUMMYPtr pDUMMY = DUMMYPTR(pScrn);
if(!pMode) { /* restore the original mode */
if(pDUMMY->DGAactive) {
pScrn->currentMode = DUMMYSavedDGAModes[index];
DUMMYSwitchMode(SWITCH_MODE_ARGS(pScrn, pScrn->currentMode));
DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, 0, 0));
pDUMMY->DGAactive = FALSE;
}
} else {
if(!pDUMMY->DGAactive) { /* save the old parameters */
DUMMYSavedDGAModes[index] = pScrn->currentMode;
pDUMMY->DGAactive = TRUE;
}
DUMMYSwitchMode(SWITCH_MODE_ARGS(pScrn, pMode->mode));
}
return TRUE;
}
static int
DUMMY_GetViewport(
ScrnInfoPtr pScrn
){
DUMMYPtr pDUMMY = DUMMYPTR(pScrn);
return pDUMMY->DGAViewportStatus;
}
static void
DUMMY_SetViewport(
ScrnInfoPtr pScrn,
int x, int y,
int flags
){
DUMMYPtr pDUMMY = DUMMYPTR(pScrn);
DUMMYAdjustFrame(ADJUST_FRAME_ARGS(pScrn, x, y));
pDUMMY->DGAViewportStatus = 0;
}
static Bool
DUMMY_OpenFramebuffer(
ScrnInfoPtr pScrn,
char **name,
unsigned char **mem,
int *size,
int *offset,
int *flags
){
DUMMYPtr pDUMMY = DUMMYPTR(pScrn);
*name = NULL; /* no special device */
*mem = (unsigned char*)pDUMMY->FBBase;
*size = pScrn->videoRam * 1024;
*offset = 0;
*flags = DGA_NEED_ROOT;
return TRUE;
}

View File

@ -39,10 +39,6 @@
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "scrnintstr.h" #include "scrnintstr.h"
#include "servermd.h" #include "servermd.h"
#ifdef USE_DGA
#define _XF86DGA_SERVER_
#include <X11/extensions/xf86dgaproto.h>
#endif
/* Mandatory functions */ /* Mandatory functions */
static const OptionInfoRec * DUMMYAvailableOptions(int chipid, int busid); static const OptionInfoRec * DUMMYAvailableOptions(int chipid, int busid);
@ -563,10 +559,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
xf86SetBlackWhitePixels(pScreen); xf86SetBlackWhitePixels(pScreen);
#ifdef USE_DGA
DUMMYDGAInit(pScreen);
#endif
if (dPtr->swCursor) if (dPtr->swCursor)
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Using Software Cursor.\n"); xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Using Software Cursor.\n");