Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-trap.c
	xorg-server/Xext/xace.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/include/dixstruct.h
	xorg-server/os/connection.c

12 files changed, 1075 insertions, 1120 deletions

diff --git a/xorg-server/hw/xfree86/Makefile.am b/xorg-server/hw/xfree86/Makefile.am
index 4f0877290..72be8891c 100644
--- a/xorg-server/hw/xfree86/Makefile.am
+++ b/xorg-server/hw/xfree86/Makefile.am
@@ -11,9 +11,7 @@ if XF86UTILS
 XF86UTILS_SUBDIR = utils
 endif
 
-if XAA
 XAA_SUBDIR = xaa
-endif
 
 if VGAHW
 VGAHW_SUBDIR = vgahw
diff --git a/xorg-server/hw/xfree86/common/compiler.h b/xorg-server/hw/xfree86/common/compiler.h
index 9c9bac6ba..01034916c 100644
--- a/xorg-server/hw/xfree86/common/compiler.h
+++ b/xorg-server/hw/xfree86/common/compiler.h
@@ -397,25 +397,6 @@ extern _X_EXPORT unsigned int inl(unsigned int port);
 #include <machine/pio.h>
 #endif /* __NetBSD__ */
 
-#   elif defined(linux) && defined(__ia64__) 
- 
-#    include <inttypes.h>
-
-#    include <sys/io.h>
-
-#    undef outb
-#    undef outw
-#    undef outl
-#    undef inb
-#    undef inw
-#    undef inl
-extern _X_EXPORT void outb(unsigned long port, unsigned char val);
-extern _X_EXPORT void outw(unsigned long port, unsigned short val);
-extern _X_EXPORT void outl(unsigned long port, unsigned int val);
-extern _X_EXPORT unsigned int inb(unsigned long port);
-extern _X_EXPORT unsigned int inw(unsigned long port);
-extern _X_EXPORT unsigned int inl(unsigned long port);
- 
 #   elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
  
 #    include <inttypes.h>
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index 280a6ec93..fd40f28da 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -970,15 +970,16 @@ NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
         pInfo->attrs = DuplicateInputAttributes(attrs);
     }
 
-    if (!pInfo->driver || !pInfo->name) {
-        xf86Msg(X_INFO, "No input driver/identifier specified (ignoring)\n");
+    if (!pInfo->name) {
+        xf86Msg(X_INFO, "No identifier specified, ignoring this device.\n");
         rval = BadRequest;
         goto unwind;
     }
 
-    if (!pInfo->name) {
-        xf86Msg(X_ERROR, "No device identifier specified (ignoring)\n");
-        rval = BadMatch;
+    if (!pInfo->driver) {
+        xf86Msg(X_INFO, "No input driver specified, ignoring this device.\n");
+        xf86Msg(X_INFO, "This device may have been added with another device file.\n");
+        rval = BadRequest;
         goto unwind;
     }
 
diff --git a/xorg-server/hw/xfree86/ddc/ddcProperty.c b/xorg-server/hw/xfree86/ddc/ddcProperty.c
index 5d6eec927..c3aced5c2 100644
--- a/xorg-server/hw/xfree86/ddc/ddcProperty.c
+++ b/xorg-server/hw/xfree86/ddc/ddcProperty.c
@@ -33,7 +33,6 @@
 #include <string.h>
 
 #define EDID1_ATOM_NAME         "XFree86_DDC_EDID1_RAWDATA"
-#define EDID2_ATOM_NAME         "XFree86_DDC_EDID2_RAWDATA"
 
 static void
 edidMakeAtom(int i, const char *name, CARD8 *data, int size)
@@ -52,59 +51,21 @@ edidMakeAtom(int i, const char *name, CARD8 *data, int size)
 static void
 addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC)
 {
-    int i, scrnIndex = pScrn->scrnIndex;
-    Bool makeEDID1prop = FALSE;
-    Bool makeEDID2prop = FALSE;
+    int scrnIndex = pScrn->scrnIndex;
 
     if (DDC->flags & MONITOR_DISPLAYID) {
 	/* Don't bother, use RANDR already */
 	return;
     } else if (DDC->ver.version == 1) {
-	makeEDID1prop = TRUE;
-    } else if (DDC->ver.version == 2) {
-	int checksum1;
-	int checksum2;
-	makeEDID2prop = TRUE;
+	int size = 128 +
+	    (DDC->flags & EDID_COMPLETE_RAWDATA ? DDC->no_sections * 128 : 0);
 
-	/* Some monitors (eg Panasonic PanaSync4)
-	 * report version==2 because they used EDID v2 spec document,
-	 * although they use EDID v1 data structure :-(
-	 *
-	 * Try using checksum to determine when we have such a monitor.
-	 */
-	checksum2 = 0;
-	for (i = 0; i < 256; i++)
-	    checksum2 += DDC->rawData[i];
-	if (checksum2 % 256) {
-	    xf86DrvMsg(scrnIndex, X_INFO, "Monitor EDID v2 checksum failed\n");
-	    xf86DrvMsg(scrnIndex, X_INFO,
-		    "XFree86_DDC_EDID2_RAWDATA property may be bad\n");
-	    checksum1 = 0;
-	    for (i = 0; i < 128; i++)
-		checksum1 += DDC->rawData[i];
-	    if (!(checksum1 % 256)) {
-		xf86DrvMsg(scrnIndex, X_INFO,
-			"Monitor EDID v1 checksum passed,\n");
-		xf86DrvMsg(scrnIndex, X_INFO,
-			"XFree86_DDC_EDID1_RAWDATA property created\n");
-		makeEDID1prop = TRUE;
-	    }
-	}
+	edidMakeAtom(scrnIndex, EDID1_ATOM_NAME, DDC->rawData, size);
     } else {
 	xf86DrvMsg(scrnIndex, X_PROBED, "unexpected EDID version %d.%d\n",
 		DDC->ver.version, DDC->ver.revision);
 	return;
     }
-
-    if (makeEDID1prop) {
-	int size = 128 +
-	    (DDC->flags & EDID_COMPLETE_RAWDATA ? DDC->no_sections * 128 : 0);
-
-	edidMakeAtom(scrnIndex, EDID1_ATOM_NAME, DDC->rawData, size);
-    } 
-
-    if (makeEDID2prop)
-	edidMakeAtom(scrnIndex, EDID2_ATOM_NAME, DDC->rawData, 256);
 }
 
 Bool
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c b/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
index f1c740723..4b17f152e 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -1,1035 +1,1035 @@
-/*

- * Copyright (c) 1995  Jon Tombs

- * Copyright (c) 1995, 1996, 1999  XFree86 Inc

- * Copyright (c) 1999 - The XFree86 Project Inc.

- *

- * Written by Mark Vojkovich

- */

-

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "misc.h"

-#include "dixstruct.h"

-#include "dixevents.h"

-#include "pixmapstr.h"

-#include "extnsionst.h"

-#include "colormapst.h"

-#include "cursorstr.h"

-#include "scrnintstr.h"

-#include "servermd.h"

-#include <X11/extensions/xf86dgaproto.h>

-#include "swaprep.h"

-#include "dgaproc.h"

-#include "protocol-versions.h"

-

-#include <string.h>

-

-#include "modinit.h"

-

-#define DGA_PROTOCOL_OLD_SUPPORT 1

-

-

-static void XDGAResetProc(ExtensionEntry *extEntry);

-

-static void DGAClientStateChange (CallbackListPtr*, pointer, pointer);

-

-unsigned char DGAReqCode = 0;

-int DGAErrorBase;

-int DGAEventBase;

-

-static DevPrivateKeyRec DGAScreenPrivateKeyRec;

-#define DGAScreenPrivateKey (&DGAScreenPrivateKeyRec)

-#define DGAScreenPrivateKeyRegistered (DGAScreenPrivateKeyRec.initialized)

-static DevPrivateKeyRec DGAClientPrivateKeyRec;

-#define DGAClientPrivateKey (&DGAClientPrivateKeyRec)

-static int DGACallbackRefCount = 0;

-

-/* This holds the client's version information */

-typedef struct {

-    int		major;

-    int		minor;

-} DGAPrivRec, *DGAPrivPtr;

-

-#define DGA_GETCLIENT(idx) ((ClientPtr) \

-    dixLookupPrivate(&screenInfo.screens[idx]->devPrivates, DGAScreenPrivateKey))

-#define DGA_SETCLIENT(idx,p) \

-    dixSetPrivate(&screenInfo.screens[idx]->devPrivates, DGAScreenPrivateKey, p)

-

-#define DGA_GETPRIV(c) ((DGAPrivPtr) \

-    dixLookupPrivate(&(c)->devPrivates, DGAClientPrivateKey))

-#define DGA_SETPRIV(c,p) \

-    dixSetPrivate(&(c)->devPrivates, DGAClientPrivateKey, p)

-

-

-static void

-XDGAResetProc (ExtensionEntry *extEntry)

-{

-   DeleteCallback (&ClientStateCallback, DGAClientStateChange, NULL);

-   DGACallbackRefCount = 0;

-}

-

-

-static int

-ProcXDGAQueryVersion(ClientPtr client)

-{

-    xXDGAQueryVersionReply rep;

-

-    REQUEST_SIZE_MATCH(xXDGAQueryVersionReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.majorVersion = SERVER_XDGA_MAJOR_VERSION;

-    rep.minorVersion = SERVER_XDGA_MINOR_VERSION;

-

-    WriteToClient(client, sizeof(xXDGAQueryVersionReply), (char *)&rep);

-    return Success;

-}

-

-

-static int

-ProcXDGAOpenFramebuffer(ClientPtr client)

-{

-    REQUEST(xXDGAOpenFramebufferReq);

-    xXDGAOpenFramebufferReply rep;

-    char *deviceName;

-    int nameSize;

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    if (!DGAAvailable(stuff->screen))

-        return DGAErrorBase + XF86DGANoDirectVideoMode;

-

-    REQUEST_SIZE_MATCH(xXDGAOpenFramebufferReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    if(!DGAOpenFramebuffer(stuff->screen, &deviceName,

-			(unsigned char**)(&rep.mem1),

-			(int*)&rep.size, (int*)&rep.offset, (int*)&rep.extra))

-    {

-	return BadAlloc;

-    }

-

-    nameSize = deviceName ? (strlen(deviceName) + 1) : 0;

-    rep.length = bytes_to_int32(nameSize);

-

-    WriteToClient(client, sizeof(xXDGAOpenFramebufferReply), (char *)&rep);

-    if(rep.length)

-	WriteToClient(client, nameSize, deviceName);

-

-    return Success;

-}

-

-

-static int

-ProcXDGACloseFramebuffer(ClientPtr client)

-{

-    REQUEST(xXDGACloseFramebufferReq);

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    if (!DGAAvailable(stuff->screen))

-        return DGAErrorBase + XF86DGANoDirectVideoMode;

-

-    REQUEST_SIZE_MATCH(xXDGACloseFramebufferReq);

-

-    DGACloseFramebuffer(stuff->screen);

-

-    return Success;

-}

-

-static int

-ProcXDGAQueryModes(ClientPtr client)

-{

-    int i, num, size;

-    REQUEST(xXDGAQueryModesReq);

-    xXDGAQueryModesReply rep;

-    xXDGAModeInfo info;

-    XDGAModePtr mode;

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    REQUEST_SIZE_MATCH(xXDGAQueryModesReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.number = 0;

-    rep.sequenceNumber = client->sequence;

-

-    if (!DGAAvailable(stuff->screen)) {

-	rep.number = 0;

-	rep.length = 0;

-	WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);

-	return Success;

-    }

-

-    if(!(num = DGAGetModes(stuff->screen))) {

-	WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);

-	return Success;

-    }

-

-    if(!(mode = (XDGAModePtr)malloc(num * sizeof(XDGAModeRec))))

-	return BadAlloc;

-

-    for(i = 0; i < num; i++)

-	DGAGetModeInfo(stuff->screen, mode + i, i + 1);

-

-    size = num * sz_xXDGAModeInfo;

-    for(i = 0; i < num; i++)

-	size += pad_to_int32(strlen(mode[i].name) + 1);  /* plus NULL */

-

-    rep.number = num;

-    rep.length = bytes_to_int32(size);

-

-    WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);

-

-    for(i = 0; i < num; i++) {

-	size = strlen(mode[i].name) + 1;

-

-	info.byte_order = mode[i].byteOrder;

-	info.depth = mode[i].depth;

-	info.num = mode[i].num;

-	info.bpp = mode[i].bitsPerPixel;

-	info.name_size = (size + 3) & ~3L;

-	info.vsync_num = mode[i].VSync_num;

-	info.vsync_den = mode[i].VSync_den;

-	info.flags = mode[i].flags;

-	info.image_width = mode[i].imageWidth;

-	info.image_height = mode[i].imageHeight;

-	info.pixmap_width = mode[i].pixmapWidth;

-	info.pixmap_height = mode[i].pixmapHeight;

-	info.bytes_per_scanline = mode[i].bytesPerScanline;

-	info.red_mask = mode[i].red_mask;

-	info.green_mask = mode[i].green_mask;

-	info.blue_mask = mode[i].blue_mask;

-	info.visual_class = mode[i].visualClass;

-	info.viewport_width = mode[i].viewportWidth;

-	info.viewport_height = mode[i].viewportHeight;

-	info.viewport_xstep = mode[i].xViewportStep;

-	info.viewport_ystep = mode[i].yViewportStep;

- 	info.viewport_xmax = mode[i].maxViewportX;

-	info.viewport_ymax = mode[i].maxViewportY;

-	info.viewport_flags = mode[i].viewportFlags;

-	info.reserved1 = mode[i].reserved1;

-	info.reserved2 = mode[i].reserved2;

-

-	WriteToClient(client, sz_xXDGAModeInfo, (char*)(&info));

-	WriteToClient(client, size, mode[i].name);

-    }

-

-    free(mode);

-

-    return Success;

-}

-

-

-static void

-DGAClientStateChange (

-    CallbackListPtr* pcbl,

-    pointer nulldata,

-    pointer calldata

-){

-    NewClientInfoRec* pci = (NewClientInfoRec*) calldata;

-    ClientPtr client = NULL;

-    int i;

-

-    for(i = 0; i < screenInfo.numScreens; i++) {

-	if(DGA_GETCLIENT(i) == pci->client) {

-	   client = pci->client;

-	   break;

-	}

-    }

-

-    if(client &&

-      ((client->clientState == ClientStateGone) ||

-       (client->clientState == ClientStateRetained))) {

-	XDGAModeRec mode;

-	PixmapPtr pPix;

-

-	DGA_SETCLIENT(i, NULL);

-	DGASelectInput(i, NULL, 0);

-	DGASetMode(i, 0, &mode, &pPix);

-

-	if(--DGACallbackRefCount == 0)

-	    DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL);

-    }

-}

-

-static int

-ProcXDGASetMode(ClientPtr client)

-{

-    REQUEST(xXDGASetModeReq);

-    xXDGASetModeReply rep;

-    XDGAModeRec mode;

-    xXDGAModeInfo info;

-    PixmapPtr pPix;

-    ClientPtr owner;

-    int size;

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-    owner = DGA_GETCLIENT(stuff->screen);

-

-    REQUEST_SIZE_MATCH(xXDGASetModeReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.offset = 0;

-    rep.flags = 0;

-    rep.sequenceNumber = client->sequence;

-

-    if (!DGAAvailable(stuff->screen))

-        return DGAErrorBase + XF86DGANoDirectVideoMode;

-

-    if(owner && owner != client)

-        return DGAErrorBase + XF86DGANoDirectVideoMode;

-

-    if(!stuff->mode) {

-	if(owner) {

-	  if(--DGACallbackRefCount == 0)

-	    DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL);

-	}

-	DGA_SETCLIENT(stuff->screen, NULL);

-	DGASelectInput(stuff->screen, NULL, 0);

-	DGASetMode(stuff->screen, 0, &mode, &pPix);

-	WriteToClient(client, sz_xXDGASetModeReply, (char*)&rep);

-	return Success;

-    }

-

-    if(Success != DGASetMode(stuff->screen, stuff->mode, &mode, &pPix))

-	return BadValue;

-

-    if(!owner) {

-	if(DGACallbackRefCount++ == 0)

-	   AddCallback (&ClientStateCallback, DGAClientStateChange, NULL);

-    }

-

-    DGA_SETCLIENT(stuff->screen, client);

-

-    if(pPix) {

-	if(AddResource(stuff->pid, RT_PIXMAP, (pointer)(pPix))) {

-	    pPix->drawable.id = (int)stuff->pid;

-	    rep.flags = DGA_PIXMAP_AVAILABLE;

-	}

-    }

-

-    size = strlen(mode.name) + 1;

-

-    info.byte_order = mode.byteOrder;

-    info.depth = mode.depth;

-    info.num = mode.num;

-    info.bpp = mode.bitsPerPixel;

-    info.name_size = (size + 3) & ~3L;

-    info.vsync_num = mode.VSync_num;

-    info.vsync_den = mode.VSync_den;

-    info.flags = mode.flags;

-    info.image_width = mode.imageWidth;

-    info.image_height = mode.imageHeight;

-    info.pixmap_width = mode.pixmapWidth;

-    info.pixmap_height = mode.pixmapHeight;

-    info.bytes_per_scanline = mode.bytesPerScanline;

-    info.red_mask = mode.red_mask;

-    info.green_mask = mode.green_mask;

-    info.blue_mask = mode.blue_mask;

-    info.visual_class = mode.visualClass;

-    info.viewport_width = mode.viewportWidth;

-    info.viewport_height = mode.viewportHeight;

-    info.viewport_xstep = mode.xViewportStep;

-    info.viewport_ystep = mode.yViewportStep;

-    info.viewport_xmax = mode.maxViewportX;

-    info.viewport_ymax = mode.maxViewportY;

-    info.viewport_flags = mode.viewportFlags;

-    info.reserved1 = mode.reserved1;

-    info.reserved2 = mode.reserved2;

-

-    rep.length = bytes_to_int32(sz_xXDGAModeInfo + info.name_size);

-

-    WriteToClient(client, sz_xXDGASetModeReply, (char*)&rep);

-    WriteToClient(client, sz_xXDGAModeInfo, (char*)(&info));

-    WriteToClient(client, size, mode.name);

-

-    return Success;

-}

-

-static int

-ProcXDGASetViewport(ClientPtr client)

-{

-    REQUEST(xXDGASetViewportReq);

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    if(DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXDGASetViewportReq);

-

-    DGASetViewport(stuff->screen, stuff->x, stuff->y, stuff->flags);

-

-    return Success;

-}

-

-static int

-ProcXDGAInstallColormap(ClientPtr client)

-{

-    ColormapPtr cmap;

-    int rc;

-    REQUEST(xXDGAInstallColormapReq);

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    if(DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXDGAInstallColormapReq);

-

-    rc = dixLookupResourceByType((pointer *)&cmap, stuff->cmap, RT_COLORMAP,

-				 client, DixInstallAccess);

-    if (rc != Success)

-        return rc;

-    DGAInstallCmap(cmap);

-    return Success;

-}

-

-

-static int

-ProcXDGASelectInput(ClientPtr client)

-{

-    REQUEST(xXDGASelectInputReq);

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    if(DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXDGASelectInputReq);

-

-    if(DGA_GETCLIENT(stuff->screen) == client)

-	DGASelectInput(stuff->screen, client, stuff->mask);

-

-    return Success;

-}

-

-

-static int

-ProcXDGAFillRectangle(ClientPtr client)

-{

-    REQUEST(xXDGAFillRectangleReq);

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    if(DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXDGAFillRectangleReq);

-

-    if(Success != DGAFillRect(stuff->screen, stuff->x, stuff->y,

-			stuff->width, stuff->height, stuff->color))

-	return BadMatch;

-

-    return Success;

-}

-

-static int

-ProcXDGACopyArea(ClientPtr client)

-{

-    REQUEST(xXDGACopyAreaReq);

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    if(DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXDGACopyAreaReq);

-

-    if(Success != DGABlitRect(stuff->screen, stuff->srcx, stuff->srcy,

-		stuff->width, stuff->height, stuff->dstx, stuff->dsty))

-	return BadMatch;

-

-    return Success;

-}

-

-

-static int

-ProcXDGACopyTransparentArea(ClientPtr client)

-{

-    REQUEST(xXDGACopyTransparentAreaReq);

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    if(DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXDGACopyTransparentAreaReq);

-

-    if(Success != DGABlitTransRect(stuff->screen, stuff->srcx, stuff->srcy,

-	stuff->width, stuff->height, stuff->dstx, stuff->dsty, stuff->key))

-	return BadMatch;

-

-    return Success;

-}

-

-

-static int

-ProcXDGAGetViewportStatus(ClientPtr client)

-{

-    REQUEST(xXDGAGetViewportStatusReq);

-    xXDGAGetViewportStatusReply rep;

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    if(DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXDGAGetViewportStatusReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    rep.status = DGAGetViewportStatus(stuff->screen);

-

-    WriteToClient(client, sizeof(xXDGAGetViewportStatusReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcXDGASync(ClientPtr client)

-{

-    REQUEST(xXDGASyncReq);

-    xXDGASyncReply rep;

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    if(DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXDGASyncReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    DGASync(stuff->screen);

-

-    WriteToClient(client, sizeof(xXDGASyncReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcXDGASetClientVersion(ClientPtr client)

-{

-    REQUEST(xXDGASetClientVersionReq);

-

-    DGAPrivPtr pPriv;

-

-    REQUEST_SIZE_MATCH(xXDGASetClientVersionReq);

-    if ((pPriv = DGA_GETPRIV(client)) == NULL) {

-	pPriv = malloc(sizeof(DGAPrivRec));

-	/* XXX Need to look into freeing this */

-	if (!pPriv)

-	    return BadAlloc;

-	DGA_SETPRIV(client, pPriv);

-    }

-    pPriv->major = stuff->major;

-    pPriv->minor = stuff->minor;

-

-    return Success;

-}

-

-static int

-ProcXDGAChangePixmapMode(ClientPtr client)

-{

-    REQUEST(xXDGAChangePixmapModeReq);

-    xXDGAChangePixmapModeReply rep;

-    int x, y;

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    if(DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXDGAChangePixmapModeReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    x = stuff->x;

-    y = stuff->y;

-

-    if(!DGAChangePixmapMode(stuff->screen, &x, &y, stuff->flags))

-	return BadMatch;

-

-    rep.x = x;

-    rep.y = y;

-    WriteToClient(client, sizeof(xXDGAChangePixmapModeReply), (char *)&rep);

-

-    return Success;

-}

-

-

-static int

-ProcXDGACreateColormap(ClientPtr client)

-{

-    REQUEST(xXDGACreateColormapReq);

-    int result;

-

-    if (stuff->screen >= screenInfo.numScreens)

-        return BadValue;

-

-    if(DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXDGACreateColormapReq);

-

-    if(!stuff->mode)

-	return BadValue;

-

-    result = DGACreateColormap(stuff->screen, client, stuff->id,

-				stuff->mode, stuff->alloc);

-    if(result != Success)

-	return result;

-

-    return Success;

-}

-

-/*

- *

- * Support for the old DGA protocol, used to live in xf86dga.c

- *

- */

-

-#ifdef DGA_PROTOCOL_OLD_SUPPORT

-

-

-

-static int

-ProcXF86DGAGetVideoLL(ClientPtr client)

-{

-    REQUEST(xXF86DGAGetVideoLLReq);

-    xXF86DGAGetVideoLLReply rep;

-    XDGAModeRec mode;

-    int num, offset, flags;

-    char *name;

-

-    if (stuff->screen >= screenInfo.numScreens)

-	return BadValue;

-

-    REQUEST_SIZE_MATCH(xXF86DGAGetVideoLLReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    if(!DGAAvailable(stuff->screen))

-	return DGAErrorBase + XF86DGANoDirectVideoMode;

-

-    if(!(num = DGAGetOldDGAMode(stuff->screen)))

-	return DGAErrorBase + XF86DGANoDirectVideoMode;

-

-    /* get the parameters for the mode that best matches */

-    DGAGetModeInfo(stuff->screen, &mode, num);

-

-    if(!DGAOpenFramebuffer(stuff->screen, &name,

-			(unsigned char**)(&rep.offset),

-			(int*)(&rep.bank_size), &offset, &flags))

-	return BadAlloc;

-

-    rep.offset += mode.offset;

-    rep.width = mode.bytesPerScanline / (mode.bitsPerPixel >> 3);

-    rep.ram_size = rep.bank_size >> 10;

-

-    WriteToClient(client, SIZEOF(xXF86DGAGetVideoLLReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcXF86DGADirectVideo(ClientPtr client)

-{

-    int num;

-    PixmapPtr pix;

-    XDGAModeRec mode;

-    ClientPtr owner;

-    REQUEST(xXF86DGADirectVideoReq);

-

-    if (stuff->screen >= screenInfo.numScreens)

-	return BadValue;

-    REQUEST_SIZE_MATCH(xXF86DGADirectVideoReq);

-

-    if (!DGAAvailable(stuff->screen))

-	return DGAErrorBase + XF86DGANoDirectVideoMode;

-

-    owner = DGA_GETCLIENT(stuff->screen);

-

-    if (owner && owner != client)

-        return DGAErrorBase + XF86DGANoDirectVideoMode;

-

-    if (stuff->enable & XF86DGADirectGraphics) {

-	if(!(num = DGAGetOldDGAMode(stuff->screen)))

-	    return DGAErrorBase + XF86DGANoDirectVideoMode;

-    } else

-	num = 0;

-

-    if(Success != DGASetMode(stuff->screen, num, &mode, &pix))

-	return DGAErrorBase + XF86DGAScreenNotActive;

-

-    DGASetInputMode (stuff->screen,

-		     (stuff->enable & XF86DGADirectKeyb) != 0,

-		     (stuff->enable & XF86DGADirectMouse) != 0);

-

-    /* We need to track the client and attach the teardown callback */

-    if (stuff->enable &

-	(XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse)) {

-	if (!owner) {

-	    if (DGACallbackRefCount++ == 0)

-		AddCallback (&ClientStateCallback, DGAClientStateChange, NULL);

-	}

-

-	DGA_SETCLIENT(stuff->screen, client);

-    } else {

-	if (owner) {

-	    if (--DGACallbackRefCount == 0)

-		DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL);

-	}

-

-	DGA_SETCLIENT(stuff->screen, NULL);

-    }

-

-    return Success;

-}

-

-static int

-ProcXF86DGAGetViewPortSize(ClientPtr client)

-{

-    int num;

-    XDGAModeRec mode;

-    REQUEST(xXF86DGAGetViewPortSizeReq);

-    xXF86DGAGetViewPortSizeReply rep;

-

-    if (stuff->screen >= screenInfo.numScreens)

-	return BadValue;

-

-    REQUEST_SIZE_MATCH(xXF86DGAGetViewPortSizeReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    if (!DGAAvailable(stuff->screen))

-	return DGAErrorBase + XF86DGANoDirectVideoMode;

-

-    if(!(num = DGAGetOldDGAMode(stuff->screen)))

-	return DGAErrorBase + XF86DGANoDirectVideoMode;

-

-    DGAGetModeInfo(stuff->screen, &mode, num);

-

-    rep.width = mode.viewportWidth;

-    rep.height = mode.viewportHeight;

-

-    WriteToClient(client, SIZEOF(xXF86DGAGetViewPortSizeReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcXF86DGASetViewPort(ClientPtr client)

-{

-    REQUEST(xXF86DGASetViewPortReq);

-

-    if (stuff->screen >= screenInfo.numScreens)

-	return BadValue;

-

-    if (DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXF86DGASetViewPortReq);

-

-    if (!DGAAvailable(stuff->screen))

-	return DGAErrorBase + XF86DGANoDirectVideoMode;

-

-    if (!DGAActive(stuff->screen))

-	return DGAErrorBase + XF86DGADirectNotActivated;

-

-    if (DGASetViewport(stuff->screen, stuff->x, stuff->y, DGA_FLIP_RETRACE)

-		!= Success)

-	return DGAErrorBase + XF86DGADirectNotActivated;

-

-    return Success;

-}

-

-static int

-ProcXF86DGAGetVidPage(ClientPtr client)

-{

-    REQUEST(xXF86DGAGetVidPageReq);

-    xXF86DGAGetVidPageReply rep;

-

-    if (stuff->screen >= screenInfo.numScreens)

-	return BadValue;

-

-    REQUEST_SIZE_MATCH(xXF86DGAGetVidPageReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.vpage = 0;  /* silently fail */

-

-    WriteToClient(client, SIZEOF(xXF86DGAGetVidPageReply), (char *)&rep);

-    return Success;

-}

-

-

-static int

-ProcXF86DGASetVidPage(ClientPtr client)

-{

-    REQUEST(xXF86DGASetVidPageReq);

-

-    if (stuff->screen >= screenInfo.numScreens)

-	return BadValue;

-

-    REQUEST_SIZE_MATCH(xXF86DGASetVidPageReq);

-

-    /* silently fail */

-

-    return Success;

-}

-

-

-static int

-ProcXF86DGAInstallColormap(ClientPtr client)

-{

-    ColormapPtr pcmp;

-    int rc;

-    REQUEST(xXF86DGAInstallColormapReq);

-

-    if (stuff->screen >= screenInfo.numScreens)

-	return BadValue;

-

-    if (DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXF86DGAInstallColormapReq);

-

-    if (!DGAActive(stuff->screen))

-	return DGAErrorBase + XF86DGADirectNotActivated;

-

-    rc = dixLookupResourceByType((pointer *)&pcmp, stuff->id, RT_COLORMAP,

-				 client, DixInstallAccess);

-    if (rc == Success) {

-	DGAInstallCmap(pcmp);

-        return Success;

-    } else {

-        return rc;

-    }

-}

-

-static int

-ProcXF86DGAQueryDirectVideo(ClientPtr client)

-{

-    REQUEST(xXF86DGAQueryDirectVideoReq);

-    xXF86DGAQueryDirectVideoReply rep;

-

-    if (stuff->screen >= screenInfo.numScreens)

-	return BadValue;

-

-    REQUEST_SIZE_MATCH(xXF86DGAQueryDirectVideoReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.flags = 0;

-

-    if (DGAAvailable(stuff->screen))

-	rep.flags = XF86DGADirectPresent;

-

-    WriteToClient(client, SIZEOF(xXF86DGAQueryDirectVideoReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcXF86DGAViewPortChanged(ClientPtr client)

-{

-    REQUEST(xXF86DGAViewPortChangedReq);

-    xXF86DGAViewPortChangedReply rep;

-

-    if (stuff->screen >= screenInfo.numScreens)

-	return BadValue;

-

-    if (DGA_GETCLIENT(stuff->screen) != client)

-        return DGAErrorBase + XF86DGADirectNotActivated;

-

-    REQUEST_SIZE_MATCH(xXF86DGAViewPortChangedReq);

-

-    if (!DGAActive(stuff->screen))

-	return DGAErrorBase + XF86DGADirectNotActivated;

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.result = 1;

-

-    WriteToClient(client, SIZEOF(xXF86DGAViewPortChangedReply), (char *)&rep);

-    return Success;

-}

-

-#endif /* DGA_PROTOCOL_OLD_SUPPORT */

-

-static int

-SProcXDGADispatch (ClientPtr client)

-{

-   return DGAErrorBase + XF86DGAClientNotLocal;

-}

-

-#if 0

-#define DGA_REQ_DEBUG

-#endif

-

-#ifdef DGA_REQ_DEBUG

-static char *dgaMinor[] = {

-    "QueryVersion",

-    "GetVideoLL",

-    "DirectVideo",

-    "GetViewPortSize",

-    "SetViewPort",

-    "GetVidPage",

-    "SetVidPage",

-    "InstallColormap",

-    "QueryDirectVideo",

-    "ViewPortChanged",

-    "10",

-    "11",

-    "QueryModes",

-    "SetMode",

-    "SetViewport",

-    "InstallColormap",

-    "SelectInput",

-    "FillRectangle",

-    "CopyArea",

-    "CopyTransparentArea",

-    "GetViewportStatus",

-    "Sync",

-    "OpenFramebuffer",

-    "CloseFramebuffer",

-    "SetClientVersion",

-    "ChangePixmapMode",

-    "CreateColormap",

-};

-#endif

-

-static int

-ProcXDGADispatch (ClientPtr client)

-{

-    REQUEST(xReq);

-

-    if (!LocalClient(client))

-	return DGAErrorBase + XF86DGAClientNotLocal;

-

-#ifdef DGA_REQ_DEBUG

-    if (stuff->data <= X_XDGACreateColormap)

-	fprintf (stderr, "    DGA %s\n", dgaMinor[stuff->data]);

-#endif

-

-    switch (stuff->data){

-    /*

-     * DGA2 Protocol

-     */

-    case X_XDGAQueryVersion:

-	return ProcXDGAQueryVersion(client);

-    case X_XDGAQueryModes:

-	return ProcXDGAQueryModes(client);

-    case X_XDGASetMode:

-	return ProcXDGASetMode(client);

-    case X_XDGAOpenFramebuffer:

-	return ProcXDGAOpenFramebuffer(client);

-    case X_XDGACloseFramebuffer:

-	return ProcXDGACloseFramebuffer(client);

-    case X_XDGASetViewport:

-	return ProcXDGASetViewport(client);

-    case X_XDGAInstallColormap:

-	return ProcXDGAInstallColormap(client);

-    case X_XDGASelectInput:

-	return ProcXDGASelectInput(client);

-    case X_XDGAFillRectangle:

-	return ProcXDGAFillRectangle(client);

-    case X_XDGACopyArea:

-	return ProcXDGACopyArea(client);

-    case X_XDGACopyTransparentArea:

-	return ProcXDGACopyTransparentArea(client);

-    case X_XDGAGetViewportStatus:

-	return ProcXDGAGetViewportStatus(client);

-    case X_XDGASync:

-	return ProcXDGASync(client);

-    case X_XDGASetClientVersion:

-	return ProcXDGASetClientVersion(client);

-    case X_XDGAChangePixmapMode:

-	return ProcXDGAChangePixmapMode(client);

-    case X_XDGACreateColormap:

-	return ProcXDGACreateColormap(client);

-    /*

-     * Old DGA Protocol

-     */

-#ifdef DGA_PROTOCOL_OLD_SUPPORT

-    case X_XF86DGAGetVideoLL:

-	return ProcXF86DGAGetVideoLL(client);

-    case X_XF86DGADirectVideo:

-	return ProcXF86DGADirectVideo(client);

-    case X_XF86DGAGetViewPortSize:

-	return ProcXF86DGAGetViewPortSize(client);

-    case X_XF86DGASetViewPort:

-	return ProcXF86DGASetViewPort(client);

-    case X_XF86DGAGetVidPage:

-	return ProcXF86DGAGetVidPage(client);

-    case X_XF86DGASetVidPage:

-	return ProcXF86DGASetVidPage(client);

-    case X_XF86DGAInstallColormap:

-	return ProcXF86DGAInstallColormap(client);

-    case X_XF86DGAQueryDirectVideo:

-	return ProcXF86DGAQueryDirectVideo(client);

-    case X_XF86DGAViewPortChanged:

-	return ProcXF86DGAViewPortChanged(client);

-#endif /* DGA_PROTOCOL_OLD_SUPPORT */

-    default:

-	return BadRequest;

-    }

-}

-

-void

-XFree86DGARegister(INITARGS)

-{

-  XDGAEventBase = &DGAEventBase;

-}

-

-void

-XFree86DGAExtensionInit(INITARGS)

-{

-    ExtensionEntry* extEntry;

-

-    if (!dixRegisterPrivateKey(&DGAClientPrivateKeyRec, PRIVATE_CLIENT, 0))

-	return;

-

-    if (!dixRegisterPrivateKey(&DGAScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

-	return;

-

-    if ((extEntry = AddExtension(XF86DGANAME,

-				XF86DGANumberEvents,

-				XF86DGANumberErrors,

-				ProcXDGADispatch,

-				SProcXDGADispatch,

-				XDGAResetProc,

-				StandardMinorOpcode))) {

-	int i;

-

-	DGAReqCode = (unsigned char)extEntry->base;

-	DGAErrorBase = extEntry->errorBase;

-	DGAEventBase = extEntry->eventBase;

-	for (i = KeyPress; i <= MotionNotify; i++)

-	    SetCriticalEvent (DGAEventBase + i);

-    }

-}

+/*
+ * Copyright (c) 1995  Jon Tombs
+ * Copyright (c) 1995, 1996, 1999  XFree86 Inc
+ * Copyright (c) 1999 - The XFree86 Project Inc.
+ *
+ * Written by Mark Vojkovich
+ */
+
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "misc.h"
+#include "dixstruct.h"
+#include "dixevents.h"
+#include "pixmapstr.h"
+#include "extnsionst.h"
+#include "colormapst.h"
+#include "cursorstr.h"
+#include "scrnintstr.h"
+#include "servermd.h"
+#include <X11/extensions/xf86dgaproto.h>
+#include "swaprep.h"
+#include "dgaproc.h"
+#include "protocol-versions.h"
+
+#include <string.h>
+
+#include "modinit.h"
+
+#define DGA_PROTOCOL_OLD_SUPPORT 1
+
+
+static void XDGAResetProc(ExtensionEntry *extEntry);
+
+static void DGAClientStateChange (CallbackListPtr*, pointer, pointer);
+
+unsigned char DGAReqCode = 0;
+int DGAErrorBase;
+int DGAEventBase;
+
+static DevPrivateKeyRec DGAScreenPrivateKeyRec;
+#define DGAScreenPrivateKey (&DGAScreenPrivateKeyRec)
+#define DGAScreenPrivateKeyRegistered (DGAScreenPrivateKeyRec.initialized)
+static DevPrivateKeyRec DGAClientPrivateKeyRec;
+#define DGAClientPrivateKey (&DGAClientPrivateKeyRec)
+static int DGACallbackRefCount = 0;
+
+/* This holds the client's version information */
+typedef struct {
+    int		major;
+    int		minor;
+} DGAPrivRec, *DGAPrivPtr;
+
+#define DGA_GETCLIENT(idx) ((ClientPtr) \
+    dixLookupPrivate(&screenInfo.screens[idx]->devPrivates, DGAScreenPrivateKey))
+#define DGA_SETCLIENT(idx,p) \
+    dixSetPrivate(&screenInfo.screens[idx]->devPrivates, DGAScreenPrivateKey, p)
+
+#define DGA_GETPRIV(c) ((DGAPrivPtr) \
+    dixLookupPrivate(&(c)->devPrivates, DGAClientPrivateKey))
+#define DGA_SETPRIV(c,p) \
+    dixSetPrivate(&(c)->devPrivates, DGAClientPrivateKey, p)
+
+
+static void
+XDGAResetProc (ExtensionEntry *extEntry)
+{
+   DeleteCallback (&ClientStateCallback, DGAClientStateChange, NULL);
+   DGACallbackRefCount = 0;
+}
+
+
+static int
+ProcXDGAQueryVersion(ClientPtr client)
+{
+    xXDGAQueryVersionReply rep;
+
+    REQUEST_SIZE_MATCH(xXDGAQueryVersionReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.majorVersion = SERVER_XDGA_MAJOR_VERSION;
+    rep.minorVersion = SERVER_XDGA_MINOR_VERSION;
+
+    WriteToClient(client, sizeof(xXDGAQueryVersionReply), (char *)&rep);
+    return Success;
+}
+
+
+static int
+ProcXDGAOpenFramebuffer(ClientPtr client)
+{
+    REQUEST(xXDGAOpenFramebufferReq);
+    xXDGAOpenFramebufferReply rep;
+    char *deviceName;
+    int nameSize;
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    if (!DGAAvailable(stuff->screen))
+        return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    REQUEST_SIZE_MATCH(xXDGAOpenFramebufferReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    if(!DGAOpenFramebuffer(stuff->screen, &deviceName,
+			(unsigned char**)(&rep.mem1),
+			(int*)&rep.size, (int*)&rep.offset, (int*)&rep.extra))
+    {
+	return BadAlloc;
+    }
+
+    nameSize = deviceName ? (strlen(deviceName) + 1) : 0;
+    rep.length = bytes_to_int32(nameSize);
+
+    WriteToClient(client, sizeof(xXDGAOpenFramebufferReply), (char *)&rep);
+    if(rep.length)
+	WriteToClient(client, nameSize, deviceName);
+
+    return Success;
+}
+
+
+static int
+ProcXDGACloseFramebuffer(ClientPtr client)
+{
+    REQUEST(xXDGACloseFramebufferReq);
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    if (!DGAAvailable(stuff->screen))
+        return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    REQUEST_SIZE_MATCH(xXDGACloseFramebufferReq);
+
+    DGACloseFramebuffer(stuff->screen);
+
+    return Success;
+}
+
+static int
+ProcXDGAQueryModes(ClientPtr client)
+{
+    int i, num, size;
+    REQUEST(xXDGAQueryModesReq);
+    xXDGAQueryModesReply rep;
+    xXDGAModeInfo info;
+    XDGAModePtr mode;
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    REQUEST_SIZE_MATCH(xXDGAQueryModesReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.number = 0;
+    rep.sequenceNumber = client->sequence;
+
+    if (!DGAAvailable(stuff->screen)) {
+	rep.number = 0;
+	rep.length = 0;
+	WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);
+	return Success;
+    }
+
+    if(!(num = DGAGetModes(stuff->screen))) {
+	WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);
+	return Success;
+    }
+
+    if(!(mode = (XDGAModePtr)malloc(num * sizeof(XDGAModeRec))))
+	return BadAlloc;
+
+    for(i = 0; i < num; i++)
+	DGAGetModeInfo(stuff->screen, mode + i, i + 1);
+
+    size = num * sz_xXDGAModeInfo;
+    for(i = 0; i < num; i++)
+	size += pad_to_int32(strlen(mode[i].name) + 1);  /* plus NULL */
+
+    rep.number = num;
+    rep.length = bytes_to_int32(size);
+
+    WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep);
+
+    for(i = 0; i < num; i++) {
+	size = strlen(mode[i].name) + 1;
+
+	info.byte_order = mode[i].byteOrder;
+	info.depth = mode[i].depth;
+	info.num = mode[i].num;
+	info.bpp = mode[i].bitsPerPixel;
+	info.name_size = (size + 3) & ~3L;
+	info.vsync_num = mode[i].VSync_num;
+	info.vsync_den = mode[i].VSync_den;
+	info.flags = mode[i].flags;
+	info.image_width = mode[i].imageWidth;
+	info.image_height = mode[i].imageHeight;
+	info.pixmap_width = mode[i].pixmapWidth;
+	info.pixmap_height = mode[i].pixmapHeight;
+	info.bytes_per_scanline = mode[i].bytesPerScanline;
+	info.red_mask = mode[i].red_mask;
+	info.green_mask = mode[i].green_mask;
+	info.blue_mask = mode[i].blue_mask;
+	info.visual_class = mode[i].visualClass;
+	info.viewport_width = mode[i].viewportWidth;
+	info.viewport_height = mode[i].viewportHeight;
+	info.viewport_xstep = mode[i].xViewportStep;
+	info.viewport_ystep = mode[i].yViewportStep;
+ 	info.viewport_xmax = mode[i].maxViewportX;
+	info.viewport_ymax = mode[i].maxViewportY;
+	info.viewport_flags = mode[i].viewportFlags;
+	info.reserved1 = mode[i].reserved1;
+	info.reserved2 = mode[i].reserved2;
+
+	WriteToClient(client, sz_xXDGAModeInfo, (char*)(&info));
+	WriteToClient(client, size, mode[i].name);
+    }
+
+    free(mode);
+
+    return Success;
+}
+
+
+static void
+DGAClientStateChange (
+    CallbackListPtr* pcbl,
+    pointer nulldata,
+    pointer calldata
+){
+    NewClientInfoRec* pci = (NewClientInfoRec*) calldata;
+    ClientPtr client = NULL;
+    int i;
+
+    for(i = 0; i < screenInfo.numScreens; i++) {
+	if(DGA_GETCLIENT(i) == pci->client) {
+	   client = pci->client;
+	   break;
+	}
+    }
+
+    if(client &&
+      ((client->clientState == ClientStateGone) ||
+       (client->clientState == ClientStateRetained))) {
+	XDGAModeRec mode;
+	PixmapPtr pPix;
+
+	DGA_SETCLIENT(i, NULL);
+	DGASelectInput(i, NULL, 0);
+	DGASetMode(i, 0, &mode, &pPix);
+
+	if(--DGACallbackRefCount == 0)
+	    DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL);
+    }
+}
+
+static int
+ProcXDGASetMode(ClientPtr client)
+{
+    REQUEST(xXDGASetModeReq);
+    xXDGASetModeReply rep;
+    XDGAModeRec mode;
+    xXDGAModeInfo info;
+    PixmapPtr pPix;
+    ClientPtr owner;
+    int size;
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+    owner = DGA_GETCLIENT(stuff->screen);
+
+    REQUEST_SIZE_MATCH(xXDGASetModeReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.offset = 0;
+    rep.flags = 0;
+    rep.sequenceNumber = client->sequence;
+
+    if (!DGAAvailable(stuff->screen))
+        return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    if(owner && owner != client)
+        return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    if(!stuff->mode) {
+	if(owner) {
+	  if(--DGACallbackRefCount == 0)
+	    DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL);
+	}
+	DGA_SETCLIENT(stuff->screen, NULL);
+	DGASelectInput(stuff->screen, NULL, 0);
+	DGASetMode(stuff->screen, 0, &mode, &pPix);
+	WriteToClient(client, sz_xXDGASetModeReply, (char*)&rep);
+	return Success;
+    }
+
+    if(Success != DGASetMode(stuff->screen, stuff->mode, &mode, &pPix))
+	return BadValue;
+
+    if(!owner) {
+	if(DGACallbackRefCount++ == 0)
+	   AddCallback (&ClientStateCallback, DGAClientStateChange, NULL);
+    }
+
+    DGA_SETCLIENT(stuff->screen, client);
+
+    if(pPix) {
+	if(AddResource(stuff->pid, RT_PIXMAP, (pointer)(pPix))) {
+	    pPix->drawable.id = (int)stuff->pid;
+	    rep.flags = DGA_PIXMAP_AVAILABLE;
+	}
+    }
+
+    size = strlen(mode.name) + 1;
+
+    info.byte_order = mode.byteOrder;
+    info.depth = mode.depth;
+    info.num = mode.num;
+    info.bpp = mode.bitsPerPixel;
+    info.name_size = (size + 3) & ~3L;
+    info.vsync_num = mode.VSync_num;
+    info.vsync_den = mode.VSync_den;
+    info.flags = mode.flags;
+    info.image_width = mode.imageWidth;
+    info.image_height = mode.imageHeight;
+    info.pixmap_width = mode.pixmapWidth;
+    info.pixmap_height = mode.pixmapHeight;
+    info.bytes_per_scanline = mode.bytesPerScanline;
+    info.red_mask = mode.red_mask;
+    info.green_mask = mode.green_mask;
+    info.blue_mask = mode.blue_mask;
+    info.visual_class = mode.visualClass;
+    info.viewport_width = mode.viewportWidth;
+    info.viewport_height = mode.viewportHeight;
+    info.viewport_xstep = mode.xViewportStep;
+    info.viewport_ystep = mode.yViewportStep;
+    info.viewport_xmax = mode.maxViewportX;
+    info.viewport_ymax = mode.maxViewportY;
+    info.viewport_flags = mode.viewportFlags;
+    info.reserved1 = mode.reserved1;
+    info.reserved2 = mode.reserved2;
+
+    rep.length = bytes_to_int32(sz_xXDGAModeInfo + info.name_size);
+
+    WriteToClient(client, sz_xXDGASetModeReply, (char*)&rep);
+    WriteToClient(client, sz_xXDGAModeInfo, (char*)(&info));
+    WriteToClient(client, size, mode.name);
+
+    return Success;
+}
+
+static int
+ProcXDGASetViewport(ClientPtr client)
+{
+    REQUEST(xXDGASetViewportReq);
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    if(DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXDGASetViewportReq);
+
+    DGASetViewport(stuff->screen, stuff->x, stuff->y, stuff->flags);
+
+    return Success;
+}
+
+static int
+ProcXDGAInstallColormap(ClientPtr client)
+{
+    ColormapPtr cmap;
+    int rc;
+    REQUEST(xXDGAInstallColormapReq);
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    if(DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXDGAInstallColormapReq);
+
+    rc = dixLookupResourceByType((pointer *)&cmap, stuff->cmap, RT_COLORMAP,
+				 client, DixInstallAccess);
+    if (rc != Success)
+        return rc;
+    DGAInstallCmap(cmap);
+    return Success;
+}
+
+
+static int
+ProcXDGASelectInput(ClientPtr client)
+{
+    REQUEST(xXDGASelectInputReq);
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    if(DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXDGASelectInputReq);
+
+    if(DGA_GETCLIENT(stuff->screen) == client)
+	DGASelectInput(stuff->screen, client, stuff->mask);
+
+    return Success;
+}
+
+
+static int
+ProcXDGAFillRectangle(ClientPtr client)
+{
+    REQUEST(xXDGAFillRectangleReq);
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    if(DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXDGAFillRectangleReq);
+
+    if(Success != DGAFillRect(stuff->screen, stuff->x, stuff->y,
+			stuff->width, stuff->height, stuff->color))
+	return BadMatch;
+
+    return Success;
+}
+
+static int
+ProcXDGACopyArea(ClientPtr client)
+{
+    REQUEST(xXDGACopyAreaReq);
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    if(DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXDGACopyAreaReq);
+
+    if(Success != DGABlitRect(stuff->screen, stuff->srcx, stuff->srcy,
+		stuff->width, stuff->height, stuff->dstx, stuff->dsty))
+	return BadMatch;
+
+    return Success;
+}
+
+
+static int
+ProcXDGACopyTransparentArea(ClientPtr client)
+{
+    REQUEST(xXDGACopyTransparentAreaReq);
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    if(DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXDGACopyTransparentAreaReq);
+
+    if(Success != DGABlitTransRect(stuff->screen, stuff->srcx, stuff->srcy,
+	stuff->width, stuff->height, stuff->dstx, stuff->dsty, stuff->key))
+	return BadMatch;
+
+    return Success;
+}
+
+
+static int
+ProcXDGAGetViewportStatus(ClientPtr client)
+{
+    REQUEST(xXDGAGetViewportStatusReq);
+    xXDGAGetViewportStatusReply rep;
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    if(DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXDGAGetViewportStatusReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    rep.status = DGAGetViewportStatus(stuff->screen);
+
+    WriteToClient(client, sizeof(xXDGAGetViewportStatusReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcXDGASync(ClientPtr client)
+{
+    REQUEST(xXDGASyncReq);
+    xXDGASyncReply rep;
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    if(DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXDGASyncReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    DGASync(stuff->screen);
+
+    WriteToClient(client, sizeof(xXDGASyncReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcXDGASetClientVersion(ClientPtr client)
+{
+    REQUEST(xXDGASetClientVersionReq);
+
+    DGAPrivPtr pPriv;
+
+    REQUEST_SIZE_MATCH(xXDGASetClientVersionReq);
+    if ((pPriv = DGA_GETPRIV(client)) == NULL) {
+	pPriv = malloc(sizeof(DGAPrivRec));
+	/* XXX Need to look into freeing this */
+	if (!pPriv)
+	    return BadAlloc;
+	DGA_SETPRIV(client, pPriv);
+    }
+    pPriv->major = stuff->major;
+    pPriv->minor = stuff->minor;
+
+    return Success;
+}
+
+static int
+ProcXDGAChangePixmapMode(ClientPtr client)
+{
+    REQUEST(xXDGAChangePixmapModeReq);
+    xXDGAChangePixmapModeReply rep;
+    int x, y;
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    if(DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXDGAChangePixmapModeReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    x = stuff->x;
+    y = stuff->y;
+
+    if(!DGAChangePixmapMode(stuff->screen, &x, &y, stuff->flags))
+	return BadMatch;
+
+    rep.x = x;
+    rep.y = y;
+    WriteToClient(client, sizeof(xXDGAChangePixmapModeReply), (char *)&rep);
+
+    return Success;
+}
+
+
+static int
+ProcXDGACreateColormap(ClientPtr client)
+{
+    REQUEST(xXDGACreateColormapReq);
+    int result;
+
+    if (stuff->screen >= screenInfo.numScreens)
+        return BadValue;
+
+    if(DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXDGACreateColormapReq);
+
+    if(!stuff->mode)
+	return BadValue;
+
+    result = DGACreateColormap(stuff->screen, client, stuff->id,
+				stuff->mode, stuff->alloc);
+    if(result != Success)
+	return result;
+
+    return Success;
+}
+
+/*
+ *
+ * Support for the old DGA protocol, used to live in xf86dga.c
+ *
+ */
+
+#ifdef DGA_PROTOCOL_OLD_SUPPORT
+
+
+
+static int
+ProcXF86DGAGetVideoLL(ClientPtr client)
+{
+    REQUEST(xXF86DGAGetVideoLLReq);
+    xXF86DGAGetVideoLLReply rep;
+    XDGAModeRec mode;
+    int num, offset, flags;
+    char *name;
+
+    if (stuff->screen >= screenInfo.numScreens)
+	return BadValue;
+
+    REQUEST_SIZE_MATCH(xXF86DGAGetVideoLLReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    if(!DGAAvailable(stuff->screen))
+	return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    if(!(num = DGAGetOldDGAMode(stuff->screen)))
+	return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    /* get the parameters for the mode that best matches */
+    DGAGetModeInfo(stuff->screen, &mode, num);
+
+    if(!DGAOpenFramebuffer(stuff->screen, &name,
+			(unsigned char**)(&rep.offset),
+			(int*)(&rep.bank_size), &offset, &flags))
+	return BadAlloc;
+
+    rep.offset += mode.offset;
+    rep.width = mode.bytesPerScanline / (mode.bitsPerPixel >> 3);
+    rep.ram_size = rep.bank_size >> 10;
+
+    WriteToClient(client, SIZEOF(xXF86DGAGetVideoLLReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcXF86DGADirectVideo(ClientPtr client)
+{
+    int num;
+    PixmapPtr pix;
+    XDGAModeRec mode;
+    ClientPtr owner;
+    REQUEST(xXF86DGADirectVideoReq);
+
+    if (stuff->screen >= screenInfo.numScreens)
+	return BadValue;
+    REQUEST_SIZE_MATCH(xXF86DGADirectVideoReq);
+
+    if (!DGAAvailable(stuff->screen))
+	return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    owner = DGA_GETCLIENT(stuff->screen);
+
+    if (owner && owner != client)
+        return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    if (stuff->enable & XF86DGADirectGraphics) {
+	if(!(num = DGAGetOldDGAMode(stuff->screen)))
+	    return DGAErrorBase + XF86DGANoDirectVideoMode;
+    } else
+	num = 0;
+
+    if(Success != DGASetMode(stuff->screen, num, &mode, &pix))
+	return DGAErrorBase + XF86DGAScreenNotActive;
+
+    DGASetInputMode (stuff->screen,
+		     (stuff->enable & XF86DGADirectKeyb) != 0,
+		     (stuff->enable & XF86DGADirectMouse) != 0);
+
+    /* We need to track the client and attach the teardown callback */
+    if (stuff->enable &
+	(XF86DGADirectGraphics | XF86DGADirectKeyb | XF86DGADirectMouse)) {
+	if (!owner) {
+	    if (DGACallbackRefCount++ == 0)
+		AddCallback (&ClientStateCallback, DGAClientStateChange, NULL);
+	}
+
+	DGA_SETCLIENT(stuff->screen, client);
+    } else {
+	if (owner) {
+	    if (--DGACallbackRefCount == 0)
+		DeleteCallback(&ClientStateCallback, DGAClientStateChange, NULL);
+	}
+
+	DGA_SETCLIENT(stuff->screen, NULL);
+    }
+
+    return Success;
+}
+
+static int
+ProcXF86DGAGetViewPortSize(ClientPtr client)
+{
+    int num;
+    XDGAModeRec mode;
+    REQUEST(xXF86DGAGetViewPortSizeReq);
+    xXF86DGAGetViewPortSizeReply rep;
+
+    if (stuff->screen >= screenInfo.numScreens)
+	return BadValue;
+
+    REQUEST_SIZE_MATCH(xXF86DGAGetViewPortSizeReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    if (!DGAAvailable(stuff->screen))
+	return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    if(!(num = DGAGetOldDGAMode(stuff->screen)))
+	return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    DGAGetModeInfo(stuff->screen, &mode, num);
+
+    rep.width = mode.viewportWidth;
+    rep.height = mode.viewportHeight;
+
+    WriteToClient(client, SIZEOF(xXF86DGAGetViewPortSizeReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcXF86DGASetViewPort(ClientPtr client)
+{
+    REQUEST(xXF86DGASetViewPortReq);
+
+    if (stuff->screen >= screenInfo.numScreens)
+	return BadValue;
+
+    if (DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXF86DGASetViewPortReq);
+
+    if (!DGAAvailable(stuff->screen))
+	return DGAErrorBase + XF86DGANoDirectVideoMode;
+
+    if (!DGAActive(stuff->screen))
+	return DGAErrorBase + XF86DGADirectNotActivated;
+
+    if (DGASetViewport(stuff->screen, stuff->x, stuff->y, DGA_FLIP_RETRACE)
+		!= Success)
+	return DGAErrorBase + XF86DGADirectNotActivated;
+
+    return Success;
+}
+
+static int
+ProcXF86DGAGetVidPage(ClientPtr client)
+{
+    REQUEST(xXF86DGAGetVidPageReq);
+    xXF86DGAGetVidPageReply rep;
+
+    if (stuff->screen >= screenInfo.numScreens)
+	return BadValue;
+
+    REQUEST_SIZE_MATCH(xXF86DGAGetVidPageReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.vpage = 0;  /* silently fail */
+
+    WriteToClient(client, SIZEOF(xXF86DGAGetVidPageReply), (char *)&rep);
+    return Success;
+}
+
+
+static int
+ProcXF86DGASetVidPage(ClientPtr client)
+{
+    REQUEST(xXF86DGASetVidPageReq);
+
+    if (stuff->screen >= screenInfo.numScreens)
+	return BadValue;
+
+    REQUEST_SIZE_MATCH(xXF86DGASetVidPageReq);
+
+    /* silently fail */
+
+    return Success;
+}
+
+
+static int
+ProcXF86DGAInstallColormap(ClientPtr client)
+{
+    ColormapPtr pcmp;
+    int rc;
+    REQUEST(xXF86DGAInstallColormapReq);
+
+    if (stuff->screen >= screenInfo.numScreens)
+	return BadValue;
+
+    if (DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXF86DGAInstallColormapReq);
+
+    if (!DGAActive(stuff->screen))
+	return DGAErrorBase + XF86DGADirectNotActivated;
+
+    rc = dixLookupResourceByType((pointer *)&pcmp, stuff->id, RT_COLORMAP,
+				 client, DixInstallAccess);
+    if (rc == Success) {
+	DGAInstallCmap(pcmp);
+        return Success;
+    } else {
+        return rc;
+    }
+}
+
+static int
+ProcXF86DGAQueryDirectVideo(ClientPtr client)
+{
+    REQUEST(xXF86DGAQueryDirectVideoReq);
+    xXF86DGAQueryDirectVideoReply rep;
+
+    if (stuff->screen >= screenInfo.numScreens)
+	return BadValue;
+
+    REQUEST_SIZE_MATCH(xXF86DGAQueryDirectVideoReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.flags = 0;
+
+    if (DGAAvailable(stuff->screen))
+	rep.flags = XF86DGADirectPresent;
+
+    WriteToClient(client, SIZEOF(xXF86DGAQueryDirectVideoReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcXF86DGAViewPortChanged(ClientPtr client)
+{
+    REQUEST(xXF86DGAViewPortChangedReq);
+    xXF86DGAViewPortChangedReply rep;
+
+    if (stuff->screen >= screenInfo.numScreens)
+	return BadValue;
+
+    if (DGA_GETCLIENT(stuff->screen) != client)
+        return DGAErrorBase + XF86DGADirectNotActivated;
+
+    REQUEST_SIZE_MATCH(xXF86DGAViewPortChangedReq);
+
+    if (!DGAActive(stuff->screen))
+	return DGAErrorBase + XF86DGADirectNotActivated;
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.result = 1;
+
+    WriteToClient(client, SIZEOF(xXF86DGAViewPortChangedReply), (char *)&rep);
+    return Success;
+}
+
+#endif /* DGA_PROTOCOL_OLD_SUPPORT */
+
+static int
+SProcXDGADispatch (ClientPtr client)
+{
+   return DGAErrorBase + XF86DGAClientNotLocal;
+}
+
+#if 0
+#define DGA_REQ_DEBUG
+#endif
+
+#ifdef DGA_REQ_DEBUG
+static char *dgaMinor[] = {
+    "QueryVersion",
+    "GetVideoLL",
+    "DirectVideo",
+    "GetViewPortSize",
+    "SetViewPort",
+    "GetVidPage",
+    "SetVidPage",
+    "InstallColormap",
+    "QueryDirectVideo",
+    "ViewPortChanged",
+    "10",
+    "11",
+    "QueryModes",
+    "SetMode",
+    "SetViewport",
+    "InstallColormap",
+    "SelectInput",
+    "FillRectangle",
+    "CopyArea",
+    "CopyTransparentArea",
+    "GetViewportStatus",
+    "Sync",
+    "OpenFramebuffer",
+    "CloseFramebuffer",
+    "SetClientVersion",
+    "ChangePixmapMode",
+    "CreateColormap",
+};
+#endif
+
+static int
+ProcXDGADispatch (ClientPtr client)
+{
+    REQUEST(xReq);
+
+    if (!client->local)
+	return DGAErrorBase + XF86DGAClientNotLocal;
+
+#ifdef DGA_REQ_DEBUG
+    if (stuff->data <= X_XDGACreateColormap)
+	fprintf (stderr, "    DGA %s\n", dgaMinor[stuff->data]);
+#endif
+
+    switch (stuff->data){
+    /*
+     * DGA2 Protocol
+     */
+    case X_XDGAQueryVersion:
+	return ProcXDGAQueryVersion(client);
+    case X_XDGAQueryModes:
+	return ProcXDGAQueryModes(client);
+    case X_XDGASetMode:
+	return ProcXDGASetMode(client);
+    case X_XDGAOpenFramebuffer:
+	return ProcXDGAOpenFramebuffer(client);
+    case X_XDGACloseFramebuffer:
+	return ProcXDGACloseFramebuffer(client);
+    case X_XDGASetViewport:
+	return ProcXDGASetViewport(client);
+    case X_XDGAInstallColormap:
+	return ProcXDGAInstallColormap(client);
+    case X_XDGASelectInput:
+	return ProcXDGASelectInput(client);
+    case X_XDGAFillRectangle:
+	return ProcXDGAFillRectangle(client);
+    case X_XDGACopyArea:
+	return ProcXDGACopyArea(client);
+    case X_XDGACopyTransparentArea:
+	return ProcXDGACopyTransparentArea(client);
+    case X_XDGAGetViewportStatus:
+	return ProcXDGAGetViewportStatus(client);
+    case X_XDGASync:
+	return ProcXDGASync(client);
+    case X_XDGASetClientVersion:
+	return ProcXDGASetClientVersion(client);
+    case X_XDGAChangePixmapMode:
+	return ProcXDGAChangePixmapMode(client);
+    case X_XDGACreateColormap:
+	return ProcXDGACreateColormap(client);
+    /*
+     * Old DGA Protocol
+     */
+#ifdef DGA_PROTOCOL_OLD_SUPPORT
+    case X_XF86DGAGetVideoLL:
+	return ProcXF86DGAGetVideoLL(client);
+    case X_XF86DGADirectVideo:
+	return ProcXF86DGADirectVideo(client);
+    case X_XF86DGAGetViewPortSize:
+	return ProcXF86DGAGetViewPortSize(client);
+    case X_XF86DGASetViewPort:
+	return ProcXF86DGASetViewPort(client);
+    case X_XF86DGAGetVidPage:
+	return ProcXF86DGAGetVidPage(client);
+    case X_XF86DGASetVidPage:
+	return ProcXF86DGASetVidPage(client);
+    case X_XF86DGAInstallColormap:
+	return ProcXF86DGAInstallColormap(client);
+    case X_XF86DGAQueryDirectVideo:
+	return ProcXF86DGAQueryDirectVideo(client);
+    case X_XF86DGAViewPortChanged:
+	return ProcXF86DGAViewPortChanged(client);
+#endif /* DGA_PROTOCOL_OLD_SUPPORT */
+    default:
+	return BadRequest;
+    }
+}
+
+void
+XFree86DGARegister(INITARGS)
+{
+  XDGAEventBase = &DGAEventBase;
+}
+
+void
+XFree86DGAExtensionInit(INITARGS)
+{
+    ExtensionEntry* extEntry;
+
+    if (!dixRegisterPrivateKey(&DGAClientPrivateKeyRec, PRIVATE_CLIENT, 0))
+	return;
+
+    if (!dixRegisterPrivateKey(&DGAScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
+	return;
+
+    if ((extEntry = AddExtension(XF86DGANAME,
+				XF86DGANumberEvents,
+				XF86DGANumberErrors,
+				ProcXDGADispatch,
+				SProcXDGADispatch,
+				XDGAResetProc,
+				StandardMinorOpcode))) {
+	int i;
+
+	DGAReqCode = (unsigned char)extEntry->base;
+	DGAErrorBase = extEntry->errorBase;
+	DGAEventBase = extEntry->eventBase;
+	for (i = KeyPress; i <= MotionNotify; i++)
+	    SetCriticalEvent (DGAEventBase + i);
+    }
+}
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c b/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c
index 6d3d5fcbc..6e5e3f94c 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -1527,7 +1527,7 @@ ProcXF86VidModeGetPermissions(ClientPtr client)
     rep.sequenceNumber = client->sequence;
     rep.permissions = XF86VM_READ_PERMISSION;
     if (xf86GetVidModeEnabled() &&
-	(xf86GetVidModeAllowNonLocal() || LocalClient (client))) {
+	(xf86GetVidModeAllowNonLocal() || client->local)) {
 	rep.permissions |= XF86VM_WRITE_PERMISSION;
     }
     if(client->swapped) {
@@ -1597,7 +1597,7 @@ ProcXF86VidModeDispatch(ClientPtr client)
     default:
 	if (!xf86GetVidModeEnabled())
 	    return VidModeErrorBase + XF86VidModeExtensionDisabled;
-	if (xf86GetVidModeAllowNonLocal() || LocalClient (client)) {
+	if (xf86GetVidModeAllowNonLocal() || client->local) {
 	    switch (stuff->data) {
 	    case X_XF86VidModeAddModeLine:
 		return ProcXF86VidModeAddModeLine(client);
@@ -2017,7 +2017,7 @@ SProcXF86VidModeDispatch(ClientPtr client)
     default:
 	if (!xf86GetVidModeEnabled())
 	    return VidModeErrorBase + XF86VidModeExtensionDisabled;
-	if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
+	if (xf86GetVidModeAllowNonLocal() || client->local) {
 	    switch (stuff->data) {
 	    case X_XF86VidModeAddModeLine:
 		return SProcXF86VidModeAddModeLine(client);
diff --git a/xorg-server/hw/xfree86/dri/xf86dri.c b/xorg-server/hw/xfree86/dri/xf86dri.c
index c35ba2f94..723e52622 100644
--- a/xorg-server/hw/xfree86/dri/xf86dri.c
+++ b/xorg-server/hw/xfree86/dri/xf86dri.c
@@ -130,7 +130,7 @@ ProcXF86DRIQueryDirectRenderingCapable(
     }
     rep.isCapable = isCapable;
 
-    if (!LocalClient(client) || client->swapped)
+    if (!client->local || client->swapped)
 	rep.isCapable = 0;
 
     if (client->swapped) {
@@ -557,7 +557,7 @@ ProcXF86DRIDispatch (
 	return ProcXF86DRIQueryDirectRenderingCapable(client);
     }
 
-    if (!LocalClient(client))
+    if (!client->local)
 	return DRIErrorBase + XF86DRIClientNotLocal;
 
     switch (stuff->data)
diff --git a/xorg-server/hw/xfree86/dri2/dri2ext.c b/xorg-server/hw/xfree86/dri2/dri2ext.c
index 73ef7f25e..21331559f 100644
--- a/xorg-server/hw/xfree86/dri2/dri2ext.c
+++ b/xorg-server/hw/xfree86/dri2/dri2ext.c
@@ -547,7 +547,7 @@ ProcDRI2Dispatch (ClientPtr client)
 	return ProcDRI2QueryVersion(client);
     }
 
-    if (!LocalClient(client))
+    if (!client->local)
 	return BadRequest;
 
     switch (stuff->data) {
diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index 5b9f8d1c3..5b9c11950 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -1090,6 +1090,9 @@ UnloadSubModule(pointer _mod)
 {
     ModuleDescPtr mod = (ModuleDescPtr)_mod;
 
+    /* Some drivers are calling us on built-in submodules, ignore them */
+    if (mod == (ModuleDescPtr)1)
+	return;
     RemoveChild(mod);
     UnloadModuleOrDriver(mod);
 }
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_init.c b/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
index 5f3e3a9fb..2176985f9 100644
--- a/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
+++ b/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
@@ -212,10 +212,20 @@ xf86OpenConsole(void)
             tcgetattr(xf86Info.consoleFd, &tty_attr);
 	    SYSCALL(ioctl(xf86Info.consoleFd, KDGKBMODE, &tty_mode));
 
-	    SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_RAW));
+#ifdef K_OFF
+	    /* disable kernel special keys and buffering */
+	    SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_OFF));
 	    if (ret < 0)
-		FatalError("xf86OpenConsole: KDSKBMODE K_RAW failed %s\n",
-			strerror(errno));
+#endif
+	    {
+		SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_RAW));
+		if (ret < 0)
+		    FatalError("xf86OpenConsole: KDSKBMODE K_RAW failed %s\n",
+			    strerror(errno));
+
+		/* need to keep the buffer clean, else the kernel gets angry */
+		xf86SetConsoleHandler(drain_console, NULL);
+	    }
 
             nTty = tty_attr;
             nTty.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP);
@@ -228,9 +238,6 @@ xf86OpenConsole(void)
             cfsetospeed(&nTty, 9600);
             tcsetattr(xf86Info.consoleFd, TCSANOW, &nTty);
 
-            /* need to keep the buffer clean, else the kernel gets angry */
-	    xf86SetConsoleHandler(drain_console, NULL);
-
 	    /* we really should have a InitOSInputDevices() function instead
 	     * of Init?$#*&Device(). So I just place it here */
         }
diff --git a/xorg-server/hw/xfree86/vgahw/vgaHW.h b/xorg-server/hw/xfree86/vgahw/vgaHW.h
index e943aa391..d1ba9da89 100644
--- a/xorg-server/hw/xfree86/vgahw/vgaHW.h
+++ b/xorg-server/hw/xfree86/vgahw/vgaHW.h
@@ -170,10 +170,10 @@ typedef struct _vgaHWRec {
 #define BITS_PER_GUN 6
 #define COLORMAP_SIZE 256
 
-#define DACDelay(hw)							 \
-	do {								 \
-	    pci_io_read8((hw)->io, (hw)->IOBase + VGA_IN_STAT_1_OFFSET); \
-	    pci_io_read8((hw)->io, (hw)->IOBase + VGA_IN_STAT_1_OFFSET); \
+#define DACDelay(hw) \
+	do { \
+	    (hw)->readST01((hw)); \
+	    (hw)->readST01((hw)); \
 	} while (0)
 
 /* Function Prototypes */
diff --git a/xorg-server/hw/xfree86/xaa/Makefile.am b/xorg-server/hw/xfree86/xaa/Makefile.am
index 7ebe0b91e..78d934876 100644
--- a/xorg-server/hw/xfree86/xaa/Makefile.am
+++ b/xorg-server/hw/xfree86/xaa/Makefile.am
@@ -8,6 +8,8 @@ MSB_FIXED = mf-xaaBitmap.c mf-xaaStipple.c mf-xaaTEGlyph.c
 MSB_3_FIXED = mf3-xaaBitmap.c mf3-xaaStipple.c
 POLYSEG = s-xaaLine.c s-xaaDashLine.c
 
+if XAA
+
 libxaa_la_LDFLAGS = -module -avoid-version
 if COMPOSITE
 libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la
@@ -60,6 +62,8 @@ ${MSB_3_FIXED}:
 	$(AM_V_GEN)echo "#define FIXEDBASE" >> $@
 	$(AM_V_GEN)echo '#include "$(srcdir)/${@:mf3-%=%}"' >> $@
 
+endif # XAA
+
 DISTCLEANFILES = $(POLYSEG) \
 	$(LSB_FIRST) $(LSB_FIXED) $(MSB_FIRST) $(MSB_FIXED) \
 	$(LSB_3_FIRST) $(LSB_3_FIXED) $(MSB_3_FIRST) $(MSB_3_FIXED)