svn merge -r541:HEAD "^/branches/released" .

20 files changed, 1108 insertions, 1222 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index 1e9543fa2..9a2837e7b 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -67,9 +67,7 @@ extern DeviceAssocRec mouse_assoc;
 
 #include "xkbsrv.h"
 
-#ifdef RENDER
 #include "picture.h"
-#endif
 
 /*
  * These paths define the way the config file search is done.  The escape
@@ -925,7 +923,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
         }
     }
     
-#ifdef RENDER
     {
 	if ((s = xf86GetOptValString(FlagOptions, FLAG_RENDER_COLORMAP_MODE))){
 	    int policy = PictureParseCmapPolicy (s);
@@ -938,7 +935,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
 	    }
 	}
     }
-#endif
 
 #ifdef RANDR
     xf86Info.disableRandR = FALSE;
diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c
index 71ac9a9fe..03a29ea0f 100644
--- a/xorg-server/hw/xfree86/common/xf86Init.c
+++ b/xorg-server/hw/xfree86/common/xf86Init.c
@@ -74,9 +74,7 @@
 #include "xf86DDC.h"
 #include "xf86Xinput.h"
 #include "xf86InPriv.h"
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 
 #include "xf86VGAarbiter.h"
 #include "globals.h"
@@ -110,15 +108,9 @@ static PixmapFormatRec formats[MAXFORMATS] = {
 	{ 15,	16,	BITMAP_SCANLINE_PAD },
 	{ 16,	16,	BITMAP_SCANLINE_PAD },
 	{ 24,	32,	BITMAP_SCANLINE_PAD },
-#ifdef RENDER
 	{ 32,	32,	BITMAP_SCANLINE_PAD },
-#endif
 };
-#ifdef RENDER
 static int numFormats = 7;
-#else
-static int numFormats = 6;
-#endif
 static Bool formatsDone = FALSE;
 
 #ifndef OSNAME
@@ -1082,7 +1074,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 		    xf86Screens[i]->pScreen->CreateWindow);
       xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow;
 
-#ifdef RENDER
     if (PictureGetSubpixelOrder (xf86Screens[i]->pScreen) == SubPixelUnknown)
     {
 	xf86MonPtr DDC = (xf86MonPtr)(xf86Screens[i]->monitor->DDC);
@@ -1092,7 +1083,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 				  SubPixelHorizontalRGB : SubPixelNone) :
 				 SubPixelUnknown);
     }
-#endif
 #ifdef RANDR
     if (!xf86Info.disableRandR)
 	xf86RandRInit (screenInfo.screens[scr_index]);
diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
index a3eccdfff..52a8b9a60 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
@@ -1,1113 +1,1101 @@
-/*

- * This code was stolen from RAC and adapted to control the legacy vga

- * interface.

- *

- *

- * Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti

- *

- * Permission is hereby granted, free of charge, to any person

- * obtaining a copy of this software and associated documentation

- * files (the "Software"), to deal in the Software without

- * restriction, including without limitation the rights to use,

- * copy, modify, merge, publish, distribute, sublicense, and/or sell

- * copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following

- * conditions:

- *

- * The above copyright notice and this permission notice shall be

- * included in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- */

-

-#include "xorg-config.h"

-

-#include "xf86VGAarbiter.h"

-

-#ifdef HAVE_PCI_DEVICE_VGAARB_INIT

-#include "xf86VGAarbiterPriv.h"

-#include "xf86Bus.h"

-#include "xf86Priv.h"

-#include "pciaccess.h"

-

-

-static GCFuncs VGAarbiterGCFuncs = {

-    VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC,

-    VGAarbiterDestroyGC, VGAarbiterChangeClip, VGAarbiterDestroyClip,

-    VGAarbiterCopyClip

-};

-

-static GCOps VGAarbiterGCOps = {

-    VGAarbiterFillSpans, VGAarbiterSetSpans, VGAarbiterPutImage,

-    VGAarbiterCopyArea, VGAarbiterCopyPlane, VGAarbiterPolyPoint,

-    VGAarbiterPolylines, VGAarbiterPolySegment, VGAarbiterPolyRectangle,

-    VGAarbiterPolyArc, VGAarbiterFillPolygon, VGAarbiterPolyFillRect,

-    VGAarbiterPolyFillArc, VGAarbiterPolyText8, VGAarbiterPolyText16,

-    VGAarbiterImageText8, VGAarbiterImageText16, VGAarbiterImageGlyphBlt,

-    VGAarbiterPolyGlyphBlt, VGAarbiterPushPixels,

-    {NULL}      /* devPrivate */

-};

-

-static miPointerSpriteFuncRec VGAarbiterSpriteFuncs = {

-    VGAarbiterSpriteRealizeCursor, VGAarbiterSpriteUnrealizeCursor,

-    VGAarbiterSpriteSetCursor, VGAarbiterSpriteMoveCursor,

-    VGAarbiterDeviceCursorInitialize, VGAarbiterDeviceCursorCleanup

-};

-

-static int VGAarbiterKeyIndex;

-static DevPrivateKey VGAarbiterScreenKey = &VGAarbiterKeyIndex;

-static int VGAarbiterGCIndex;

-static DevPrivateKey VGAarbiterGCKey = &VGAarbiterGCIndex;

-

-static int vga_no_arb = 0;

-void

-xf86VGAarbiterInit(void)

-{

-    if (pci_device_vgaarb_init() != 0) {

-	vga_no_arb = 1;

-        xf86Msg(X_WARNING, "VGA arbiter: cannot open kernel arbiter, no multi-card support\n");

-    }

-}

-

-void

-xf86VGAarbiterFini(void)

-{

-    if (vga_no_arb)

-	return;

-    pci_device_vgaarb_fini();

-}

-

-void

-xf86VGAarbiterLock(ScrnInfoPtr pScrn)

-{

-    if (vga_no_arb)

-	return;

-    pci_device_vgaarb_set_target(pScrn->vgaDev);

-    pci_device_vgaarb_lock();

-}

-

-void

-xf86VGAarbiterUnlock(ScrnInfoPtr pScrn)

-{

-    if (vga_no_arb)

-	return;

-    pci_device_vgaarb_unlock();

-}

-

-Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen)

-{

-    int vga_count;

-    int rsrc_decodes;

-    ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];

-

-    if (vga_no_arb)

-	return TRUE;

-

-    pci_device_vgaarb_get_info(pScrn->vgaDev, &vga_count, &rsrc_decodes);

-    if (vga_count > 1) {

-        if (rsrc_decodes) {

-            return FALSE;

-        }

-    }

-    return TRUE;

-}

-

-void

-xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn)

-{

-    struct pci_device *dev;

-    EntityPtr pEnt;

-

-    if (vga_no_arb)

-	return;

-

-    pEnt = xf86Entities[pScrn->entityList[0]];

-    if (pEnt->bus.type != BUS_PCI)

-	return;

-

-    dev = pEnt->bus.id.pci;

-    pScrn->vgaDev = dev;

-}

-

-void

-xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn)

-{

-    if (vga_no_arb)

-	return;

-    pci_device_vgaarb_decodes(VGA_ARB_RSRC_LEGACY_MEM | VGA_ARB_RSRC_LEGACY_IO);

-}

-

-Bool

-xf86VGAarbiterWrapFunctions(void)

-{

-    ScrnInfoPtr pScrn;

-    VGAarbiterScreenPtr pScreenPriv;

-    miPointerScreenPtr PointPriv;

-#ifdef RENDER

-    PictureScreenPtr    ps;

-#endif

-    ScreenPtr pScreen;

-    int vga_count, i;

-

-    if (vga_no_arb)

-        return FALSE;

-

-    /*

-     * we need to wrap the arbiter if we have more than

-     * one VGA card - hotplug cries.

-     */

-    pci_device_vgaarb_get_info(NULL, &vga_count, NULL);

-    if (vga_count < 2 || !xf86Screens)

-        return FALSE;

-

-    xf86Msg(X_INFO,"Found %d VGA devices: arbiter wrapping enabled\n",

-            vga_count);

-

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

-        pScreen = xf86Screens[i]->pScreen;

-#ifdef RENDER

-        ps = GetPictureScreenIfSet(pScreen);

-#endif

-        pScrn = xf86Screens[pScreen->myNum];

-        PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);

-

-        if (!dixRequestPrivate(VGAarbiterGCKey, sizeof(VGAarbiterGCRec)))

-            return FALSE;

-

-        if (!(pScreenPriv = xalloc(sizeof(VGAarbiterScreenRec))))

-            return FALSE;

-

-        dixSetPrivate(&pScreen->devPrivates, VGAarbiterScreenKey, pScreenPriv);

-

-        WRAP_SCREEN(CloseScreen, VGAarbiterCloseScreen);

-        WRAP_SCREEN(SaveScreen, VGAarbiterSaveScreen);

-        WRAP_SCREEN(WakeupHandler, VGAarbiterWakeupHandler);

-        WRAP_SCREEN(BlockHandler, VGAarbiterBlockHandler);

-        WRAP_SCREEN(CreateGC, VGAarbiterCreateGC);

-        WRAP_SCREEN(GetImage, VGAarbiterGetImage);

-        WRAP_SCREEN(GetSpans, VGAarbiterGetSpans);

-        WRAP_SCREEN(SourceValidate, VGAarbiterSourceValidate);

-        WRAP_SCREEN(CopyWindow, VGAarbiterCopyWindow);

-        WRAP_SCREEN(ClearToBackground, VGAarbiterClearToBackground);

-        WRAP_SCREEN(CreatePixmap, VGAarbiterCreatePixmap);

-        WRAP_SCREEN(StoreColors, VGAarbiterStoreColors);

-        WRAP_SCREEN(DisplayCursor, VGAarbiterDisplayCursor);

-        WRAP_SCREEN(RealizeCursor, VGAarbiterRealizeCursor);

-        WRAP_SCREEN(UnrealizeCursor, VGAarbiterUnrealizeCursor);

-        WRAP_SCREEN(RecolorCursor, VGAarbiterRecolorCursor);

-        WRAP_SCREEN(SetCursorPosition, VGAarbiterSetCursorPosition);

-#ifdef RENDER

-        WRAP_PICT(Composite,VGAarbiterComposite);

-        WRAP_PICT(Glyphs,VGAarbiterGlyphs);

-        WRAP_PICT(CompositeRects,VGAarbiterCompositeRects);

-#endif

-        WRAP_SCREEN_INFO(AdjustFrame, VGAarbiterAdjustFrame);

-        WRAP_SCREEN_INFO(SwitchMode, VGAarbiterSwitchMode);

-        WRAP_SCREEN_INFO(EnterVT, VGAarbiterEnterVT);

-        WRAP_SCREEN_INFO(LeaveVT, VGAarbiterLeaveVT);

-        WRAP_SCREEN_INFO(FreeScreen, VGAarbiterFreeScreen);

-        WRAP_SPRITE;

-    }

-

-    return TRUE;

-}

-

-/* Screen funcs */

-static Bool

-VGAarbiterCloseScreen (int i, ScreenPtr pScreen)

-{

-    Bool val;

-    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];

-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, VGAarbiterScreenKey);

-    miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, miPointerScreenKey);

-#ifdef RENDER

-    PictureScreenPtr    ps = GetPictureScreenIfSet(pScreen);

-#endif

-

-    UNWRAP_SCREEN(CreateGC);

-    UNWRAP_SCREEN(CloseScreen);

-    UNWRAP_SCREEN(GetImage);

-    UNWRAP_SCREEN(GetSpans);

-    UNWRAP_SCREEN(SourceValidate);

-    UNWRAP_SCREEN(CopyWindow);

-    UNWRAP_SCREEN(ClearToBackground);

-    UNWRAP_SCREEN(SaveScreen);

-    UNWRAP_SCREEN(StoreColors);

-    UNWRAP_SCREEN(DisplayCursor);

-    UNWRAP_SCREEN(RealizeCursor);

-    UNWRAP_SCREEN(UnrealizeCursor);

-    UNWRAP_SCREEN(RecolorCursor);

-    UNWRAP_SCREEN(SetCursorPosition);

-#ifdef RENDER

-    UNWRAP_PICT(Composite);

-    UNWRAP_PICT(Glyphs);

-    UNWRAP_PICT(CompositeRects);

-#endif

-    UNWRAP_SCREEN_INFO(AdjustFrame);

-    UNWRAP_SCREEN_INFO(SwitchMode);

-    UNWRAP_SCREEN_INFO(EnterVT);

-    UNWRAP_SCREEN_INFO(LeaveVT);

-    UNWRAP_SCREEN_INFO(FreeScreen);

-    UNWRAP_SPRITE;

-

-    xfree ((pointer) pScreenPriv);

-    xf86VGAarbiterLock(xf86Screens[i]);

-    val = (*pScreen->CloseScreen) (i, pScreen);

-    xf86VGAarbiterUnlock(xf86Screens[i]);

-    return val;

-}

-

-static void

-VGAarbiterBlockHandler(int i,

-                       pointer blockData, pointer pTimeout, pointer pReadmask)

-{

-    ScreenPtr pScreen = screenInfo.screens[i];

-    SCREEN_PROLOG(BlockHandler);

-    VGAGet();

-    pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);

-    VGAPut();

-    SCREEN_EPILOG(BlockHandler, VGAarbiterBlockHandler);

-}

-

-static void

-VGAarbiterWakeupHandler(int i, pointer blockData, unsigned long result, pointer pReadmask)

-{

-    ScreenPtr pScreen = screenInfo.screens[i];

-    SCREEN_PROLOG(WakeupHandler);

-    VGAGet();

-    pScreen->WakeupHandler(i, blockData, result, pReadmask);

-    VGAPut();

-    SCREEN_EPILOG(WakeupHandler, VGAarbiterWakeupHandler);

-}

-

-static void

-VGAarbiterGetImage (

-    DrawablePtr pDrawable,

-    int sx, int sy, int w, int h,

-    unsigned int    format,

-    unsigned long   planemask,

-    char        *pdstLine

-    )

-{

-    ScreenPtr pScreen = pDrawable->pScreen;

-    SCREEN_PROLOG(GetImage);

-//    if (xf86Screens[pScreen->myNum]->vtSema) {

-    VGAGet();

-//    }

-    (*pScreen->GetImage) (pDrawable, sx, sy, w, h,

-              format, planemask, pdstLine);

-    VGAPut();

-    SCREEN_EPILOG (GetImage, VGAarbiterGetImage);

-}

-

-static void

-VGAarbiterGetSpans (

-    DrawablePtr pDrawable,

-    int     wMax,

-    DDXPointPtr ppt,

-    int     *pwidth,

-    int     nspans,

-    char    *pdstStart

-    )

-{

-    ScreenPtr       pScreen = pDrawable->pScreen;

-

-    SCREEN_PROLOG (GetSpans);

-    VGAGet();

-    (*pScreen->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);

-    VGAPut();

-    SCREEN_EPILOG (GetSpans, VGAarbiterGetSpans);

-}

-

-static void

-VGAarbiterSourceValidate (

-    DrawablePtr pDrawable,

-    int x, int y, int width, int height )

-{

-    ScreenPtr   pScreen = pDrawable->pScreen;

-    SCREEN_PROLOG (SourceValidate);

-    VGAGet();

-    if (pScreen->SourceValidate)

-    (*pScreen->SourceValidate) (pDrawable, x, y, width, height);

-    VGAPut();

-    SCREEN_EPILOG (SourceValidate, VGAarbiterSourceValidate);

-}

-

-static void

-VGAarbiterCopyWindow(

-    WindowPtr pWin,

-    DDXPointRec ptOldOrg,

-    RegionPtr prgnSrc )

-{

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-

-    SCREEN_PROLOG (CopyWindow);

-    VGAGet();

-    (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);

-    VGAPut();

-    SCREEN_EPILOG (CopyWindow, VGAarbiterCopyWindow);

-}

-

-static void

-VGAarbiterClearToBackground (

-    WindowPtr pWin,

-    int x, int y,

-    int w, int h,

-    Bool generateExposures )

-{

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-

-    SCREEN_PROLOG ( ClearToBackground);

-    VGAGet();

-    (*pScreen->ClearToBackground) (pWin, x, y, w, h, generateExposures);

-    VGAPut();

-    SCREEN_EPILOG (ClearToBackground, VGAarbiterClearToBackground);

-}

-

-static PixmapPtr

-VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)

-{

-    PixmapPtr pPix;

-

-    SCREEN_PROLOG ( CreatePixmap);

-    VGAGet();

-    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);

-    VGAPut();

-    SCREEN_EPILOG (CreatePixmap, VGAarbiterCreatePixmap);

-

-    return pPix;

-}

-

-static Bool

-VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank)

-{

-    Bool val;

-

-    SCREEN_PROLOG (SaveScreen);

-    VGAGet();

-    val = (*pScreen->SaveScreen) (pScreen, unblank);

-    VGAPut();

-    SCREEN_EPILOG (SaveScreen, VGAarbiterSaveScreen);

-

-    return val;

-}

-

-static void

-VGAarbiterStoreColors (

-    ColormapPtr        pmap,

-    int                ndef,

-    xColorItem         *pdefs)

-{

-    ScreenPtr pScreen = pmap->pScreen;

-

-    SCREEN_PROLOG (StoreColors);

-    VGAGet();

-    (*pScreen->StoreColors) (pmap,ndef,pdefs);

-    VGAPut();

-    SCREEN_EPILOG ( StoreColors, VGAarbiterStoreColors);

-}

-

-static void

-VGAarbiterRecolorCursor (

-    DeviceIntPtr pDev,

-    ScreenPtr pScreen,

-    CursorPtr pCurs,

-    Bool displayed

-    )

-{

-    SCREEN_PROLOG (RecolorCursor);

-    VGAGet();

-    (*pScreen->RecolorCursor) (pDev, pScreen, pCurs, displayed);

-    VGAPut();

-    SCREEN_EPILOG ( RecolorCursor, VGAarbiterRecolorCursor);

-}

-

-static Bool

-VGAarbiterRealizeCursor (

-    DeviceIntPtr pDev,

-    ScreenPtr   pScreen,

-    CursorPtr   pCursor

-    )

-{

-    Bool val;

-

-    SCREEN_PROLOG (RealizeCursor);

-    VGAGet();

-    val = (*pScreen->RealizeCursor) (pDev, pScreen,pCursor);

-    VGAPut();

-    SCREEN_EPILOG ( RealizeCursor, VGAarbiterRealizeCursor);

-    return val;

-}

-

-static Bool

-VGAarbiterUnrealizeCursor (

-    DeviceIntPtr pDev,

-    ScreenPtr   pScreen,

-    CursorPtr   pCursor

-    )

-{

-    Bool val;

-

-    SCREEN_PROLOG (UnrealizeCursor);

-    VGAGet();

-    val = (*pScreen->UnrealizeCursor) (pDev, pScreen, pCursor);

-    VGAPut();

-    SCREEN_EPILOG ( UnrealizeCursor, VGAarbiterUnrealizeCursor);

-    return val;

-}

-

-static Bool

-VGAarbiterDisplayCursor (

-    DeviceIntPtr pDev,

-    ScreenPtr   pScreen,

-    CursorPtr   pCursor

-    )

-{

-    Bool val;

-

-    SCREEN_PROLOG (DisplayCursor);

-    VGAGet();

-    val = (*pScreen->DisplayCursor) (pDev, pScreen, pCursor);

-    VGAPut();

-    SCREEN_EPILOG ( DisplayCursor, VGAarbiterDisplayCursor);

-    return val;

-}

-

-static Bool

-VGAarbiterSetCursorPosition (

-    DeviceIntPtr pDev,

-    ScreenPtr   pScreen,

-    int x, int y,

-    Bool generateEvent)

-{

-    Bool val;

-

-    SCREEN_PROLOG (SetCursorPosition);

-    VGAGet();

-    val = (*pScreen->SetCursorPosition) (pDev, pScreen, x, y, generateEvent);

-    VGAPut();

-    SCREEN_EPILOG ( SetCursorPosition, VGAarbiterSetCursorPosition);

-    return val;

-}

-

-static void

-VGAarbiterAdjustFrame(int index, int x, int y, int flags)

-{

-    ScreenPtr pScreen = screenInfo.screens[index];

-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, VGAarbiterScreenKey);

-

-    VGAGet();

-    (*pScreenPriv->AdjustFrame)(index, x, y, flags);

-    VGAPut();

-}

-

-static Bool

-VGAarbiterSwitchMode(int index, DisplayModePtr mode, int flags)

-{

-    Bool val;

-    ScreenPtr pScreen = screenInfo.screens[index];

-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, VGAarbiterScreenKey);

-

-    VGAGet();

-    val = (*pScreenPriv->SwitchMode)(index, mode, flags);

-    VGAPut();

-    return val;

-}

-

-static Bool

-VGAarbiterEnterVT(int index, int flags)

-{

-    Bool val;

-    ScreenPtr pScreen = screenInfo.screens[index];

-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, VGAarbiterScreenKey);

-

-    VGAGet();

-    val = (*pScreenPriv->EnterVT)(index, flags);

-    VGAPut();

-    return val;

-}

-

-static void

-VGAarbiterLeaveVT(int index, int flags)

-{

-    ScreenPtr pScreen = screenInfo.screens[index];

-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, VGAarbiterScreenKey);

-

-    VGAGet();

-    (*pScreenPriv->LeaveVT)(index, flags);

-    VGAPut();

-}

-

-static void

-VGAarbiterFreeScreen(int index, int flags)

-{

-    ScreenPtr pScreen = screenInfo.screens[index];

-    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(

-        &pScreen->devPrivates, VGAarbiterScreenKey);

-

-    VGAGet();

-    (*pScreenPriv->FreeScreen)(index, flags);

-    VGAPut();

-}

-

-static Bool

-VGAarbiterCreateGC(GCPtr pGC)

-{

-    ScreenPtr    pScreen = pGC->pScreen;

-    VGAarbiterGCPtr pGCPriv = (VGAarbiterGCPtr)dixLookupPrivate(&pGC->devPrivates, VGAarbiterGCKey);

-    Bool         ret;

-

-    SCREEN_PROLOG(CreateGC);

-    VGAGet();

-    ret = (*pScreen->CreateGC)(pGC);

-    VGAPut();

-    GC_WRAP(pGC);

-    SCREEN_EPILOG(CreateGC,VGAarbiterCreateGC);

-

-    return ret;

-}

-

-/* GC funcs */

-static void

-VGAarbiterValidateGC(

-   GCPtr         pGC,

-   unsigned long changes,

-   DrawablePtr   pDraw )

-{

-    GC_UNWRAP(pGC);

-    (*pGC->funcs->ValidateGC)(pGC, changes, pDraw);

-    GC_WRAP(pGC);

-}

-

-

-static void

-VGAarbiterDestroyGC(GCPtr pGC)

-{

-    GC_UNWRAP (pGC);

-    (*pGC->funcs->DestroyGC)(pGC);

-    GC_WRAP (pGC);

-}

-

-static void

-VGAarbiterChangeGC (

-    GCPtr       pGC,

-    unsigned long   mask)

-{

-    GC_UNWRAP (pGC);

-    (*pGC->funcs->ChangeGC) (pGC, mask);

-    GC_WRAP (pGC);

-}

-

-static void

-VGAarbiterCopyGC (

-    GCPtr       pGCSrc,

-    unsigned long   mask,

-    GCPtr       pGCDst)

-{

-    GC_UNWRAP (pGCDst);

-    (*pGCDst->funcs->CopyGC) (pGCSrc, mask, pGCDst);

-    GC_WRAP (pGCDst);

-}

-

-static void

-VGAarbiterChangeClip (

-    GCPtr   pGC,

-    int     type,

-    pointer pvalue,

-    int     nrects )

-{

-    GC_UNWRAP (pGC);

-    (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);

-    GC_WRAP (pGC);

-}

-

-static void

-VGAarbiterCopyClip(GCPtr pgcDst, GCPtr pgcSrc)

-{

-    GC_UNWRAP (pgcDst);

-    (* pgcDst->funcs->CopyClip)(pgcDst, pgcSrc);

-    GC_WRAP (pgcDst);

-}

-

-static void

-VGAarbiterDestroyClip(GCPtr pGC)

-{

-    GC_UNWRAP (pGC);

-    (* pGC->funcs->DestroyClip)(pGC);

-    GC_WRAP (pGC);

-}

-

-/* GC Ops */

-static void

-VGAarbiterFillSpans(

-    DrawablePtr pDraw,

-    GC      *pGC,

-    int     nInit,

-    DDXPointPtr pptInit,

-    int *pwidthInit,

-    int fSorted )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterSetSpans(

-    DrawablePtr     pDraw,

-    GCPtr       pGC,

-    char        *pcharsrc,

-    register DDXPointPtr ppt,

-    int         *pwidth,

-    int         nspans,

-    int         fSorted )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPutImage(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     depth,

-    int x, int y, int w, int h,

-    int     leftPad,

-    int     format,

-    char    *pImage )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PutImage)(pDraw, pGC, depth, x, y, w, h,

-              leftPad, format, pImage);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static RegionPtr

-VGAarbiterCopyArea(

-    DrawablePtr pSrc,

-    DrawablePtr pDst,

-    GC *pGC,

-    int srcx, int srcy,

-    int width, int height,

-    int dstx, int dsty )

-{

-    RegionPtr ret;

-

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    ret = (*pGC->ops->CopyArea)(pSrc, pDst,

-                pGC, srcx, srcy, width, height, dstx, dsty);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-    return ret;

-}

-

-static RegionPtr

-VGAarbiterCopyPlane(

-    DrawablePtr pSrc,

-    DrawablePtr pDst,

-    GCPtr pGC,

-    int srcx, int srcy,

-    int width, int height,

-    int dstx, int dsty,

-    unsigned long bitPlane )

-{

-    RegionPtr ret;

-

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    ret = (*pGC->ops->CopyPlane)(pSrc, pDst, pGC, srcx, srcy,

-                 width, height, dstx, dsty, bitPlane);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-    return ret;

-}

-

-static void

-VGAarbiterPolyPoint(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int mode,

-    int npt,

-    xPoint *pptInit )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolyPoint)(pDraw, pGC, mode, npt, pptInit);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-

-static void

-VGAarbiterPolylines(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     mode,

-    int     npt,

-    DDXPointPtr pptInit )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->Polylines)(pDraw, pGC, mode, npt, pptInit);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPolySegment(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     nseg,

-    xSegment    *pSeg )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolySegment)(pDraw, pGC, nseg, pSeg);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPolyRectangle(

-    DrawablePtr  pDraw,

-    GCPtr        pGC,

-    int          nRectsInit,

-    xRectangle  *pRectsInit )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolyRectangle)(pDraw, pGC, nRectsInit, pRectsInit);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPolyArc(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     narcs,

-    xArc    *parcs )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolyArc)(pDraw, pGC, narcs, parcs);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterFillPolygon(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     shape,

-    int     mode,

-    int     count,

-    DDXPointPtr ptsIn )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, ptsIn);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPolyFillRect(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     nrectFill,

-    xRectangle  *prectInit)

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolyFillRect)(pDraw, pGC, nrectFill, prectInit);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPolyFillArc(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     narcs,

-    xArc    *parcs )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolyFillArc)(pDraw, pGC, narcs, parcs);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static int

-VGAarbiterPolyText8(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     x,

-    int     y,

-    int     count,

-    char    *chars )

-{

-    int ret;

-

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    ret = (*pGC->ops->PolyText8)(pDraw, pGC, x, y, count, chars);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-    return ret;

-}

-

-static int

-VGAarbiterPolyText16(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     x,

-    int     y,

-    int     count,

-    unsigned short *chars )

-{

-    int ret;

-

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    ret = (*pGC->ops->PolyText16)(pDraw, pGC, x, y, count, chars);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-    return ret;

-}

-

-static void

-VGAarbiterImageText8(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     x,

-    int     y,

-    int     count,

-    char    *chars )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->ImageText8)(pDraw, pGC, x, y, count, chars);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterImageText16(

-    DrawablePtr pDraw,

-    GCPtr   pGC,

-    int     x,

-    int     y,

-    int     count,

-    unsigned short *chars )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->ImageText16)(pDraw, pGC, x, y, count, chars);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-

-static void

-VGAarbiterImageGlyphBlt(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int xInit, int yInit,

-    unsigned int nglyph,

-    CharInfoPtr *ppci,

-    pointer pglyphBase )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, xInit, yInit,

-                   nglyph, ppci, pglyphBase);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPolyGlyphBlt(

-    DrawablePtr pDraw,

-    GCPtr pGC,

-    int xInit, int yInit,

-    unsigned int nglyph,

-    CharInfoPtr *ppci,

-    pointer pglyphBase )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PolyGlyphBlt)(pDraw, pGC, xInit, yInit,

-                  nglyph, ppci, pglyphBase);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-static void

-VGAarbiterPushPixels(

-    GCPtr   pGC,

-    PixmapPtr   pBitMap,

-    DrawablePtr pDraw,

-    int dx, int dy, int xOrg, int yOrg )

-{

-    GC_UNWRAP(pGC);

-    VGAGet_GC();

-    (*pGC->ops->PushPixels)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);

-    VGAPut_GC();

-    GC_WRAP(pGC);

-}

-

-

-/* miSpriteFuncs */

-static Bool

-VGAarbiterSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur)

-{

-    Bool val;

-    SPRITE_PROLOG;

-    VGAGet();

-    val = PointPriv->spriteFuncs->RealizeCursor(pDev, pScreen, pCur);

-    VGAPut();

-    SPRITE_EPILOG;

-    return val;

-}

-

-static Bool

-VGAarbiterSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur)

-{

-    Bool val;

-    SPRITE_PROLOG;

-    VGAGet();

-    val = PointPriv->spriteFuncs->UnrealizeCursor(pDev, pScreen, pCur);

-    VGAPut();

-    SPRITE_EPILOG;

-    return val;

-}

-

-static void

-VGAarbiterSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur, int x, int y)

-{

-    SPRITE_PROLOG;

-    VGAGet();

-    PointPriv->spriteFuncs->SetCursor(pDev, pScreen, pCur, x, y);

-    VGAPut();

-    SPRITE_EPILOG;

-}

-

-static void

-VGAarbiterSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

-{

-    SPRITE_PROLOG;

-    VGAGet();

-    PointPriv->spriteFuncs->MoveCursor(pDev, pScreen, x, y);

-    VGAPut();

-    SPRITE_EPILOG;

-}

-

-static Bool

-VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)

-{

-    Bool val;

-    SPRITE_PROLOG;

-    VGAGet();

-    val = PointPriv->spriteFuncs->DeviceCursorInitialize(pDev, pScreen);

-    VGAPut();

-    SPRITE_EPILOG;

-    return val;

-}

-

-static void

-VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)

-{

-    SPRITE_PROLOG;

-    VGAGet();

-    PointPriv->spriteFuncs->DeviceCursorCleanup(pDev, pScreen);

-    VGAPut();

-    SPRITE_EPILOG;

-}

-

-#ifdef RENDER

-static void

-VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,

-         PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask,

-         INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width,

-         CARD16 height)

-{

-    ScreenPtr       pScreen = pDst->pDrawable->pScreen;

-    PictureScreenPtr    ps = GetPictureScreen(pScreen);

-

-    PICTURE_PROLOGUE(Composite);

-

-    VGAGet();

-    (*ps->Composite) (op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask, xDst,

-              yDst, width, height);

-    VGAPut();

-    PICTURE_EPILOGUE(Composite, VGAarbiterComposite);

-}

-

-static void

-VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,

-      PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlist,

-      GlyphListPtr list, GlyphPtr *glyphs)

-{

-    ScreenPtr       pScreen = pDst->pDrawable->pScreen;

-    PictureScreenPtr    ps = GetPictureScreen(pScreen);

-

-    PICTURE_PROLOGUE(Glyphs);

-

-    VGAGet();

-    (*ps->Glyphs)(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);

-    VGAPut();

-    PICTURE_EPILOGUE (Glyphs, VGAarbiterGlyphs);

-}

-

-static void

-VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect,

-          xRectangle *rects)

-{

-    ScreenPtr       pScreen = pDst->pDrawable->pScreen;

-    PictureScreenPtr    ps = GetPictureScreen(pScreen);

-

-    PICTURE_PROLOGUE(CompositeRects);

-

-    VGAGet();

-    (*ps->CompositeRects)(op, pDst, color, nRect, rects);

-    VGAPut();

-    PICTURE_EPILOGUE (CompositeRects, VGAarbiterCompositeRects);

-}

-#endif

-#else

-/* dummy functions */

-void xf86VGAarbiterInit(void) {}

-void xf86VGAarbiterFini(void) {}

-

-void xf86VGAarbiterLock(ScrnInfoPtr pScrn) {}

-void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn) {}

-Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen) { return TRUE; }

-void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn) {}

-void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn) {}

-Bool xf86VGAarbiterWrapFunctions(void) { return FALSE; }

-

-#endif

+/*
+ * This code was stolen from RAC and adapted to control the legacy vga
+ * interface.
+ *
+ *
+ * Copyright (c) 2007 Paulo R. Zanoni, Tiago Vignatti
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "xorg-config.h"
+
+#include "xf86VGAarbiter.h"
+
+#ifdef HAVE_PCI_DEVICE_VGAARB_INIT
+#include "xf86VGAarbiterPriv.h"
+#include "xf86Bus.h"
+#include "xf86Priv.h"
+#include "pciaccess.h"
+
+
+static GCFuncs VGAarbiterGCFuncs = {
+    VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC,
+    VGAarbiterDestroyGC, VGAarbiterChangeClip, VGAarbiterDestroyClip,
+    VGAarbiterCopyClip
+};
+
+static GCOps VGAarbiterGCOps = {
+    VGAarbiterFillSpans, VGAarbiterSetSpans, VGAarbiterPutImage,
+    VGAarbiterCopyArea, VGAarbiterCopyPlane, VGAarbiterPolyPoint,
+    VGAarbiterPolylines, VGAarbiterPolySegment, VGAarbiterPolyRectangle,
+    VGAarbiterPolyArc, VGAarbiterFillPolygon, VGAarbiterPolyFillRect,
+    VGAarbiterPolyFillArc, VGAarbiterPolyText8, VGAarbiterPolyText16,
+    VGAarbiterImageText8, VGAarbiterImageText16, VGAarbiterImageGlyphBlt,
+    VGAarbiterPolyGlyphBlt, VGAarbiterPushPixels,
+    {NULL}      /* devPrivate */
+};
+
+static miPointerSpriteFuncRec VGAarbiterSpriteFuncs = {
+    VGAarbiterSpriteRealizeCursor, VGAarbiterSpriteUnrealizeCursor,
+    VGAarbiterSpriteSetCursor, VGAarbiterSpriteMoveCursor,
+    VGAarbiterDeviceCursorInitialize, VGAarbiterDeviceCursorCleanup
+};
+
+static int VGAarbiterKeyIndex;
+static DevPrivateKey VGAarbiterScreenKey = &VGAarbiterKeyIndex;
+static int VGAarbiterGCIndex;
+static DevPrivateKey VGAarbiterGCKey = &VGAarbiterGCIndex;
+
+static int vga_no_arb = 0;
+void
+xf86VGAarbiterInit(void)
+{
+    if (pci_device_vgaarb_init() != 0) {
+	vga_no_arb = 1;
+        xf86Msg(X_WARNING, "VGA arbiter: cannot open kernel arbiter, no multi-card support\n");
+    }
+}
+
+void
+xf86VGAarbiterFini(void)
+{
+    if (vga_no_arb)
+	return;
+    pci_device_vgaarb_fini();
+}
+
+void
+xf86VGAarbiterLock(ScrnInfoPtr pScrn)
+{
+    if (vga_no_arb)
+	return;
+    pci_device_vgaarb_set_target(pScrn->vgaDev);
+    pci_device_vgaarb_lock();
+}
+
+void
+xf86VGAarbiterUnlock(ScrnInfoPtr pScrn)
+{
+    if (vga_no_arb)
+	return;
+    pci_device_vgaarb_unlock();
+}
+
+Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen)
+{
+    int vga_count;
+    int rsrc_decodes;
+    ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];
+
+    if (vga_no_arb)
+	return TRUE;
+
+    pci_device_vgaarb_get_info(pScrn->vgaDev, &vga_count, &rsrc_decodes);
+    if (vga_count > 1) {
+        if (rsrc_decodes) {
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+void
+xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn)
+{
+    struct pci_device *dev;
+    EntityPtr pEnt;
+
+    if (vga_no_arb)
+	return;
+
+    pEnt = xf86Entities[pScrn->entityList[0]];
+    if (pEnt->bus.type != BUS_PCI)
+	return;
+
+    dev = pEnt->bus.id.pci;
+    pScrn->vgaDev = dev;
+}
+
+void
+xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn)
+{
+    if (vga_no_arb)
+	return;
+    pci_device_vgaarb_decodes(VGA_ARB_RSRC_LEGACY_MEM | VGA_ARB_RSRC_LEGACY_IO);
+}
+
+Bool
+xf86VGAarbiterWrapFunctions(void)
+{
+    ScrnInfoPtr pScrn;
+    VGAarbiterScreenPtr pScreenPriv;
+    miPointerScreenPtr PointPriv;
+    PictureScreenPtr    ps;
+    ScreenPtr pScreen;
+    int vga_count, i;
+
+    if (vga_no_arb)
+        return FALSE;
+
+    /*
+     * we need to wrap the arbiter if we have more than
+     * one VGA card - hotplug cries.
+     */
+    pci_device_vgaarb_get_info(NULL, &vga_count, NULL);
+    if (vga_count < 2 || !xf86Screens)
+        return FALSE;
+
+    xf86Msg(X_INFO,"Found %d VGA devices: arbiter wrapping enabled\n",
+            vga_count);
+
+    for (i = 0; i < xf86NumScreens; i++) {
+        pScreen = xf86Screens[i]->pScreen;
+        ps = GetPictureScreenIfSet(pScreen);
+        pScrn = xf86Screens[pScreen->myNum];
+        PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
+
+        if (!dixRequestPrivate(VGAarbiterGCKey, sizeof(VGAarbiterGCRec)))
+            return FALSE;
+
+        if (!(pScreenPriv = xalloc(sizeof(VGAarbiterScreenRec))))
+            return FALSE;
+
+        dixSetPrivate(&pScreen->devPrivates, VGAarbiterScreenKey, pScreenPriv);
+
+        WRAP_SCREEN(CloseScreen, VGAarbiterCloseScreen);
+        WRAP_SCREEN(SaveScreen, VGAarbiterSaveScreen);
+        WRAP_SCREEN(WakeupHandler, VGAarbiterWakeupHandler);
+        WRAP_SCREEN(BlockHandler, VGAarbiterBlockHandler);
+        WRAP_SCREEN(CreateGC, VGAarbiterCreateGC);
+        WRAP_SCREEN(GetImage, VGAarbiterGetImage);
+        WRAP_SCREEN(GetSpans, VGAarbiterGetSpans);
+        WRAP_SCREEN(SourceValidate, VGAarbiterSourceValidate);
+        WRAP_SCREEN(CopyWindow, VGAarbiterCopyWindow);
+        WRAP_SCREEN(ClearToBackground, VGAarbiterClearToBackground);
+        WRAP_SCREEN(CreatePixmap, VGAarbiterCreatePixmap);
+        WRAP_SCREEN(StoreColors, VGAarbiterStoreColors);
+        WRAP_SCREEN(DisplayCursor, VGAarbiterDisplayCursor);
+        WRAP_SCREEN(RealizeCursor, VGAarbiterRealizeCursor);
+        WRAP_SCREEN(UnrealizeCursor, VGAarbiterUnrealizeCursor);
+        WRAP_SCREEN(RecolorCursor, VGAarbiterRecolorCursor);
+        WRAP_SCREEN(SetCursorPosition, VGAarbiterSetCursorPosition);
+        WRAP_PICT(Composite,VGAarbiterComposite);
+        WRAP_PICT(Glyphs,VGAarbiterGlyphs);
+        WRAP_PICT(CompositeRects,VGAarbiterCompositeRects);
+        WRAP_SCREEN_INFO(AdjustFrame, VGAarbiterAdjustFrame);
+        WRAP_SCREEN_INFO(SwitchMode, VGAarbiterSwitchMode);
+        WRAP_SCREEN_INFO(EnterVT, VGAarbiterEnterVT);
+        WRAP_SCREEN_INFO(LeaveVT, VGAarbiterLeaveVT);
+        WRAP_SCREEN_INFO(FreeScreen, VGAarbiterFreeScreen);
+        WRAP_SPRITE;
+    }
+
+    return TRUE;
+}
+
+/* Screen funcs */
+static Bool
+VGAarbiterCloseScreen (int i, ScreenPtr pScreen)
+{
+    Bool val;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+    miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, miPointerScreenKey);
+    PictureScreenPtr    ps = GetPictureScreenIfSet(pScreen);
+
+    UNWRAP_SCREEN(CreateGC);
+    UNWRAP_SCREEN(CloseScreen);
+    UNWRAP_SCREEN(GetImage);
+    UNWRAP_SCREEN(GetSpans);
+    UNWRAP_SCREEN(SourceValidate);
+    UNWRAP_SCREEN(CopyWindow);
+    UNWRAP_SCREEN(ClearToBackground);
+    UNWRAP_SCREEN(SaveScreen);
+    UNWRAP_SCREEN(StoreColors);
+    UNWRAP_SCREEN(DisplayCursor);
+    UNWRAP_SCREEN(RealizeCursor);
+    UNWRAP_SCREEN(UnrealizeCursor);
+    UNWRAP_SCREEN(RecolorCursor);
+    UNWRAP_SCREEN(SetCursorPosition);
+    UNWRAP_PICT(Composite);
+    UNWRAP_PICT(Glyphs);
+    UNWRAP_PICT(CompositeRects);
+    UNWRAP_SCREEN_INFO(AdjustFrame);
+    UNWRAP_SCREEN_INFO(SwitchMode);
+    UNWRAP_SCREEN_INFO(EnterVT);
+    UNWRAP_SCREEN_INFO(LeaveVT);
+    UNWRAP_SCREEN_INFO(FreeScreen);
+    UNWRAP_SPRITE;
+
+    xfree ((pointer) pScreenPriv);
+    xf86VGAarbiterLock(xf86Screens[i]);
+    val = (*pScreen->CloseScreen) (i, pScreen);
+    xf86VGAarbiterUnlock(xf86Screens[i]);
+    return val;
+}
+
+static void
+VGAarbiterBlockHandler(int i,
+                       pointer blockData, pointer pTimeout, pointer pReadmask)
+{
+    ScreenPtr pScreen = screenInfo.screens[i];
+    SCREEN_PROLOG(BlockHandler);
+    VGAGet();
+    pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);
+    VGAPut();
+    SCREEN_EPILOG(BlockHandler, VGAarbiterBlockHandler);
+}
+
+static void
+VGAarbiterWakeupHandler(int i, pointer blockData, unsigned long result, pointer pReadmask)
+{
+    ScreenPtr pScreen = screenInfo.screens[i];
+    SCREEN_PROLOG(WakeupHandler);
+    VGAGet();
+    pScreen->WakeupHandler(i, blockData, result, pReadmask);
+    VGAPut();
+    SCREEN_EPILOG(WakeupHandler, VGAarbiterWakeupHandler);
+}
+
+static void
+VGAarbiterGetImage (
+    DrawablePtr pDrawable,
+    int sx, int sy, int w, int h,
+    unsigned int    format,
+    unsigned long   planemask,
+    char        *pdstLine
+    )
+{
+    ScreenPtr pScreen = pDrawable->pScreen;
+    SCREEN_PROLOG(GetImage);
+//    if (xf86Screens[pScreen->myNum]->vtSema) {
+    VGAGet();
+//    }
+    (*pScreen->GetImage) (pDrawable, sx, sy, w, h,
+              format, planemask, pdstLine);
+    VGAPut();
+    SCREEN_EPILOG (GetImage, VGAarbiterGetImage);
+}
+
+static void
+VGAarbiterGetSpans (
+    DrawablePtr pDrawable,
+    int     wMax,
+    DDXPointPtr ppt,
+    int     *pwidth,
+    int     nspans,
+    char    *pdstStart
+    )
+{
+    ScreenPtr       pScreen = pDrawable->pScreen;
+
+    SCREEN_PROLOG (GetSpans);
+    VGAGet();
+    (*pScreen->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart);
+    VGAPut();
+    SCREEN_EPILOG (GetSpans, VGAarbiterGetSpans);
+}
+
+static void
+VGAarbiterSourceValidate (
+    DrawablePtr pDrawable,
+    int x, int y, int width, int height )
+{
+    ScreenPtr   pScreen = pDrawable->pScreen;
+    SCREEN_PROLOG (SourceValidate);
+    VGAGet();
+    if (pScreen->SourceValidate)
+    (*pScreen->SourceValidate) (pDrawable, x, y, width, height);
+    VGAPut();
+    SCREEN_EPILOG (SourceValidate, VGAarbiterSourceValidate);
+}
+
+static void
+VGAarbiterCopyWindow(
+    WindowPtr pWin,
+    DDXPointRec ptOldOrg,
+    RegionPtr prgnSrc )
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    SCREEN_PROLOG (CopyWindow);
+    VGAGet();
+    (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);
+    VGAPut();
+    SCREEN_EPILOG (CopyWindow, VGAarbiterCopyWindow);
+}
+
+static void
+VGAarbiterClearToBackground (
+    WindowPtr pWin,
+    int x, int y,
+    int w, int h,
+    Bool generateExposures )
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+
+    SCREEN_PROLOG ( ClearToBackground);
+    VGAGet();
+    (*pScreen->ClearToBackground) (pWin, x, y, w, h, generateExposures);
+    VGAPut();
+    SCREEN_EPILOG (ClearToBackground, VGAarbiterClearToBackground);
+}
+
+static PixmapPtr
+VGAarbiterCreatePixmap(ScreenPtr pScreen, int w, int h, int depth, unsigned usage_hint)
+{
+    PixmapPtr pPix;
+
+    SCREEN_PROLOG ( CreatePixmap);
+    VGAGet();
+    pPix = (*pScreen->CreatePixmap) (pScreen, w, h, depth, usage_hint);
+    VGAPut();
+    SCREEN_EPILOG (CreatePixmap, VGAarbiterCreatePixmap);
+
+    return pPix;
+}
+
+static Bool
+VGAarbiterSaveScreen(ScreenPtr pScreen, Bool unblank)
+{
+    Bool val;
+
+    SCREEN_PROLOG (SaveScreen);
+    VGAGet();
+    val = (*pScreen->SaveScreen) (pScreen, unblank);
+    VGAPut();
+    SCREEN_EPILOG (SaveScreen, VGAarbiterSaveScreen);
+
+    return val;
+}
+
+static void
+VGAarbiterStoreColors (
+    ColormapPtr        pmap,
+    int                ndef,
+    xColorItem         *pdefs)
+{
+    ScreenPtr pScreen = pmap->pScreen;
+
+    SCREEN_PROLOG (StoreColors);
+    VGAGet();
+    (*pScreen->StoreColors) (pmap,ndef,pdefs);
+    VGAPut();
+    SCREEN_EPILOG ( StoreColors, VGAarbiterStoreColors);
+}
+
+static void
+VGAarbiterRecolorCursor (
+    DeviceIntPtr pDev,
+    ScreenPtr pScreen,
+    CursorPtr pCurs,
+    Bool displayed
+    )
+{
+    SCREEN_PROLOG (RecolorCursor);
+    VGAGet();
+    (*pScreen->RecolorCursor) (pDev, pScreen, pCurs, displayed);
+    VGAPut();
+    SCREEN_EPILOG ( RecolorCursor, VGAarbiterRecolorCursor);
+}
+
+static Bool
+VGAarbiterRealizeCursor (
+    DeviceIntPtr pDev,
+    ScreenPtr   pScreen,
+    CursorPtr   pCursor
+    )
+{
+    Bool val;
+
+    SCREEN_PROLOG (RealizeCursor);
+    VGAGet();
+    val = (*pScreen->RealizeCursor) (pDev, pScreen,pCursor);
+    VGAPut();
+    SCREEN_EPILOG ( RealizeCursor, VGAarbiterRealizeCursor);
+    return val;
+}
+
+static Bool
+VGAarbiterUnrealizeCursor (
+    DeviceIntPtr pDev,
+    ScreenPtr   pScreen,
+    CursorPtr   pCursor
+    )
+{
+    Bool val;
+
+    SCREEN_PROLOG (UnrealizeCursor);
+    VGAGet();
+    val = (*pScreen->UnrealizeCursor) (pDev, pScreen, pCursor);
+    VGAPut();
+    SCREEN_EPILOG ( UnrealizeCursor, VGAarbiterUnrealizeCursor);
+    return val;
+}
+
+static Bool
+VGAarbiterDisplayCursor (
+    DeviceIntPtr pDev,
+    ScreenPtr   pScreen,
+    CursorPtr   pCursor
+    )
+{
+    Bool val;
+
+    SCREEN_PROLOG (DisplayCursor);
+    VGAGet();
+    val = (*pScreen->DisplayCursor) (pDev, pScreen, pCursor);
+    VGAPut();
+    SCREEN_EPILOG ( DisplayCursor, VGAarbiterDisplayCursor);
+    return val;
+}
+
+static Bool
+VGAarbiterSetCursorPosition (
+    DeviceIntPtr pDev,
+    ScreenPtr   pScreen,
+    int x, int y,
+    Bool generateEvent)
+{
+    Bool val;
+
+    SCREEN_PROLOG (SetCursorPosition);
+    VGAGet();
+    val = (*pScreen->SetCursorPosition) (pDev, pScreen, x, y, generateEvent);
+    VGAPut();
+    SCREEN_EPILOG ( SetCursorPosition, VGAarbiterSetCursorPosition);
+    return val;
+}
+
+static void
+VGAarbiterAdjustFrame(int index, int x, int y, int flags)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    VGAGet();
+    (*pScreenPriv->AdjustFrame)(index, x, y, flags);
+    VGAPut();
+}
+
+static Bool
+VGAarbiterSwitchMode(int index, DisplayModePtr mode, int flags)
+{
+    Bool val;
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    VGAGet();
+    val = (*pScreenPriv->SwitchMode)(index, mode, flags);
+    VGAPut();
+    return val;
+}
+
+static Bool
+VGAarbiterEnterVT(int index, int flags)
+{
+    Bool val;
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    VGAGet();
+    val = (*pScreenPriv->EnterVT)(index, flags);
+    VGAPut();
+    return val;
+}
+
+static void
+VGAarbiterLeaveVT(int index, int flags)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    VGAGet();
+    (*pScreenPriv->LeaveVT)(index, flags);
+    VGAPut();
+}
+
+static void
+VGAarbiterFreeScreen(int index, int flags)
+{
+    ScreenPtr pScreen = screenInfo.screens[index];
+    VGAarbiterScreenPtr pScreenPriv = (VGAarbiterScreenPtr)dixLookupPrivate(
+        &pScreen->devPrivates, VGAarbiterScreenKey);
+
+    VGAGet();
+    (*pScreenPriv->FreeScreen)(index, flags);
+    VGAPut();
+}
+
+static Bool
+VGAarbiterCreateGC(GCPtr pGC)
+{
+    ScreenPtr    pScreen = pGC->pScreen;
+    VGAarbiterGCPtr pGCPriv = (VGAarbiterGCPtr)dixLookupPrivate(&pGC->devPrivates, VGAarbiterGCKey);
+    Bool         ret;
+
+    SCREEN_PROLOG(CreateGC);
+    VGAGet();
+    ret = (*pScreen->CreateGC)(pGC);
+    VGAPut();
+    GC_WRAP(pGC);
+    SCREEN_EPILOG(CreateGC,VGAarbiterCreateGC);
+
+    return ret;
+}
+
+/* GC funcs */
+static void
+VGAarbiterValidateGC(
+   GCPtr         pGC,
+   unsigned long changes,
+   DrawablePtr   pDraw )
+{
+    GC_UNWRAP(pGC);
+    (*pGC->funcs->ValidateGC)(pGC, changes, pDraw);
+    GC_WRAP(pGC);
+}
+
+
+static void
+VGAarbiterDestroyGC(GCPtr pGC)
+{
+    GC_UNWRAP (pGC);
+    (*pGC->funcs->DestroyGC)(pGC);
+    GC_WRAP (pGC);
+}
+
+static void
+VGAarbiterChangeGC (
+    GCPtr       pGC,
+    unsigned long   mask)
+{
+    GC_UNWRAP (pGC);
+    (*pGC->funcs->ChangeGC) (pGC, mask);
+    GC_WRAP (pGC);
+}
+
+static void
+VGAarbiterCopyGC (
+    GCPtr       pGCSrc,
+    unsigned long   mask,
+    GCPtr       pGCDst)
+{
+    GC_UNWRAP (pGCDst);
+    (*pGCDst->funcs->CopyGC) (pGCSrc, mask, pGCDst);
+    GC_WRAP (pGCDst);
+}
+
+static void
+VGAarbiterChangeClip (
+    GCPtr   pGC,
+    int     type,
+    pointer pvalue,
+    int     nrects )
+{
+    GC_UNWRAP (pGC);
+    (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
+    GC_WRAP (pGC);
+}
+
+static void
+VGAarbiterCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
+{
+    GC_UNWRAP (pgcDst);
+    (* pgcDst->funcs->CopyClip)(pgcDst, pgcSrc);
+    GC_WRAP (pgcDst);
+}
+
+static void
+VGAarbiterDestroyClip(GCPtr pGC)
+{
+    GC_UNWRAP (pGC);
+    (* pGC->funcs->DestroyClip)(pGC);
+    GC_WRAP (pGC);
+}
+
+/* GC Ops */
+static void
+VGAarbiterFillSpans(
+    DrawablePtr pDraw,
+    GC      *pGC,
+    int     nInit,
+    DDXPointPtr pptInit,
+    int *pwidthInit,
+    int fSorted )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterSetSpans(
+    DrawablePtr     pDraw,
+    GCPtr       pGC,
+    char        *pcharsrc,
+    register DDXPointPtr ppt,
+    int         *pwidth,
+    int         nspans,
+    int         fSorted )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPutImage(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     depth,
+    int x, int y, int w, int h,
+    int     leftPad,
+    int     format,
+    char    *pImage )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PutImage)(pDraw, pGC, depth, x, y, w, h,
+              leftPad, format, pImage);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static RegionPtr
+VGAarbiterCopyArea(
+    DrawablePtr pSrc,
+    DrawablePtr pDst,
+    GC *pGC,
+    int srcx, int srcy,
+    int width, int height,
+    int dstx, int dsty )
+{
+    RegionPtr ret;
+
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    ret = (*pGC->ops->CopyArea)(pSrc, pDst,
+                pGC, srcx, srcy, width, height, dstx, dsty);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+    return ret;
+}
+
+static RegionPtr
+VGAarbiterCopyPlane(
+    DrawablePtr pSrc,
+    DrawablePtr pDst,
+    GCPtr pGC,
+    int srcx, int srcy,
+    int width, int height,
+    int dstx, int dsty,
+    unsigned long bitPlane )
+{
+    RegionPtr ret;
+
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    ret = (*pGC->ops->CopyPlane)(pSrc, pDst, pGC, srcx, srcy,
+                 width, height, dstx, dsty, bitPlane);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+    return ret;
+}
+
+static void
+VGAarbiterPolyPoint(
+    DrawablePtr pDraw,
+    GCPtr pGC,
+    int mode,
+    int npt,
+    xPoint *pptInit )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolyPoint)(pDraw, pGC, mode, npt, pptInit);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+
+static void
+VGAarbiterPolylines(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     mode,
+    int     npt,
+    DDXPointPtr pptInit )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->Polylines)(pDraw, pGC, mode, npt, pptInit);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolySegment(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     nseg,
+    xSegment    *pSeg )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolySegment)(pDraw, pGC, nseg, pSeg);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyRectangle(
+    DrawablePtr  pDraw,
+    GCPtr        pGC,
+    int          nRectsInit,
+    xRectangle  *pRectsInit )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolyRectangle)(pDraw, pGC, nRectsInit, pRectsInit);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyArc(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     narcs,
+    xArc    *parcs )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolyArc)(pDraw, pGC, narcs, parcs);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterFillPolygon(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     shape,
+    int     mode,
+    int     count,
+    DDXPointPtr ptsIn )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, ptsIn);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyFillRect(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     nrectFill,
+    xRectangle  *prectInit)
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolyFillRect)(pDraw, pGC, nrectFill, prectInit);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyFillArc(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     narcs,
+    xArc    *parcs )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolyFillArc)(pDraw, pGC, narcs, parcs);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static int
+VGAarbiterPolyText8(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     x,
+    int     y,
+    int     count,
+    char    *chars )
+{
+    int ret;
+
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    ret = (*pGC->ops->PolyText8)(pDraw, pGC, x, y, count, chars);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+    return ret;
+}
+
+static int
+VGAarbiterPolyText16(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     x,
+    int     y,
+    int     count,
+    unsigned short *chars )
+{
+    int ret;
+
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    ret = (*pGC->ops->PolyText16)(pDraw, pGC, x, y, count, chars);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+    return ret;
+}
+
+static void
+VGAarbiterImageText8(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     x,
+    int     y,
+    int     count,
+    char    *chars )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->ImageText8)(pDraw, pGC, x, y, count, chars);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterImageText16(
+    DrawablePtr pDraw,
+    GCPtr   pGC,
+    int     x,
+    int     y,
+    int     count,
+    unsigned short *chars )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->ImageText16)(pDraw, pGC, x, y, count, chars);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+
+static void
+VGAarbiterImageGlyphBlt(
+    DrawablePtr pDraw,
+    GCPtr pGC,
+    int xInit, int yInit,
+    unsigned int nglyph,
+    CharInfoPtr *ppci,
+    pointer pglyphBase )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, xInit, yInit,
+                   nglyph, ppci, pglyphBase);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPolyGlyphBlt(
+    DrawablePtr pDraw,
+    GCPtr pGC,
+    int xInit, int yInit,
+    unsigned int nglyph,
+    CharInfoPtr *ppci,
+    pointer pglyphBase )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PolyGlyphBlt)(pDraw, pGC, xInit, yInit,
+                  nglyph, ppci, pglyphBase);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+static void
+VGAarbiterPushPixels(
+    GCPtr   pGC,
+    PixmapPtr   pBitMap,
+    DrawablePtr pDraw,
+    int dx, int dy, int xOrg, int yOrg )
+{
+    GC_UNWRAP(pGC);
+    VGAGet_GC();
+    (*pGC->ops->PushPixels)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);
+    VGAPut_GC();
+    GC_WRAP(pGC);
+}
+
+
+/* miSpriteFuncs */
+static Bool
+VGAarbiterSpriteRealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur)
+{
+    Bool val;
+    SPRITE_PROLOG;
+    VGAGet();
+    val = PointPriv->spriteFuncs->RealizeCursor(pDev, pScreen, pCur);
+    VGAPut();
+    SPRITE_EPILOG;
+    return val;
+}
+
+static Bool
+VGAarbiterSpriteUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur)
+{
+    Bool val;
+    SPRITE_PROLOG;
+    VGAGet();
+    val = PointPriv->spriteFuncs->UnrealizeCursor(pDev, pScreen, pCur);
+    VGAPut();
+    SPRITE_EPILOG;
+    return val;
+}
+
+static void
+VGAarbiterSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCur, int x, int y)
+{
+    SPRITE_PROLOG;
+    VGAGet();
+    PointPriv->spriteFuncs->SetCursor(pDev, pScreen, pCur, x, y);
+    VGAPut();
+    SPRITE_EPILOG;
+}
+
+static void
+VGAarbiterSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
+    SPRITE_PROLOG;
+    VGAGet();
+    PointPriv->spriteFuncs->MoveCursor(pDev, pScreen, x, y);
+    VGAPut();
+    SPRITE_EPILOG;
+}
+
+static Bool
+VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
+{
+    Bool val;
+    SPRITE_PROLOG;
+    VGAGet();
+    val = PointPriv->spriteFuncs->DeviceCursorInitialize(pDev, pScreen);
+    VGAPut();
+    SPRITE_EPILOG;
+    return val;
+}
+
+static void
+VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
+{
+    SPRITE_PROLOG;
+    VGAGet();
+    PointPriv->spriteFuncs->DeviceCursorCleanup(pDev, pScreen);
+    VGAPut();
+    SPRITE_EPILOG;
+}
+
+static void
+VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
+         PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask,
+         INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width,
+         CARD16 height)
+{
+    ScreenPtr       pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+
+    PICTURE_PROLOGUE(Composite);
+
+    VGAGet();
+    (*ps->Composite) (op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask, xDst,
+              yDst, width, height);
+    VGAPut();
+    PICTURE_EPILOGUE(Composite, VGAarbiterComposite);
+}
+
+static void
+VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
+      PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlist,
+      GlyphListPtr list, GlyphPtr *glyphs)
+{
+    ScreenPtr       pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+
+    PICTURE_PROLOGUE(Glyphs);
+
+    VGAGet();
+    (*ps->Glyphs)(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
+    VGAPut();
+    PICTURE_EPILOGUE (Glyphs, VGAarbiterGlyphs);
+}
+
+static void
+VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect,
+          xRectangle *rects)
+{
+    ScreenPtr       pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+
+    PICTURE_PROLOGUE(CompositeRects);
+
+    VGAGet();
+    (*ps->CompositeRects)(op, pDst, color, nRect, rects);
+    VGAPut();
+    PICTURE_EPILOGUE (CompositeRects, VGAarbiterCompositeRects);
+}
+#else
+/* dummy functions */
+void xf86VGAarbiterInit(void) {}
+void xf86VGAarbiterFini(void) {}
+
+void xf86VGAarbiterLock(ScrnInfoPtr pScrn) {}
+void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn) {}
+Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen) { return TRUE; }
+void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn) {}
+void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn) {}
+Bool xf86VGAarbiterWrapFunctions(void) { return FALSE; }
+
+#endif
diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
index 40d436856..9b4a59731 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -43,9 +43,7 @@
 #include "xf86str.h"
 #include "mipointer.h"
 #include "mipointrst.h"
-#ifdef RENDER
 # include "picturestr.h"
-#endif
 
 
 #define WRAP_SCREEN(x,y) {pScreenPriv->x = pScreen->x; pScreen->x = y;}
@@ -139,11 +137,9 @@ typedef struct _VGAarbiterScreen {
     void                        (*LeaveVT)(int, int);
     void                        (*FreeScreen)(int, int);
     miPointerSpriteFuncPtr      miSprite;
-#ifdef RENDER
     CompositeProcPtr            Composite;
     GlyphsProcPtr               Glyphs;
     CompositeRectsProcPtr       CompositeRects;
-#endif
 } VGAarbiterScreenRec, *VGAarbiterScreenPtr;
 
 typedef struct _VGAarbiterGC {
@@ -254,7 +250,6 @@ static Bool VGAarbiterDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScree
 static void VGAarbiterDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen);
 
 
-#ifdef RENDER
 static void VGAarbiterComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
     PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
     INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);
@@ -263,4 +258,3 @@ static void VGAarbiterGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
     list, GlyphPtr *glyphs);
 static void VGAarbiterCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor
     *color, int nRect, xRectangle *rects);
-#endif
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/modinit.c b/xorg-server/hw/xfree86/dixmods/extmod/modinit.c
index 299562592..7d2086802 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/modinit.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/modinit.c
@@ -47,15 +47,6 @@ static ExtensionModule extensionModules[] = {
 	NULL
     },
 #endif
-#ifdef MULTIBUFFER
-    {
-	MultibufferExtensionInit,
-	MULTIBUFFER_PROTOCOL_NAME,
-	&noMultibufferExtension,
-	NULL,
-	NULL
-    },
-#endif
 #ifdef SCREENSAVER
     {
 	ScreenSaverExtensionInit,
diff --git a/xorg-server/hw/xfree86/dixmods/extmod/modinit.h b/xorg-server/hw/xfree86/dixmods/extmod/modinit.h
index 6210526aa..1154e4601 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/modinit.h
+++ b/xorg-server/hw/xfree86/dixmods/extmod/modinit.h
@@ -9,11 +9,6 @@
 
 #include <X11/extensions/shapeproto.h>
 
-#ifdef MULTIBUFFER
-extern void MultibufferExtensionInit(INITARGS);
-#include <X11/extensions/multibufproto.h>
-#endif
-
 #ifdef XTEST
 extern void XTestExtensionInit(INITARGS);
 #include <X11/extensions/xtestproto.h>
diff --git a/xorg-server/hw/xfree86/i2c/fi1236.c b/xorg-server/hw/xfree86/i2c/fi1236.c
index 7c39edbee..61224eaa5 100644
--- a/xorg-server/hw/xfree86/i2c/fi1236.c
+++ b/xorg-server/hw/xfree86/i2c/fi1236.c
@@ -398,10 +398,6 @@ int TUNER_get_afc_hint(FI1236Ptr f)
 {
 if(f->afc_timer_installed)return TUNER_STILL_TUNING;
 return f->last_afc_hint;
-if(f->type==TUNER_TYPE_MT2032)
-	return MT2032_get_afc_hint(f);
-	else
-	return FI1236_get_afc_hint(f);
 }
 
 static void MT2032_dump_status(FI1236Ptr f)
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index 860e520ad..1ccaffc10 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -42,9 +42,7 @@
 #include "X11/extensions/render.h"
 #include "X11/extensions/dpmsconst.h"
 #include "X11/Xatom.h"
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 
 #include "xf86xv.h"
 
@@ -184,7 +182,6 @@ xf86CrtcInUse (xf86CrtcPtr crtc)
 void
 xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
 {
-#ifdef RENDER
     int			subpixel_order = SubPixelUnknown;
     Bool		has_none = FALSE;
     ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];
@@ -243,7 +240,6 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
     if (subpixel_order == SubPixelUnknown && has_none)
 	subpixel_order = SubPixelNone;
     PictureSetSubpixelOrder (pScreen, subpixel_order);
-#endif
 }
 
 /**
diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index e2e174e59..f90ecc227 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -41,9 +41,7 @@
 #include "X11/extensions/render.h"
 #include "X11/extensions/dpmsconst.h"
 #include "X11/Xatom.h"
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 #include "cursorstr.h"
 #include "inputstr.h"
 
diff --git a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
index 4ba8599ab..da57939cf 100644
--- a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
+++ b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
@@ -340,14 +340,9 @@ xf86SetSerial (int fd, pointer options)
 
 	if ((xf86SetBoolOption (options, "ClearRTS", FALSE)))
 	{
-#ifdef CLEARRTS_SUPPORT
-		val = TIOCM_RTS;
-		SYSCALL (ioctl(fd, TIOCMBIC, &val));
-#else
 		xf86Msg (X_WARNING,
 			 "Option ClearRTS not supported on this OS\n");
 			return (-1);
-#endif
 		xf86MarkOptionUsedByName (options, "ClearRTS");
 	}
 
diff --git a/xorg-server/hw/xfree86/parser/read.c b/xorg-server/hw/xfree86/parser/read.c
index 1091be5e5..4e42b24f0 100644
--- a/xorg-server/hw/xfree86/parser/read.c
+++ b/xorg-server/hw/xfree86/parser/read.c
@@ -219,15 +219,15 @@ xf86readConfigFile (void)
 			}
 			else
 			{
-				Error (INVALID_SECTION_MSG, xf86tokenString ());
 				free(val.str);
 				val.str = NULL;
+				Error (INVALID_SECTION_MSG, xf86tokenString ());
 			}
 			break;
 		default:
-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
 			free(val.str);
 			val.str = NULL;
+			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
 		}
 	}
 
diff --git a/xorg-server/hw/xfree86/parser/scan.c b/xorg-server/hw/xfree86/parser/scan.c
index 8aab0cf41..06710d55a 100644
--- a/xorg-server/hw/xfree86/parser/scan.c
+++ b/xorg-server/hw/xfree86/parser/scan.c
@@ -845,10 +845,13 @@ static int
 ConfigFilter(const struct dirent *de)
 {
 	const char *name = de->d_name;
-	size_t len = strlen(name);
+	size_t len;
 	size_t suflen = strlen(XCONFIGSUFFIX);
 
-	if (!name || name[0] == '.' || len <= suflen)
+	if (!name || name[0] == '.')
+		return 0;
+	len = strlen(name);
+	if(len <= suflen)
 		return 0;
 	if (strcmp(&name[len-suflen], XCONFIGSUFFIX) != 0)
 		return 0;
diff --git a/xorg-server/hw/xfree86/shadowfb/shadow.c b/xorg-server/hw/xfree86/shadowfb/shadow.c
index 9c9aa0d55..1c8170104 100644
--- a/xorg-server/hw/xfree86/shadowfb/shadow.c
+++ b/xorg-server/hw/xfree86/shadowfb/shadow.c
@@ -27,9 +27,7 @@
 #include "xf86str.h"
 #include "shadowfb.h"
 
-#ifdef RENDER
 # include "picturestr.h"
-#endif
 
 static Bool ShadowCloseScreen (int i, ScreenPtr pScreen);
 static void ShadowCopyWindow(
@@ -51,7 +49,6 @@ static Bool ShadowModifyPixmapHeader(
 static Bool ShadowEnterVT(int index, int flags);
 static void ShadowLeaveVT(int index, int flags);
 
-#ifdef RENDER
 static void ShadowComposite(
     CARD8 op,
     PicturePtr pSrc,
@@ -66,7 +63,6 @@ static void ShadowComposite(
     CARD16 width,
     CARD16 height
 );
-#endif /* RENDER */
 
 
 typedef struct {
@@ -77,9 +73,7 @@ typedef struct {
   CopyWindowProcPtr			CopyWindow;
   CreateGCProcPtr			CreateGC;
   ModifyPixmapHeaderProcPtr		ModifyPixmapHeader;
-#ifdef RENDER
   CompositeProcPtr Composite;
-#endif /* RENDER */
   Bool				(*EnterVT)(int, int);
   void				(*LeaveVT)(int, int);
   Bool				vtSema;
@@ -164,9 +158,7 @@ ShadowFBInit2 (
 ){
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     ShadowScreenPtr pPriv;
-#ifdef RENDER
     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
-#endif /* RENDER */
 
     if(!preRefreshArea && !postRefreshArea) return FALSE;
     
@@ -199,12 +191,10 @@ ShadowFBInit2 (
     pScrn->EnterVT = ShadowEnterVT;
     pScrn->LeaveVT = ShadowLeaveVT;
 
-#ifdef RENDER
     if(ps) {
       pPriv->Composite = ps->Composite;
       ps->Composite = ShadowComposite;
     }
-#endif /* RENDER */
 
     return TRUE;
 }
@@ -251,9 +241,7 @@ ShadowCloseScreen (int i, ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pScreen);
-#ifdef RENDER
     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
-#endif /* RENDER */
 
     pScreen->CloseScreen = pPriv->CloseScreen;
     pScreen->CopyWindow = pPriv->CopyWindow;
@@ -263,11 +251,9 @@ ShadowCloseScreen (int i, ScreenPtr pScreen)
     pScrn->EnterVT = pPriv->EnterVT;
     pScrn->LeaveVT = pPriv->LeaveVT;
 
-#ifdef RENDER
     if(ps) {
         ps->Composite = pPriv->Composite;
     }
-#endif /* RENDER */
 
     xfree((pointer)pPriv);
 
@@ -355,7 +341,6 @@ ShadowModifyPixmapHeader(
     return retval;
 }
 
-#ifdef RENDER
 static void
 ShadowComposite(
     CARD8 op,
@@ -408,7 +393,6 @@ ShadowComposite(
         (*pPriv->postRefresh)(pPriv->pScrn, 1, &box);
     }
 }
-#endif /* RENDER */
 
 /**********************************************************/
 
diff --git a/xorg-server/hw/xfree86/xaa/xaa.h b/xorg-server/hw/xfree86/xaa/xaa.h
index 7db6b95d5..2af954fee 100644
--- a/xorg-server/hw/xfree86/xaa/xaa.h
+++ b/xorg-server/hw/xfree86/xaa/xaa.h
@@ -108,9 +108,7 @@
 #include "regionstr.h"
 #include "xf86fbman.h"
 
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 
 /* Flags */
 #define PIXMAP_CACHE			0x00000001
@@ -1251,7 +1249,6 @@ typedef struct _XAAInfoRec {
 
    CARD32 FullPlanemasks[32];
 
-#ifdef RENDER
    Bool (*Composite) (
    	CARD8      op,
         PicturePtr pSrc,
@@ -1336,13 +1333,10 @@ typedef struct _XAAInfoRec {
    CARD32 * CPUToScreenTextureFormats;
 
 
-#endif
-
    /* these were added for 4.3.0 */
    BoxRec SolidLineLimits;
    BoxRec DashedLineLimits;
 
-#ifdef RENDER
    /* These were added for X.Org 6.8.0 */
    Bool (*SetupForCPUToScreenAlphaTexture2) (
 	ScrnInfoPtr	pScrn,
@@ -1373,7 +1367,6 @@ typedef struct _XAAInfoRec {
 	int		flags
    );
    CARD32 *CPUToScreenTextureDstFormats;
-#endif /* RENDER */
 } XAAInfoRec, *XAAInfoRecPtr;
 
 #define SET_SYNC_FLAG(infoRec)	(infoRec)->NeedToSync = TRUE
diff --git a/xorg-server/hw/xfree86/xaa/xaaInit.c b/xorg-server/hw/xfree86/xaa/xaaInit.c
index 2ce2d9085..7d4583dc2 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInit.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInit.c
@@ -100,9 +100,7 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     XAAScreenPtr pScreenPriv;
     int i;
-#ifdef RENDER
     PictureScreenPtr    ps = GetPictureScreenIfSet(pScreen);
-#endif
 
     /* Return successfully if no acceleration wanted */
     if (!infoRec)
@@ -173,7 +171,6 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
     pScrn->EnableDisableFBAccess = XAAEnableDisableFBAccess;
 
     pScreenPriv->WindowExposures = pScreen->WindowExposures;
-#ifdef RENDER
     if (ps)
     {
 	pScreenPriv->Composite = ps->Composite;
@@ -181,7 +178,6 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
 	pScreenPriv->Glyphs = ps->Glyphs;
 	ps->Glyphs = XAAGlyphs;
     }
-#endif    
     if(pScrn->overlayFlags & OVERLAY_8_32_PLANAR)
         XAASetupOverlay8_32Planar(pScreen);
 
diff --git a/xorg-server/hw/xfree86/xaa/xaaInitAccel.c b/xorg-server/hw/xfree86/xaa/xaaInitAccel.c
index 157325e4b..6f3d622e1 100644
--- a/xorg-server/hw/xfree86/xaa/xaaInitAccel.c
+++ b/xorg-server/hw/xfree86/xaa/xaaInitAccel.c
@@ -1251,7 +1251,6 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
 	   infoRec->ComputeDash = XAAComputeDash;
     }
 
-#ifdef RENDER
     {
 	Bool haveTexture = infoRec->CPUToScreenTextureFormats &&
 			   infoRec->CPUToScreenTextureDstFormats &&
@@ -1271,7 +1270,6 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
             infoRec->Glyphs = XAADoGlyphs;
         }	
     }
-#endif
 
     /************  Validation Functions **************/
 
diff --git a/xorg-server/hw/xfree86/xaa/xaaStateChange.c b/xorg-server/hw/xfree86/xaa/xaaStateChange.c
index 57d8aa318..f33261453 100644
--- a/xorg-server/hw/xfree86/xaa/xaaStateChange.c
+++ b/xorg-server/hw/xfree86/xaa/xaaStateChange.c
@@ -260,7 +260,6 @@ typedef struct _XAAStateWrapRec {
    GetImageProcPtr GetImage;
    GetSpansProcPtr GetSpans;
    CopyWindowProcPtr CopyWindow;
-#ifdef RENDER
    Bool (*SetupForCPUToScreenAlphaTexture2)(ScrnInfoPtr pScrn, int op,
                                            CARD16 red, CARD16 green,
                                            CARD16 blue, CARD16 alpha,
@@ -271,7 +270,6 @@ typedef struct _XAAStateWrapRec {
                                       CARD32 srcFormat, CARD32 dstFormat,
                                       CARD8 *texPtr, int texPitch,
                                       int width, int height, int flags);
-#endif
 } XAAStateWrapRec, *XAAStateWrapPtr;
 
 static int XAAStateKeyIndex;
@@ -1457,7 +1455,6 @@ static void XAAStateWrapCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg,
 			     prgnSrc);
 }
 
-#ifdef RENDER
 static Bool XAAStateWrapSetupForCPUToScreenAlphaTexture2(ScrnInfoPtr pScrn,
                                                          int op, CARD16 red,
                                                          CARD16 green,
@@ -1494,7 +1491,6 @@ static Bool XAAStateWrapSetupForCPUToScreenTexture2(ScrnInfoPtr pScrn, int op,
                                                     dstFormat, texPtr, texPitch,
 						    width, height, flags);
 }
-#endif
 
 /* Setup Function */
 Bool
@@ -1624,9 +1620,7 @@ XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
    XAA_STATE_WRAP(GetImage);
    XAA_STATE_WRAP(GetSpans);
    XAA_STATE_WRAP(CopyWindow);
-#ifdef RENDER
    XAA_STATE_WRAP(SetupForCPUToScreenAlphaTexture2);
    XAA_STATE_WRAP(SetupForCPUToScreenTexture2);
-#endif
    return TRUE;
 }
diff --git a/xorg-server/hw/xfree86/xaa/xaaWrapper.c b/xorg-server/hw/xfree86/xaa/xaaWrapper.c
index 88418946f..d6409887c 100644
--- a/xorg-server/hw/xfree86/xaa/xaaWrapper.c
+++ b/xorg-server/hw/xfree86/xaa/xaaWrapper.c
@@ -62,10 +62,8 @@ typedef struct {
     UninstallColormapProcPtr	UninstallColormap;
     ListInstalledColormapsProcPtr ListInstalledColormaps;
     StoreColorsProcPtr		StoreColors;
-#ifdef RENDER
     CompositeProcPtr		Composite;
     GlyphsProcPtr		Glyphs;
-#endif    
 
     CloseScreenProcPtr		wrapCloseScreen;
     CreateScreenResourcesProcPtr wrapCreateScreenResources;
@@ -79,10 +77,8 @@ typedef struct {
     UninstallColormapProcPtr	wrapUninstallColormap;
     ListInstalledColormapsProcPtr wrapListInstalledColormaps;
     StoreColorsProcPtr		wrapStoreColors;
-#ifdef RENDER
     CompositeProcPtr		wrapComposite;
     GlyphsProcPtr		wrapGlyphs;
-#endif    
     int depth;
 } xaaWrapperScrPrivRec, *xaaWrapperScrPrivPtr;
 
@@ -270,9 +266,7 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f
 {
     Bool ret;
     xaaWrapperScrPrivPtr pScrPriv;
-#ifdef RENDER
     PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);
-#endif
 
     if (!dixRequestPrivate(xaaWrapperGCPrivateKey, sizeof(xaaWrapperGCPrivRec)))
 	return FALSE;
@@ -293,12 +287,10 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f
     get (pScrPriv, pScreen, UninstallColormap, wrapUninstallColormap);
     get (pScrPriv, pScreen, ListInstalledColormaps, wrapListInstalledColormaps);
     get (pScrPriv, pScreen, StoreColors, wrapStoreColors);
-#ifdef RENDER
     if (ps) {
 	get (pScrPriv, ps, Glyphs, wrapGlyphs);
 	get (pScrPriv, ps, Composite, wrapComposite);
     }
-#endif
     if (!(ret = XAAInit(pScreen,infoPtr)))
 	return FALSE;
     
@@ -317,12 +309,10 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f
 	  xaaWrapperListInstalledColormaps);
     wrap (pScrPriv, pScreen, StoreColors, xaaWrapperStoreColors);
 
-#ifdef RENDER
     if (ps) {
 	wrap (pScrPriv, ps, Glyphs, xaaWrapperGlyphs);
 	wrap (pScrPriv, ps, Composite, xaaWrapperComposite);
     }
-#endif
     pScrPriv->depth = depth;
     dixSetPrivate(&pScreen->devPrivates, xaaWrapperScrPrivateKey, pScrPriv);
 
@@ -438,7 +428,6 @@ xaaWrapperDestroyClip(GCPtr pGC)
     XAAWRAPPER_GC_FUNC_EPILOGUE (pGC);
 }
 
-#ifdef RENDER
 static void
 xaaWrapperComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
 	     INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
@@ -470,7 +459,6 @@ xaaWrapperGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
     wrap (pScrPriv, ps, Glyphs, xaaWrapperGlyphs);
 
 }
-#endif
 
 void
 XAASync(ScreenPtr pScreen)
diff --git a/xorg-server/hw/xfree86/xaa/xaalocal.h b/xorg-server/hw/xfree86/xaa/xaalocal.h
index 5e3d373c6..129c1d6c4 100644
--- a/xorg-server/hw/xfree86/xaa/xaalocal.h
+++ b/xorg-server/hw/xfree86/xaa/xaalocal.h
@@ -10,9 +10,7 @@
 #include "xf86fbman.h"
 #include "xaa.h"
 #include "mi.h"
-#ifdef RENDER
 #include "picturestr.h"
-#endif
 
 #define GCWhenForced		(GCArcMode << 1)
 
@@ -55,10 +53,8 @@ typedef struct _XAAScreen {
    void                		(*LeaveVT)(int, int);
    int				(*SetDGAMode)(int, int, DGADevicePtr);
    void				(*EnableDisableFBAccess)(int, Bool);
-#ifdef RENDER
     CompositeProcPtr            Composite;
     GlyphsProcPtr               Glyphs;
-#endif
 } XAAScreenRec, *XAAScreenPtr;
 
 #define	OPS_ARE_PIXMAP		0x00000001
@@ -1539,7 +1535,6 @@ extern _X_EXPORT void XAARemoveAreaCallback(FBAreaPtr area);
 extern _X_EXPORT void XAAMoveOutOffscreenPixmap(PixmapPtr pPix);
 extern _X_EXPORT Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec);
 
-#ifdef RENDER
 extern _X_EXPORT void
 XAAComposite (CARD8      op,
 	      PicturePtr pSrc,
@@ -1627,8 +1622,6 @@ XAAGetPixelFromRGBA (
     CARD32 format
 );
 
-#endif
-
 /* XXX should be static */
 extern _X_EXPORT GCOps XAAFallbackOps;
 extern _X_EXPORT GCOps *XAAGetFallbackOps(void);
diff --git a/xorg-server/hw/xfree86/xaa/xaawrap.h b/xorg-server/hw/xfree86/xaa/xaawrap.h
index 857dbc3ed..86ba003d6 100644
--- a/xorg-server/hw/xfree86/xaa/xaawrap.h
+++ b/xorg-server/hw/xfree86/xaa/xaawrap.h
@@ -61,14 +61,12 @@
 #include <xorg-config.h>
 #endif
 
-#ifdef RENDER
 #define XAA_RENDER_PROLOGUE(pScreen,field)\
     (GetPictureScreen(pScreen)->field = \
      ((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)
 
 #define XAA_RENDER_EPILOGUE(pScreen, field, wrapper)\
     (GetPictureScreen(pScreen)->field = wrapper)
-#endif
 
 /* This also works fine for drawables */