xserver randrproto mesa xkeyboard-config git update 25 Feb 2011

10 files changed, 10748 insertions, 11173 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index 8f61c4c72..1a5bf8a1c 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -1,2052 +1,2048 @@
-/*

- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.

- *

- * 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-/*

- * Authors: Dirk Hohndel <hohndel@XFree86.Org>

- *          David Dawes <dawes@XFree86.Org>

- *          ... and others

- *

- * This file includes the helper functions that the server provides for

- * different drivers.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include "os.h"

-#include "servermd.h"

-#include "pixmapstr.h"

-#include "windowstr.h"

-#include "propertyst.h"

-#include "gcstruct.h"

-#include "loaderProcs.h"

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-#include "micmap.h"

-#include "xf86DDC.h"

-#include "xf86Xinput.h"

-#include "xf86InPriv.h"

-#include "mivalidate.h"

-#include "xf86Crtc.h"

-

-/* For xf86GetClocks */

-#if defined(CSRG_BASED) || defined(__GNU__)

-#define HAS_SETPRIORITY

-#include <sys/resource.h>

-#endif

-

-static int xf86ScrnInfoPrivateCount = 0;

-

-

-/* Add a pointer to a new DriverRec to xf86DriverList */

-

-void

-xf86AddDriver(DriverPtr driver, pointer module, int flags)

-{

-    /* Don't add null entries */

-    if (!driver)

-	return;

-

-    if (xf86DriverList == NULL)

-	xf86NumDrivers = 0;

-

-    xf86NumDrivers++;

-    xf86DriverList = xnfrealloc(xf86DriverList,

-				xf86NumDrivers * sizeof(DriverPtr));

-    xf86DriverList[xf86NumDrivers - 1] = xnfalloc(sizeof(DriverRec));

-    if (flags & HaveDriverFuncs)

-	*xf86DriverList[xf86NumDrivers - 1] = *driver;

-    else {

-	(void) memset( xf86DriverList[xf86NumDrivers - 1], 0,

-		       sizeof( DriverRec ) );

-	(void) memcpy( xf86DriverList[xf86NumDrivers - 1], driver,

-		       sizeof(DriverRec1));

-

-    }

-    xf86DriverList[xf86NumDrivers - 1]->module = module;

-    xf86DriverList[xf86NumDrivers - 1]->refCount = 0;

-}

-

-void

-xf86DeleteDriver(int drvIndex)

-{

-    if (xf86DriverList[drvIndex]

-	&& (!xf86DriverHasEntities(xf86DriverList[drvIndex]))) {

-	if (xf86DriverList[drvIndex]->module)

-	    UnloadModule(xf86DriverList[drvIndex]->module);

-	free(xf86DriverList[drvIndex]);

-	xf86DriverList[drvIndex] = NULL;

-    }

-}

-

-/* Add a pointer to a new InputDriverRec to xf86InputDriverList */

-

-void

-xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags)

-{

-    /* Don't add null entries */

-    if (!driver)

-	return;

-

-    if (xf86InputDriverList == NULL)

-	xf86NumInputDrivers = 0;

-

-    xf86NumInputDrivers++;

-    xf86InputDriverList = xnfrealloc(xf86InputDriverList,

-				xf86NumInputDrivers * sizeof(InputDriverPtr));

-    xf86InputDriverList[xf86NumInputDrivers - 1] =

-				xnfalloc(sizeof(InputDriverRec));

-    *xf86InputDriverList[xf86NumInputDrivers - 1] = *driver;

-    xf86InputDriverList[xf86NumInputDrivers - 1]->module = module;

-}

-

-void

-xf86DeleteInputDriver(int drvIndex)

-{

-    if (xf86InputDriverList[drvIndex] && xf86InputDriverList[drvIndex]->module)

-	UnloadModule(xf86InputDriverList[drvIndex]->module);

-    free(xf86InputDriverList[drvIndex]);

-    xf86InputDriverList[drvIndex] = NULL;

-}

-

-InputDriverPtr

-xf86LookupInputDriver(const char *name)

-{

-    int i;

-

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

-       if (xf86InputDriverList[i] && xf86InputDriverList[i]->driverName &&

-           xf86NameCmp(name, xf86InputDriverList[i]->driverName) == 0)

-           return xf86InputDriverList[i];

-    }

-    return NULL;

-}

-

-InputInfoPtr

-xf86LookupInput(const char *name)

-{

-    InputInfoPtr p;

-

-    for (p = xf86InputDevs; p != NULL; p = p->next) {

-        if (strcmp(name, p->name) == 0)

-            return p;

-    }

-

-    return NULL;

-}

-

-/* Allocate a new ScrnInfoRec in xf86Screens */

-

-ScrnInfoPtr

-xf86AllocateScreen(DriverPtr drv, int flags)

-{

-    int i;

-

-    if (xf86Screens == NULL)

-	xf86NumScreens = 0;

-

-    i = xf86NumScreens++;

-    xf86Screens = xnfrealloc(xf86Screens, xf86NumScreens * sizeof(ScrnInfoPtr));

-    xf86Screens[i] = xnfcalloc(sizeof(ScrnInfoRec), 1);

-    xf86Screens[i]->scrnIndex = i;	/* Changes when a screen is removed */

-    xf86Screens[i]->origIndex = i;	/* This never changes */

-    xf86Screens[i]->privates = xnfcalloc(sizeof(DevUnion),

-					 xf86ScrnInfoPrivateCount);

-    /*

-     * EnableDisableFBAccess now gets initialized in InitOutput()

-     * xf86Screens[i]->EnableDisableFBAccess = xf86EnableDisableFBAccess;

-     */

-

-    xf86Screens[i]->drv = drv;

-    drv->refCount++;

-    xf86Screens[i]->module = DuplicateModule(drv->module, NULL);

-

-    xf86Screens[i]->DriverFunc = drv->driverFunc;

-

-    return xf86Screens[i];

-}

-

-

-/*

- * Remove an entry from xf86Screens.  Ideally it should free all allocated

- * data.  To do this properly may require a driver hook.

- */

-

-void

-xf86DeleteScreen(int scrnIndex, int flags)

-{

-    ScrnInfoPtr pScrn;

-    int i;

-

-    /* First check if the screen is valid */

-    if (xf86NumScreens == 0 || xf86Screens == NULL)

-	return;

-

-    if (scrnIndex > xf86NumScreens - 1)

-	return;

-

-    if (!(pScrn = xf86Screens[scrnIndex]))

-	return;

-

-    /* If a FreeScreen function is defined, call it here */

-    if (pScrn->FreeScreen != NULL)

-	pScrn->FreeScreen(scrnIndex, 0);

-

-    while (pScrn->modes)

-	xf86DeleteMode(&pScrn->modes, pScrn->modes);

-

-    while (pScrn->modePool)

-	xf86DeleteMode(&pScrn->modePool, pScrn->modePool);

-

-    xf86OptionListFree(pScrn->options);

-

-    if (pScrn->module)

-	UnloadModule(pScrn->module);

-

-    if (pScrn->drv)

-	pScrn->drv->refCount--;

-

-    free(pScrn->privates);

-

-    xf86ClearEntityListForScreen(scrnIndex);

-

-    free(pScrn);

-

-    /* Move the other entries down, updating their scrnIndex fields */

-

-    xf86NumScreens--;

-

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

-	xf86Screens[i] = xf86Screens[i + 1];

-	xf86Screens[i]->scrnIndex = i;

-	/* Also need to take care of the screen layout settings */

-    }

-}

-

-/*

- * Allocate a private in ScrnInfoRec.

- */

-

-int

-xf86AllocateScrnInfoPrivateIndex(void)

-{

-    int idx, i;

-    ScrnInfoPtr pScr;

-    DevUnion *nprivs;

-

-    idx = xf86ScrnInfoPrivateCount++;

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

-	pScr = xf86Screens[i];

-	nprivs = xnfrealloc(pScr->privates,

-			    xf86ScrnInfoPrivateCount * sizeof(DevUnion));

-	/* Zero the new private */

-	memset(&nprivs[idx], 0, sizeof(DevUnion));

-	pScr->privates = nprivs;

-    }

-    return idx;

-}

-

-Bool

-xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad)

-{

-    int i;

-

-    if (pScrn->numFormats >= MAXFORMATS)

-	return FALSE;

-

-    if (bpp <= 0) {

-	if (depth == 1)

-	    bpp = 1;

-	else if (depth <= 8)

-	    bpp = 8;

-	else if (depth <= 16)

-	    bpp = 16;

-	else if (depth <= 32)

-	    bpp = 32;

-	else

-	    return FALSE;

-    }

-    if (pad <= 0)

-	pad = BITMAP_SCANLINE_PAD;

-

-    i = pScrn->numFormats++;

-    pScrn->formats[i].depth = depth;

-    pScrn->formats[i].bitsPerPixel = bpp;

-    pScrn->formats[i].scanlinePad = pad;

-    return TRUE;

-}

-

-/*

- * Set the depth we are using based on (in the following order of preference):

- *  - values given on the command line

- *  - values given in the config file

- *  - values provided by the driver

- *  - an overall default when nothing else is given

- *

- * Also find a Display subsection matching the depth/bpp found.

- *

- * Sets the following ScrnInfoRec fields:

- *     bitsPerPixel, pixmap24, depth, display, imageByteOrder,

- *     bitmapScanlinePad, bitmapScanlineUnit, bitmapBitOrder, numFormats,

- *     formats, fbFormat.

- */

-

-/* Can the screen handle 24 bpp pixmaps */

-#define DO_PIX24(f) ((f & Support24bppFb) || \

-		     ((f & Support32bppFb) && (f & SupportConvert24to32)))

-

-/* Can the screen handle 32 bpp pixmaps */

-#define DO_PIX32(f) ((f & Support32bppFb) || \

-		     ((f & Support24bppFb) && (f & SupportConvert32to24)))

-

-/* Does the screen prefer 32bpp fb for 24bpp pixmaps */

-#define CHOOSE32FOR24(f) ((f & Support32bppFb) && (f & SupportConvert24to32) \

-			  && (f & PreferConvert24to32))

-

-/* Does the screen prefer 24bpp fb for 32bpp pixmaps */

-#define CHOOSE24FOR32(f) ((f & Support24bppFb) && (f & SupportConvert32to24) \

-			  && (f & PreferConvert32to24))

-

-/* Can the screen handle 32bpp pixmaps for 24bpp fb */

-#define DO_PIX32FOR24(f) ((f & Support24bppFb) && (f & SupportConvert32to24))

-

-/* Can the screen handle 24bpp pixmaps for 32bpp fb */

-#define DO_PIX24FOR32(f) ((f & Support32bppFb) && (f & SupportConvert24to32))

-

-#ifndef GLOBAL_DEFAULT_DEPTH

-#define GLOBAL_DEFAULT_DEPTH 24

-#endif

-

-Bool

-xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,

-		int depth24flags)

-{

-    int i;

-    DispPtr disp;

-    Pix24Flags pix24 = xf86Info.pixmap24;

-    Bool nomatch = FALSE;

-

-    scrp->bitsPerPixel = -1;

-    scrp->depth = -1;

-    scrp->pixmap24 = Pix24DontCare;

-    scrp->bitsPerPixelFrom = X_DEFAULT;

-    scrp->depthFrom = X_DEFAULT;

-

-    if (xf86FbBpp > 0) {

-	scrp->bitsPerPixel = xf86FbBpp;

-	scrp->bitsPerPixelFrom = X_CMDLINE;

-    }

-

-    if (xf86Depth > 0) {

-	scrp->depth = xf86Depth;

-	scrp->depthFrom = X_CMDLINE;

-    }

-

-    if (xf86FbBpp < 0 && xf86Depth < 0) {

-	if (scrp->confScreen->defaultfbbpp > 0) {

-	    scrp->bitsPerPixel = scrp->confScreen->defaultfbbpp;

-	    scrp->bitsPerPixelFrom = X_CONFIG;

-	}

-	if (scrp->confScreen->defaultdepth > 0) {

-	    scrp->depth = scrp->confScreen->defaultdepth;

-	    scrp->depthFrom = X_CONFIG;

-	}

-

-	if (scrp->confScreen->defaultfbbpp <= 0 &&

-	    scrp->confScreen->defaultdepth <= 0) {

-	    /*

-	     * Check for DefaultDepth and DefaultFbBpp options in the

-	     * Device sections.

-	     */

-	    int i;

-	    GDevPtr device;

-	    Bool found = FALSE;

-

-	    for (i = 0; i < scrp->numEntities; i++) {

-		device = xf86GetDevFromEntity(scrp->entityList[i],

-					      scrp->entityInstanceList[i]);

-		if (device && device->options) {

-		    if (xf86FindOption(device->options, "DefaultDepth")) {

-			scrp->depth = xf86SetIntOption(device->options,

-						       "DefaultDepth", -1);

-			scrp->depthFrom = X_CONFIG;

-			found = TRUE;

-		    }

-		    if (xf86FindOption(device->options, "DefaultFbBpp")) {

-			scrp->bitsPerPixel = xf86SetIntOption(device->options,

-							      "DefaultFbBpp",

-							      -1);

-			scrp->bitsPerPixelFrom = X_CONFIG;

-			found = TRUE;

-		    }

-		}

-		if (found)

-		    break;

-	    }

-	}

-    }

-

-    /* If none of these is set, pick a default */

-    if (scrp->bitsPerPixel < 0 && scrp->depth < 0) {

-        if (fbbpp > 0 || depth > 0) {

-	    if (fbbpp > 0)

-		scrp->bitsPerPixel = fbbpp;

-	    if (depth > 0)

-		scrp->depth = depth;

-	} else {

-	    scrp->depth = GLOBAL_DEFAULT_DEPTH;

-	}

-    }

-

-    /* If any are not given, determine a default for the others */

-

-    if (scrp->bitsPerPixel < 0) {

-	/* The depth must be set */

-	if (scrp->depth > -1) {

-	    if (scrp->depth == 1)

-		scrp->bitsPerPixel = 1;

-	    else if (scrp->depth <= 4)

-		scrp->bitsPerPixel = 4;

-	    else if (scrp->depth <= 8)

-		scrp->bitsPerPixel = 8;

-	    else if (scrp->depth <= 16)

-		scrp->bitsPerPixel = 16;

-	    else if (scrp->depth <= 24) {

-		/*

-		 * Figure out if a choice is possible based on the depth24

-		 * and pix24 flags.

-		 */

-		/* Check pix24 first */

-		if (pix24 != Pix24DontCare) {

-		    if (pix24 == Pix24Use32) {

-			if (DO_PIX32(depth24flags)) {

-			    if (CHOOSE24FOR32(depth24flags))

-				scrp->bitsPerPixel = 24;

-			    else

-				scrp->bitsPerPixel = 32;

-			} else {

-			    nomatch = TRUE;

-			}

-		    } else if (pix24 == Pix24Use24) {

-			if (DO_PIX24(depth24flags)) {

-			    if (CHOOSE32FOR24(depth24flags))

-				scrp->bitsPerPixel = 32;

-			    else

-				scrp->bitsPerPixel = 24;

-			} else {

-			    nomatch = TRUE;

-			}

-		    }

-		} else {

-		    if (DO_PIX32(depth24flags)) {

-			if (CHOOSE24FOR32(depth24flags))

-			    scrp->bitsPerPixel = 24;

-			else

-			    scrp->bitsPerPixel = 32;

-		    } else if (DO_PIX24(depth24flags)) {

-			if (CHOOSE32FOR24(depth24flags))

-			    scrp->bitsPerPixel = 32;

-			else

-			    scrp->bitsPerPixel = 24;

-		    }

-		}

-	    } else if (scrp->depth <= 32)

-		scrp->bitsPerPixel = 32;

-	    else {

-		xf86DrvMsg(scrp->scrnIndex, X_ERROR,

-			   "Specified depth (%d) is greater than 32\n",

-			   scrp->depth);

-		return FALSE;

-	    }

-	} else {

-	    xf86DrvMsg(scrp->scrnIndex, X_ERROR,

-			"xf86SetDepthBpp: internal error: depth and fbbpp"

-			" are both not set\n");

-	    return FALSE;

-	}

-	if (scrp->bitsPerPixel < 0) {

-	    if (nomatch)

-		xf86DrvMsg(scrp->scrnIndex, X_ERROR,

-			"Driver can't support depth 24 pixmap format (%d)\n",

-			PIX24TOBPP(pix24));

-	    else if ((depth24flags & (Support24bppFb | Support32bppFb)) ==

-		     NoDepth24Support)

-		xf86DrvMsg(scrp->scrnIndex, X_ERROR,

-			"Driver can't support depth 24\n");

-	    else

-		xf86DrvMsg(scrp->scrnIndex, X_ERROR,

-			"Can't find fbbpp for depth 24\n");

-	    return FALSE;

-	}

-	scrp->bitsPerPixelFrom = X_PROBED;

-    }

-

-    if (scrp->depth <= 0) {

-	/* bitsPerPixel is already set */

-	switch (scrp->bitsPerPixel) {

-	case 32:

-	    scrp->depth = 24;

-	    break;

-	default:

-	    /* 1, 4, 8, 16 and 24 */

-	    scrp->depth = scrp->bitsPerPixel;

-	    break;

-	}

-	scrp->depthFrom = X_PROBED;

-    }

-

-    /* Sanity checks */

-    if (scrp->depth < 1 || scrp->depth > 32) {

-	xf86DrvMsg(scrp->scrnIndex, X_ERROR,

-		   "Specified depth (%d) is not in the range 1-32\n",

-		    scrp->depth);

-	return FALSE;

-    }

-    switch (scrp->bitsPerPixel) {

-    case 1:

-    case 4:

-    case 8:

-    case 16:

-    case 24:

-    case 32:

-	break;

-    default:

-	xf86DrvMsg(scrp->scrnIndex, X_ERROR,

-		   "Specified fbbpp (%d) is not a permitted value\n",

-		   scrp->bitsPerPixel);

-	return FALSE;

-    }

-    if (scrp->depth > scrp->bitsPerPixel) {

-	xf86DrvMsg(scrp->scrnIndex, X_ERROR,

-		   "Specified depth (%d) is greater than the fbbpp (%d)\n",

-		   scrp->depth, scrp->bitsPerPixel);

-	return FALSE;

-    }

-

-    /* set scrp->pixmap24 if the driver isn't flexible */

-    if (scrp->bitsPerPixel == 24 && !DO_PIX32FOR24(depth24flags)) {

-	scrp->pixmap24 = Pix24Use24;

-    }

-    if (scrp->bitsPerPixel == 32 && !DO_PIX24FOR32(depth24flags)) {

-	scrp->pixmap24 = Pix24Use32;

-    }

-

-    /*

-     * Find the Display subsection matching the depth/fbbpp and initialise

-     * scrp->display with it.

-     */

-    for (i = 0, disp = scrp->confScreen->displays;

-	 i < scrp->confScreen->numdisplays; i++, disp++) {

-	if ((disp->depth == scrp->depth && disp->fbbpp == scrp->bitsPerPixel)

-	    || (disp->depth == scrp->depth && disp->fbbpp <= 0)

-	    || (disp->fbbpp == scrp->bitsPerPixel && disp->depth <= 0)) {

-	    scrp->display = disp;

-	    break;

-	}

-    }

-

-    /*

-     * If an exact match can't be found, see if there is one with no

-     * depth or fbbpp specified.

-     */

-    if (i == scrp->confScreen->numdisplays) {

-	for (i = 0, disp = scrp->confScreen->displays;

-	     i < scrp->confScreen->numdisplays; i++, disp++) {

-	    if (disp->depth <= 0 && disp->fbbpp <= 0) {

-		scrp->display = disp;

-		break;

-	    }

-	}

-    }

-

-    /*

-     * If all else fails, create a default one.

-     */

-    if (i == scrp->confScreen->numdisplays) {

-	scrp->confScreen->numdisplays++;

-	scrp->confScreen->displays =

-		xnfrealloc(scrp->confScreen->displays,

-			   scrp->confScreen->numdisplays * sizeof(DispRec));

-	xf86DrvMsg(scrp->scrnIndex, X_INFO,

-		   "Creating default Display subsection in Screen section\n"

-		   "\t\"%s\" for depth/fbbpp %d/%d\n",

-		   scrp->confScreen->id, scrp->depth, scrp->bitsPerPixel);

-	memset(&scrp->confScreen->displays[i], 0, sizeof(DispRec));

-	scrp->confScreen->displays[i].blackColour.red = -1;

-	scrp->confScreen->displays[i].blackColour.green = -1;

-	scrp->confScreen->displays[i].blackColour.blue = -1;

-	scrp->confScreen->displays[i].whiteColour.red = -1;

-	scrp->confScreen->displays[i].whiteColour.green = -1;

-	scrp->confScreen->displays[i].whiteColour.blue = -1;

-	scrp->confScreen->displays[i].defaultVisual = -1;

-	scrp->confScreen->displays[i].modes = xnfalloc(sizeof(char *));

-	scrp->confScreen->displays[i].modes[0] = NULL;

-	scrp->confScreen->displays[i].depth = depth;

-	scrp->confScreen->displays[i].fbbpp = fbbpp;

-	scrp->display = &scrp->confScreen->displays[i];

-    }

-

-    /*

-     * Setup defaults for the display-wide attributes the framebuffer will

-     * need.  These defaults should eventually be set globally, and not

-     * dependent on the screens.

-     */

-    scrp->imageByteOrder = IMAGE_BYTE_ORDER;

-    scrp->bitmapScanlinePad = BITMAP_SCANLINE_PAD;

-    if (scrp->depth < 8) {

-	/* Planar modes need these settings */

-	scrp->bitmapScanlineUnit = 8;

-	scrp->bitmapBitOrder = MSBFirst;

-    } else {

-	scrp->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;

-	scrp->bitmapBitOrder = BITMAP_BIT_ORDER;

-    }

-

-    /*

-     * If an unusual depth is required, add it to scrp->formats.  The formats

-     * for the common depths are handled globally in InitOutput

-     */

-    switch (scrp->depth) {

-    case 1:

-    case 4:

-    case 8:

-    case 15:

-    case 16:

-    case 24:

-	/* Common depths.  Nothing to do for them */

-	break;

-    default:

-	if (!xf86AddPixFormat(scrp, scrp->depth, 0, 0)) {

-	    xf86DrvMsg(scrp->scrnIndex, X_ERROR,

-		       "Can't add pixmap format for depth %d\n", scrp->depth);

-	    return FALSE;

-	}

-    }

-

-    /* Initialise the framebuffer format for this screen */

-    scrp->fbFormat.depth = scrp->depth;

-    scrp->fbFormat.bitsPerPixel = scrp->bitsPerPixel;

-    scrp->fbFormat.scanlinePad = BITMAP_SCANLINE_PAD;

-

-    return TRUE;

-}

-

-/*

- * Print out the selected depth and bpp.

- */

-void

-xf86PrintDepthBpp(ScrnInfoPtr scrp)

-{

-    xf86DrvMsg(scrp->scrnIndex, scrp->depthFrom, "Depth %d, ", scrp->depth);

-    xf86Msg(scrp->bitsPerPixelFrom, "framebuffer bpp %d\n", scrp->bitsPerPixel);

-}

-

-/*

- * xf86SetWeight sets scrp->weight, scrp->mask, scrp->offset, and for depths

- * greater than MAX_PSEUDO_DEPTH also scrp->rgbBits.

- */

-Bool

-xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask)

-{

-    MessageType weightFrom = X_DEFAULT;

-

-    scrp->weight.red = 0;

-    scrp->weight.green = 0;

-    scrp->weight.blue = 0;

-

-    if (xf86Weight.red > 0 && xf86Weight.green > 0 && xf86Weight.blue > 0) {

-	scrp->weight = xf86Weight;

-	weightFrom = X_CMDLINE;

-    } else if (scrp->display->weight.red > 0 && scrp->display->weight.green > 0

-	       && scrp->display->weight.blue > 0) {

-	scrp->weight = scrp->display->weight;

-	weightFrom = X_CONFIG;

-    } else if (weight.red > 0 && weight.green > 0 && weight.blue > 0) {

-	scrp->weight = weight;

-    } else {

-	switch (scrp->depth) {

-	case 1:

-	case 4:

-	case 8:

-	    scrp->weight.red = scrp->weight.green =

-		scrp->weight.blue = scrp->rgbBits;

-	    break;

-	case 15:

-	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 5;

-	    break;

-	case 16:

-	    scrp->weight.red = scrp->weight.blue = 5;

-	    scrp->weight.green = 6;

-	    break;

-	case 18:

-	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 6;

-	    break;

-	case 24:

-	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 8;

-	    break;

-	case 30:

-	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 10;

-	    break;

-	}

-    }

-

-    if (scrp->weight.red)

-	xf86DrvMsg(scrp->scrnIndex, weightFrom, "RGB weight %d%d%d\n",

-		   (int)scrp->weight.red, (int)scrp->weight.green,

-		   (int)scrp->weight.blue);

-

-    if (scrp->depth > MAX_PSEUDO_DEPTH &&

-	(scrp->depth != scrp->weight.red + scrp->weight.green +

-			scrp->weight.blue)) {

-	xf86DrvMsg(scrp->scrnIndex, X_ERROR,

-		   "Weight given (%d%d%d) is inconsistent with the "

-		   "depth (%d)\n",

-		   (int)scrp->weight.red, (int)scrp->weight.green,

-		   (int)scrp->weight.blue, scrp->depth);

-	return FALSE;

-    }

-    if (scrp->depth > MAX_PSEUDO_DEPTH && scrp->weight.red) {

-	/*

-	 * XXX Does this even mean anything for TrueColor visuals?

-	 * If not, we shouldn't even be setting it here.  However, this

-	 * matches the behaviour of 3.x versions of XFree86.

-	 */

-	scrp->rgbBits = scrp->weight.red;

-	if (scrp->weight.green > scrp->rgbBits)

-	    scrp->rgbBits = scrp->weight.green;

-	if (scrp->weight.blue > scrp->rgbBits)

-	    scrp->rgbBits = scrp->weight.blue;

-    }

-

-    /* Set the mask and offsets */

-    if (mask.red == 0 || mask.green == 0 || mask.blue == 0) {

-	/* Default to a setting common to PC hardware */

-	scrp->offset.red = scrp->weight.green + scrp->weight.blue;

-	scrp->offset.green = scrp->weight.blue;

-	scrp->offset.blue = 0;

-	scrp->mask.red = ((1 << scrp->weight.red) - 1) << scrp->offset.red;

-	scrp->mask.green = ((1 << scrp->weight.green) - 1)

-				<< scrp->offset.green;

-	scrp->mask.blue = (1 << scrp->weight.blue) - 1;

-    } else {

-	/* Initialise to the values passed */

-	scrp->mask.red = mask.red;

-	scrp->mask.green = mask.green;

-	scrp->mask.blue = mask.blue;

-	scrp->offset.red = ffs(mask.red);

-	scrp->offset.green = ffs(mask.green);

-	scrp->offset.blue = ffs(mask.blue);

-    }

-    return TRUE;

-}

-

-Bool

-xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual)

-{

-    MessageType visualFrom = X_DEFAULT;

-

-    if (defaultColorVisualClass >= 0) {

-	scrp->defaultVisual = defaultColorVisualClass;

-	visualFrom = X_CMDLINE;

-    } else if (scrp->display->defaultVisual >= 0) {

-	scrp->defaultVisual = scrp->display->defaultVisual;

-	visualFrom = X_CONFIG;

-    } else if (visual >= 0) {

-	scrp->defaultVisual = visual;

-    } else {

-	if (scrp->depth == 1)

-	    scrp->defaultVisual = StaticGray;

-	else if (scrp->depth == 4)

-	    scrp->defaultVisual = StaticColor;

-	else if (scrp->depth <= MAX_PSEUDO_DEPTH)

-	    scrp->defaultVisual = PseudoColor;

-	else

-	    scrp->defaultVisual = TrueColor;

-    }

-    switch (scrp->defaultVisual) {

-    case StaticGray:

-    case GrayScale:

-    case StaticColor:

-    case PseudoColor:

-    case TrueColor:

-    case DirectColor:

-	xf86DrvMsg(scrp->scrnIndex, visualFrom, "Default visual is %s\n",

-		   xf86VisualNames[scrp->defaultVisual]);

-	    return TRUE;

-    default:

-

-	xf86DrvMsg(scrp->scrnIndex, X_ERROR,

-		   "Invalid default visual class (%d)\n", scrp->defaultVisual);

-	return FALSE;

-    }

-}

-

-#define TEST_GAMMA(g) \

-	(g).red > GAMMA_ZERO || (g).green > GAMMA_ZERO || (g).blue > GAMMA_ZERO

-

-#define SET_GAMMA(g) \

-	(g) > GAMMA_ZERO ? (g) : 1.0

-

-Bool

-xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma)

-{

-    MessageType from = X_DEFAULT;

-#if 0

-    xf86MonPtr DDC = (xf86MonPtr)(scrp->monitor->DDC);

-#endif

-    if (TEST_GAMMA(xf86Gamma)) {

-	from = X_CMDLINE;

-	scrp->gamma.red = SET_GAMMA(xf86Gamma.red);

-	scrp->gamma.green = SET_GAMMA(xf86Gamma.green);

-	scrp->gamma.blue = SET_GAMMA(xf86Gamma.blue);

-    } else if (TEST_GAMMA(scrp->monitor->gamma)) {

-	from = X_CONFIG;

-	scrp->gamma.red = SET_GAMMA(scrp->monitor->gamma.red);

-	scrp->gamma.green = SET_GAMMA(scrp->monitor->gamma.green);

-	scrp->gamma.blue = SET_GAMMA(scrp->monitor->gamma.blue);

-#if 0

-    } else if ( DDC && DDC->features.gamma > GAMMA_ZERO ) {

-        from = X_PROBED;

-	scrp->gamma.red = SET_GAMMA(DDC->features.gamma);

-	scrp->gamma.green = SET_GAMMA(DDC->features.gamma);

-	scrp->gamma.blue = SET_GAMMA(DDC->features.gamma);

-	/* EDID structure version 2 gives optional seperate red, green & blue gamma values

-	 * in bytes 0x57-0x59 */

-#endif

-    } else if (TEST_GAMMA(gamma)) {

-	scrp->gamma.red = SET_GAMMA(gamma.red);

-	scrp->gamma.green = SET_GAMMA(gamma.green);

-	scrp->gamma.blue = SET_GAMMA(gamma.blue);

-    } else {

-	scrp->gamma.red = 1.0;

-	scrp->gamma.green = 1.0;

-	scrp->gamma.blue = 1.0;

-    }

-    /* Pretend we succeeded if we support better a gamma system.

-     * This avoids a confusing message.

-     */

-    if (xf86_crtc_supports_gamma(scrp))

-	return TRUE;

-    xf86DrvMsg(scrp->scrnIndex, from,

-	       "Using gamma correction (%.1f, %.1f, %.1f)\n",

-	       scrp->gamma.red, scrp->gamma.green, scrp->gamma.blue);

-

-    return TRUE;

-}

-

-#undef TEST_GAMMA

-#undef SET_GAMMA

-

-

-/*

- * Set the DPI from the command line option.  XXX should allow it to be

- * calculated from the widthmm/heightmm values.

- */

-

-#undef MMPERINCH

-#define MMPERINCH 25.4

-

-void

-xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)

-{

-    MessageType from = X_DEFAULT;

-    xf86MonPtr DDC = (xf86MonPtr)(pScrn->monitor->DDC);

-    int ddcWidthmm, ddcHeightmm;

-    int widthErr, heightErr;

-

-    /* XXX Maybe there is no need for widthmm/heightmm in ScrnInfoRec */

-    pScrn->widthmm = pScrn->monitor->widthmm;

-    pScrn->heightmm = pScrn->monitor->heightmm;

-

-    if (DDC && (DDC->features.hsize > 0 && DDC->features.vsize > 0) ) {

-      /* DDC gives display size in mm for individual modes,

-       * but cm for monitor

-       */

-      ddcWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */

-      ddcHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */

-    } else {

-      ddcWidthmm = ddcHeightmm = 0;

-    }

-

-    if (monitorResolution > 0) {

-	pScrn->xDpi = monitorResolution;

-	pScrn->yDpi = monitorResolution;

-	from = X_CMDLINE;

-    } else if (pScrn->widthmm > 0 || pScrn->heightmm > 0) {

-	from = X_CONFIG;

-	if (pScrn->widthmm > 0) {

-	   pScrn->xDpi =

-		(int)((double)pScrn->virtualX * MMPERINCH / pScrn->widthmm);

-	}

-	if (pScrn->heightmm > 0) {

-	   pScrn->yDpi =

-		(int)((double)pScrn->virtualY * MMPERINCH / pScrn->heightmm);

-	}

-	if (pScrn->xDpi > 0 && pScrn->yDpi <= 0)

-	    pScrn->yDpi = pScrn->xDpi;

-	if (pScrn->yDpi > 0 && pScrn->xDpi <= 0)

-	    pScrn->xDpi = pScrn->yDpi;

-	xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n",

-		   pScrn->widthmm, pScrn->heightmm);

-

-	/* Warn if config and probe disagree about display size */

-	if ( ddcWidthmm && ddcHeightmm ) {

-	  if (pScrn->widthmm > 0) {

-	    widthErr  = abs(ddcWidthmm  - pScrn->widthmm);

-	  } else {

-	    widthErr  = 0;

-	  }

-	  if (pScrn->heightmm > 0) {

-	    heightErr = abs(ddcHeightmm - pScrn->heightmm);

-	  } else {

-	    heightErr = 0;

-	  }

-	  if (widthErr>10 || heightErr>10) {

-	    /* Should include config file name for monitor here */

-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,

-		       "Probed monitor is %dx%d mm, using Displaysize %dx%d mm\n",

-		       ddcWidthmm,ddcHeightmm, pScrn->widthmm,pScrn->heightmm);

-	  }

-	}

-    } else if ( ddcWidthmm && ddcHeightmm ) {

-	from = X_PROBED;

-	xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n",

-		   ddcWidthmm, ddcHeightmm );

-	pScrn->widthmm = ddcWidthmm;

-	pScrn->heightmm = ddcHeightmm;

-	if (pScrn->widthmm > 0) {

-	   pScrn->xDpi =

-		(int)((double)pScrn->virtualX * MMPERINCH / pScrn->widthmm);

-	}

-	if (pScrn->heightmm > 0) {

-	   pScrn->yDpi =

-		(int)((double)pScrn->virtualY * MMPERINCH / pScrn->heightmm);

-	}

-	if (pScrn->xDpi > 0 && pScrn->yDpi <= 0)

-	    pScrn->yDpi = pScrn->xDpi;

-	if (pScrn->yDpi > 0 && pScrn->xDpi <= 0)

-	    pScrn->xDpi = pScrn->yDpi;

-    } else {

-	if (x > 0)

-	    pScrn->xDpi = x;

-	else

-	    pScrn->xDpi = DEFAULT_DPI;

-	if (y > 0)

-	    pScrn->yDpi = y;

-	else

-	    pScrn->yDpi = DEFAULT_DPI;

-    }

-    xf86DrvMsg(pScrn->scrnIndex, from, "DPI set to (%d, %d)\n",

-	       pScrn->xDpi, pScrn->yDpi);

-}

-

-#undef MMPERINCH

-

-

-void

-xf86SetBlackWhitePixels(ScreenPtr pScreen)

-{

-    if (xf86FlipPixels) {

-	pScreen->whitePixel = 0;

-	pScreen->blackPixel = 1;

-    } else {

-	pScreen->whitePixel = 1;

-	pScreen->blackPixel = 0;

-    }

-}

-

-/*

- * xf86SetRootClip --

- *	Enable or disable rendering to the screen by

- *	setting the root clip list and revalidating

- *	all of the windows

- */

-

-static void

-xf86SetRootClip (ScreenPtr pScreen, Bool enable)

-{

-    WindowPtr	pWin = pScreen->root;

-    WindowPtr	pChild;

-    Bool	WasViewable = (Bool)(pWin->viewable);

-    Bool	anyMarked = FALSE;

-    WindowPtr   pLayerWin;

-    BoxRec	box;

-

-    if (WasViewable)

-    {

-	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)

-	{

-	    (void) (*pScreen->MarkOverlappedWindows)(pChild,

-						     pChild,

-						     &pLayerWin);

-	}

-	(*pScreen->MarkWindow) (pWin);

-	anyMarked = TRUE;

-	if (pWin->valdata)

-	{

-	    if (HasBorder (pWin))

-	    {

-		RegionPtr	borderVisible;

-

-		borderVisible = RegionCreate(NullBox, 1);

-		RegionSubtract(borderVisible,

-				&pWin->borderClip, &pWin->winSize);

-		pWin->valdata->before.borderVisible = borderVisible;

-	    }

-	    pWin->valdata->before.resized = TRUE;

-	}

-    }

-

-    /*

-     * Use REGION_BREAK to avoid optimizations in ValidateTree

-     * that assume the root borderClip can't change well, normally

-     * it doesn't...)

-     */

-    if (enable)

-    {

-	box.x1 = 0;

-	box.y1 = 0;

-	box.x2 = pScreen->width;

-	box.y2 = pScreen->height;

-	RegionInit(&pWin->winSize, &box, 1);

-	RegionInit(&pWin->borderSize, &box, 1);

-	if (WasViewable)

-	{

-	    PixmapPtr	pPixmap = (*pScreen->GetScreenPixmap) (pScreen);

-	    box.x2 = pPixmap->drawable.width;

-	    box.y2 = pPixmap->drawable.height;

-	    RegionReset(&pWin->borderClip, &box);

-	}

-	pWin->drawable.width = pScreen->width;

-	pWin->drawable.height = pScreen->height;

-        RegionBreak(&pWin->clipList);

-    }

-    else

-    {

-	RegionEmpty(&pWin->borderClip);

-	RegionBreak(&pWin->clipList);

-    }

-

-    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);

-

-    if (WasViewable)

-    {

-	if (pWin->firstChild)

-	{

-	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,

-							   pWin->firstChild,

-							   (WindowPtr *)NULL);

-	}

-	else

-	{

-	    (*pScreen->MarkWindow) (pWin);

-	    anyMarked = TRUE;

-	}

-

-

-	if (anyMarked)

-	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);

-    }

-

-    if (WasViewable)

-    {

-	if (anyMarked)

-	    (*pScreen->HandleExposures)(pWin);

-	if (anyMarked && pScreen->PostValidateTree)

-	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);

-    }

-    if (pWin->realized)

-	WindowsRestructured ();

-    FlushAllOutput ();

-}

-

-/*

- * Function to enable/disable access to the frame buffer

- *

- * This is used when VT switching and when entering/leaving DGA direct mode.

- *

- * This has been rewritten again to eliminate the saved pixmap.  The

- * devPrivate field in the screen pixmap is set to NULL to catch code

- * accidentally referencing the frame buffer while the X server is not

- * supposed to touch it.

- *

- * Here, we exchange the pixmap private data, rather than the pixmaps

- * themselves to avoid having to find and change any references to the screen

- * pixmap such as GC's, window privates etc.  This also means that this code

- * does not need to know exactly how the pixmap pixels are accessed.  Further,

- * this exchange is >not< done through the screen's ModifyPixmapHeader()

- * vector.  This means the called frame buffer code layers can determine

- * whether they are switched in or out by keeping track of the root pixmap's

- * private data, and therefore don't need to access pScrnInfo->vtSema.

- */

-void

-xf86EnableDisableFBAccess(int scrnIndex, Bool enable)

-{

-    ScrnInfoPtr pScrnInfo = xf86Screens[scrnIndex];

-    ScreenPtr pScreen = pScrnInfo->pScreen;

-    PixmapPtr pspix;

-

-    pspix = (*pScreen->GetScreenPixmap) (pScreen);

-    if (enable)

-    {

-	/*

-	 * Restore all of the clip lists on the screen

-	 */

-	if (!xf86Resetting)

-	    xf86SetRootClip (pScreen, TRUE);

-    }

-    else

-    {

-	/*

-	 * Empty all of the clip lists on the screen

-	 */

-	xf86SetRootClip (pScreen, FALSE);

-    }

-}

-

-/* Print driver messages in the standard format */

-

-#undef PREFIX_SIZE

-#define PREFIX_SIZE 14

-

-void

-xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format,

-		va_list args)

-{

-    char *tmpFormat;

-

-    /* Prefix the scrnIndex name to the format string. */

-    if (scrnIndex >= 0 && scrnIndex < xf86NumScreens &&

-	xf86Screens[scrnIndex]->name) {

-	tmpFormat = malloc(strlen(format) +

-			   strlen(xf86Screens[scrnIndex]->name) +

-			   PREFIX_SIZE + 1);

-	if (!tmpFormat)

-	    return;

-

-	snprintf(tmpFormat, PREFIX_SIZE + 1, "%s(%d): ",

-		 xf86Screens[scrnIndex]->name, scrnIndex);

-

-	strcat(tmpFormat, format);

-	LogVMessageVerb(type, verb, tmpFormat, args);

-	free(tmpFormat);

-    } else

-	LogVMessageVerb(type, verb, format, args);

-}

-#undef PREFIX_SIZE

-

-/* Print driver messages, with verbose level specified directly */

-void

-xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format,

-	       ...)

-{

-    va_list ap;

-

-    va_start(ap, format);

-    xf86VDrvMsgVerb(scrnIndex, type, verb, format, ap);

-    va_end(ap);

-}

-

-/* Print driver messages, with verbose level of 1 (default) */

-void

-xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)

-{

-    va_list ap;

-

-    va_start(ap, format);

-    xf86VDrvMsgVerb(scrnIndex, type, 1, format, ap);

-    va_end(ap);

-}

-

-/* Print input driver messages in the standard format of

-   <driver>: <device name>: <message> */

-void

-xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *format,

-		 va_list args)

-{

-    char *msg;

-

-    if (asprintf(&msg, "%s: %s: %s", dev->drv->driverName, dev->name, format)

-	== -1) {

-	LogVMessageVerb(type, verb, "%s", args);

-    } else {

-	LogVMessageVerb(type, verb, msg, args);

-	free(msg);

-    }

-}

-

-/* Print input driver message, with verbose level specified directly */

-void

-xf86IDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *format,

-	       ...)

-{

-    va_list ap;

-

-    va_start(ap, format);

-    xf86VIDrvMsgVerb(dev, type, verb, format, ap);

-    va_end(ap);

-}

-

-/* Print input driver messages, with verbose level of 1 (default) */

-void

-xf86IDrvMsg(InputInfoPtr dev, MessageType type, const char *format, ...)

-{

-    va_list ap;

-

-    va_start(ap, format);

-    xf86VIDrvMsgVerb(dev, type, 1, format, ap);

-    va_end(ap);

-}

-

-

-/* Print non-driver messages with verbose level specified directly */

-void

-xf86MsgVerb(MessageType type, int verb, const char *format, ...)

-{

-    va_list ap;

-

-    va_start(ap, format);

-    LogVMessageVerb(type, verb, format, ap);

-    va_end(ap);

-}

-

-/* Print non-driver messages with verbose level of 1 (default) */

-void

-xf86Msg(MessageType type, const char *format, ...)

-{

-    va_list ap;

-

-    va_start(ap, format);

-    LogVMessageVerb(type, 1, format, ap);

-    va_end(ap);

-}

-

-/* Just like ErrorF, but with the verbose level checked */

-void

-xf86ErrorFVerb(int verb, const char *format, ...)

-{

-    va_list ap;

-

-    va_start(ap, format);

-    if (xf86Verbose >= verb || xf86LogVerbose >= verb)

-	LogVWrite(verb, format, ap);

-    va_end(ap);

-}

-

-/* Like xf86ErrorFVerb, but with an implied verbose level of 1 */

-void

-xf86ErrorF(const char *format, ...)

-{

-    va_list ap;

-

-    va_start(ap, format);

-    if (xf86Verbose >= 1 || xf86LogVerbose >= 1)

-	LogVWrite(1, format, ap);

-    va_end(ap);

-}

-

-

-void

-xf86LogInit(void)

-{

-    char *lf = NULL;

-

-#define LOGSUFFIX ".log"

-#define LOGOLDSUFFIX ".old"

-

-    /* Get the log file name */

-    if (xf86LogFileFrom == X_DEFAULT) {

-	/* Append the display number and ".log" */

-	if (asprintf(&lf, "%s%%s" LOGSUFFIX, xf86LogFile) == -1)

-	    FatalError("Cannot allocate space for the log file name\n");

-	xf86LogFile = lf;

-    }

-

-    xf86LogFile = LogInit(xf86LogFile, LOGOLDSUFFIX);

-    xf86LogFileWasOpened = TRUE;

-

-    xf86SetVerbosity(xf86Verbose);

-    xf86SetLogVerbosity(xf86LogVerbose);

-

-#undef LOGSUFFIX

-#undef LOGOLDSUFFIX

-

-    free(lf);

-}

-

-void

-xf86CloseLog(void)

-{

-    LogClose();

-}

-

-

-/*

- * Drivers can use these for using their own SymTabRecs.

- */

-

-const char *

-xf86TokenToString(SymTabPtr table, int token)

-{

-    int i;

-

-    for (i = 0; table[i].token >= 0 && table[i].token != token; i++)

-	;

-

-    if (table[i].token < 0)

-	return NULL;

-    else

-	return table[i].name;

-}

-

-int

-xf86StringToToken(SymTabPtr table, const char *string)

-{

-    int i;

-

-    if (string == NULL)

-	return -1;

-

-    for (i = 0; table[i].token >= 0 && xf86NameCmp(string, table[i].name); i++)

-	;

-

-    return table[i].token;

-}

-

-/*

- * helper to display the clocks found on a card

- */

-void

-xf86ShowClocks(ScrnInfoPtr scrp, MessageType from)

-{

-    int j;

-

-    xf86DrvMsg(scrp->scrnIndex, from, "Pixel clocks available:");

-    for (j=0; j < scrp->numClocks; j++) {

-	if ((j % 4) == 0) {

-	    xf86ErrorF("\n");

-	    xf86DrvMsg(scrp->scrnIndex, from, "pixel clocks:");

-	}

-	xf86ErrorF(" %7.3f", (double)scrp->clock[j] / 1000.0);

-    }

-    xf86ErrorF("\n");

-}

-

-

-/*

- * This prints out the driver identify message, including the names of

- * the supported chipsets.

- *

- * XXX This makes assumptions about the line width, etc.  Maybe we could

- * use a more general "pretty print" function for messages.

- */

-void

-xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips)

-{

-    int len, i;

-

-    len = 6 + strlen(drvname) + 2 + strlen(drvmsg) + 2;

-    xf86Msg(X_INFO, "%s: %s:", drvname, drvmsg);

-    for (i = 0; chips[i].name != NULL; i++) {

-	if (i != 0) {

-	    xf86ErrorF(",");

-	    len++;

-	}

-	if (len + 2 + strlen(chips[i].name) < 78) {

-	    xf86ErrorF(" ");

-	    len++;

-	} else {

-	    xf86ErrorF("\n\t");

-	    len = 8;

-	}

-	xf86ErrorF("%s", chips[i].name);

-	len += strlen(chips[i].name);

-    }

-    xf86ErrorF("\n");

-}

-

-

-int

-xf86MatchDevice(const char *drivername, GDevPtr **sectlist)

-{

-    GDevPtr       gdp, *pgdp = NULL;

-    confScreenPtr screensecptr;

-    int i,j;

-

-    if (sectlist)

-	*sectlist = NULL;

-

-    /*

-     * This can happen when running Xorg -showopts and a module like ati

-     * or vmware tries to load its submodules when xf86ConfigLayout is empty

-     */

-    if (!xf86ConfigLayout.screens)

-	return 0;

-

-    /*

-     * This is a very important function that matches the device sections

-     * as they show up in the config file with the drivers that the server

-     * loads at run time.

-     *

-     * ChipProbe can call

-     * int xf86MatchDevice(char * drivername, GDevPtr ** sectlist)

-     * with its driver name. The function allocates an array of GDevPtr and

-     * returns this via sectlist and returns the number of elements in

-     * this list as return value. 0 means none found, -1 means fatal error.

-     *

-     * It can figure out which of the Device sections to use for which card

-     * (using things like the Card statement, etc). For single headed servers

-     * there will of course be just one such Device section.

-     */

-    i = 0;

-

-    /*

-     * first we need to loop over all the Screens sections to get to all

-     * 'active' device sections

-     */

-    for (j=0; xf86ConfigLayout.screens[j].screen != NULL; j++) {

-        screensecptr = xf86ConfigLayout.screens[j].screen;

-        if ((screensecptr->device->driver != NULL)

-            && (xf86NameCmp( screensecptr->device->driver,drivername) == 0)

-            && (! screensecptr->device->claimed)) {

-            /*

-             * we have a matching driver that wasn't claimed, yet

-             */

-            pgdp = xnfrealloc(pgdp, (i + 2) * sizeof(GDevPtr));

-            pgdp[i++] = screensecptr->device;

-        }

-    }

-

-    /* Then handle the inactive devices */

-    j = 0;

-    while (xf86ConfigLayout.inactives[j].identifier) {

-	gdp = &xf86ConfigLayout.inactives[j];

-	if (gdp->driver && !gdp->claimed &&

-	    !xf86NameCmp(gdp->driver,drivername)) {

-	    /* we have a matching driver that wasn't claimed yet */

-	    pgdp = xnfrealloc(pgdp, (i + 2) * sizeof(GDevPtr));

-	    pgdp[i++] = gdp;

-	}

-	j++;

-    }

-

-    /*

-     * make the array NULL terminated and return its address

-     */

-    if (i)

-        pgdp[i] = NULL;

-

-    if (sectlist)

-	*sectlist = pgdp;

-    else

-	free(pgdp);

-    return i;

-}

-

-/*

- * xf86GetClocks -- get the dot-clocks via a BIG BAD hack ...

- */

-void

-xf86GetClocks(ScrnInfoPtr pScrn, int num, Bool (*ClockFunc)(ScrnInfoPtr, int),

-	      void (*ProtectRegs)(ScrnInfoPtr, Bool),

-	      void (*BlankScreen)(ScrnInfoPtr, Bool), IOADDRESS vertsyncreg,

-	      int maskval, int knownclkindex, int knownclkvalue)

-{

-    register int status = vertsyncreg;

-    unsigned long i, cnt, rcnt, sync;

-

-    /* First save registers that get written on */

-    (*ClockFunc)(pScrn, CLK_REG_SAVE);

-

-    if (num > MAXCLOCKS)

-	num = MAXCLOCKS;

-

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

-    {

-	if (ProtectRegs)

-	    (*ProtectRegs)(pScrn, TRUE);

-	if (!(*ClockFunc)(pScrn, i))

-	{

-	    pScrn->clock[i] = -1;

-	    continue;

-	}

-	if (ProtectRegs)

-	    (*ProtectRegs)(pScrn, FALSE);

-	if (BlankScreen)

-	    (*BlankScreen)(pScrn, FALSE);

-

-    	usleep(50000);     /* let VCO stabilise */

-

-    	cnt  = 0;

-    	sync = 200000;

-

-	while ((inb(status) & maskval) == 0x00)

-	    if (sync-- == 0) goto finish;

-	/* Something appears to be happening, so reset sync count */

-	sync = 200000;

-	while ((inb(status) & maskval) == maskval)

-	    if (sync-- == 0) goto finish;

-	/* Something appears to be happening, so reset sync count */

-	sync = 200000;

-	while ((inb(status) & maskval) == 0x00)

-	    if (sync-- == 0) goto finish;

-

-	for (rcnt = 0; rcnt < 5; rcnt++)

-	{

-	    while (!(inb(status) & maskval))

-		cnt++;

-	    while ((inb(status) & maskval))

-		cnt++;

-	}

-

-finish:

-	pScrn->clock[i] = cnt ? cnt : -1;

-	if (BlankScreen)

-            (*BlankScreen)(pScrn, TRUE);

-    }

-

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

-    {

-	if (i != knownclkindex)

-	{

-	    if (pScrn->clock[i] == -1)

-	    {

-		pScrn->clock[i] = 0;

-	    }

-	    else

-	    {

-		pScrn->clock[i] = (int)(0.5 +

-                    (((float)knownclkvalue) * pScrn->clock[knownclkindex]) /

-	            (pScrn->clock[i]));

-		/* Round to nearest 10KHz */

-		pScrn->clock[i] += 5;

-		pScrn->clock[i] /= 10;

-		pScrn->clock[i] *= 10;

-	    }

-	}

-    }

-

-    pScrn->clock[knownclkindex] = knownclkvalue;

-    pScrn->numClocks = num;

-

-    /* Restore registers that were written on */

-    (*ClockFunc)(pScrn, CLK_REG_RESTORE);

-}

-

-const char *

-xf86GetVisualName(int visual)

-{

-    if (visual < 0 || visual > DirectColor)

-	return NULL;

-

-    return xf86VisualNames[visual];

-}

-

-

-int

-xf86GetVerbosity(void)

-{

-    return max(xf86Verbose, xf86LogVerbose);

-}

-

-Pix24Flags

-xf86GetPix24(void)

-{

-    return xf86Info.pixmap24;

-}

-

-

-int

-xf86GetDepth(void)

-{

-    return xf86Depth;

-}

-

-

-rgb

-xf86GetWeight(void)

-{

-    return xf86Weight;

-}

-

-

-Gamma

-xf86GetGamma(void)

-{

-    return xf86Gamma;

-}

-

-

-Bool

-xf86GetFlipPixels(void)

-{

-    return xf86FlipPixels;

-}

-

-

-const char *

-xf86GetServerName(void)

-{

-    return xf86ServerName;

-}

-

-

-Bool

-xf86ServerIsExiting(void)

-{

-    return (dispatchException & DE_TERMINATE) == DE_TERMINATE;

-}

-

-

-Bool

-xf86ServerIsResetting(void)

-{

-    return xf86Resetting;

-}

-

-

-Bool

-xf86ServerIsInitialising(void)

-{

-    return xf86Initialising;

-}

-

-

-Bool

-xf86ServerIsOnlyDetecting(void)

-{

-    return xf86DoConfigure;

-}

-

-

-Bool

-xf86CaughtSignal(void)

-{

-    return xf86Info.caughtSignal;

-}

-

-

-Bool

-xf86GetVidModeAllowNonLocal(void)

-{

-    return xf86Info.vidModeAllowNonLocal;

-}

-

-

-Bool

-xf86GetVidModeEnabled(void)

-{

-    return xf86Info.vidModeEnabled;

-}

-

-Bool

-xf86GetModInDevAllowNonLocal(void)

-{

-    return xf86Info.miscModInDevAllowNonLocal;

-}

-

-

-Bool

-xf86GetModInDevEnabled(void)

-{

-    return xf86Info.miscModInDevEnabled;

-}

-

-

-Bool

-xf86GetAllowMouseOpenFail(void)

-{

-    return xf86Info.allowMouseOpenFail;

-}

-

-

-Bool

-xf86IsPc98(void)

-{

-#if SUPPORT_PC98

-    return xf86Info.pc98;

-#else

-    return FALSE;

-#endif

-}

-

-void

-xf86DisableRandR(void)

-{

-    xf86Info.disableRandR = TRUE;

-    xf86Info.randRFrom = X_PROBED;

-}

-

-CARD32

-xf86GetModuleVersion(pointer module)

-{

-    return (CARD32)LoaderGetModuleVersion(module);

-}

-

-pointer

-xf86LoadDrvSubModule(DriverPtr drv, const char *name)

-{

-    pointer ret;

-    int errmaj = 0, errmin = 0;

-

-    ret = LoadSubModule(drv->module, name, NULL, NULL, NULL, NULL,

-			&errmaj, &errmin);

-    if (!ret)

-	LoaderErrorMsg(NULL, name, errmaj, errmin);

-    return ret;

-}

-

-pointer

-xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)

-{

-    pointer ret;

-    int errmaj = 0, errmin = 0;

-

-    ret = LoadSubModule(pScrn->module, name, NULL, NULL, NULL, NULL,

-			&errmaj, &errmin);

-    if (!ret)

-	LoaderErrorMsg(pScrn->name, name, errmaj, errmin);

-    return ret;

-}

-

-/*

- * xf86LoadOneModule loads a single module.

- */

-pointer

-xf86LoadOneModule(char *name, pointer opt)

-{

-    int errmaj, errmin;

-    char *Name;

-    pointer mod;

-

-    if (!name)

-	return NULL;

-

-    /* Normalise the module name */

-    Name = xf86NormalizeName(name);

-

-    /* Skip empty names */

-    if (Name == NULL)

-	return NULL;

-    if (*Name == '\0') {

-	free(Name);

-	return NULL;

-    }

-

-    mod = LoadModule(Name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin);

-    if (!mod)

-	LoaderErrorMsg(NULL, Name, errmaj, errmin);

-    free(Name);

-    return mod;

-}

-

-void

-xf86UnloadSubModule(pointer mod)

-{

-    /*

-     * This is disabled for now.  The loader isn't smart enough yet to undo

-     * relocations.

-     */

-#if 0

-    UnloadSubModule(mod);

-#endif

-}

-

-Bool

-xf86LoaderCheckSymbol(const char *name)

-{

-    return LoaderSymbol(name) != NULL;

-}

-

-typedef enum {

-   OPTION_BACKING_STORE

-} BSOpts;

-

-static const OptionInfoRec BSOptions[] = {

-   { OPTION_BACKING_STORE, "BackingStore", OPTV_BOOLEAN, {0}, FALSE },

-   { -1,                   NULL,           OPTV_NONE,    {0}, FALSE }

-};

-

-void

-xf86SetBackingStore(ScreenPtr pScreen)

-{

-    Bool useBS = FALSE;

-    MessageType from = X_DEFAULT;

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

-    OptionInfoPtr options;

-

-    options = xnfalloc(sizeof(BSOptions));

-    (void)memcpy(options, BSOptions, sizeof(BSOptions));

-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);

-

-    /* check for commandline option here */

-    if (xf86bsEnableFlag) {

-	from = X_CMDLINE;

-	useBS = TRUE;

-    } else if (xf86bsDisableFlag) {

-	from = X_CMDLINE;

-	useBS = FALSE;

-    } else {

-	if (xf86GetOptValBool(options, OPTION_BACKING_STORE, &useBS))

-	    from = X_CONFIG;

-    }

-    free(options);

-    pScreen->backingStoreSupport = useBS ? Always : NotUseful;

-    if (serverGeneration == 1)

-	xf86DrvMsg(pScreen->myNum, from, "Backing store %s\n",

-		   useBS ? "enabled" : "disabled");

-}

-

-

-typedef enum {

-   OPTION_SILKEN_MOUSE

-} SMOpts;

-

-static const OptionInfoRec SMOptions[] = {

-   { OPTION_SILKEN_MOUSE, "SilkenMouse",   OPTV_BOOLEAN, {0}, FALSE },

-   { -1,                   NULL,           OPTV_NONE,    {0}, FALSE }

-};

-

-void

-xf86SetSilkenMouse (ScreenPtr pScreen)

-{

-    Bool useSM = TRUE;

-    MessageType from = X_DEFAULT;

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

-    OptionInfoPtr options;

-

-    options = xnfalloc(sizeof(SMOptions));

-    (void)memcpy(options, SMOptions, sizeof(SMOptions));

-    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);

-

-    /* check for commandline option here */

-    /* disable if screen shares resources */

-	/* TODO VGA arb disable silken mouse */

-    if (xf86silkenMouseDisableFlag) {

-        from = X_CMDLINE;

-	useSM = FALSE;

-    } else {

-	if (xf86GetOptValBool(options, OPTION_SILKEN_MOUSE, &useSM))

-	    from = X_CONFIG;

-    }

-    free(options);

-    /*

-     * XXX quick hack to report correctly for OSs that can't do SilkenMouse

-     * yet.  Should handle this differently so that alternate async methods

-     * work correctly with this too.

-     */

-    pScrn->silkenMouse = useSM && xf86Info.useSIGIO && xf86SIGIOSupported();

-    if (serverGeneration == 1)

-	xf86DrvMsg(pScreen->myNum, from, "Silken mouse %s\n",

-		   pScrn->silkenMouse ? "enabled" : "disabled");

-}

-

-/* Wrote this function for the PM2 Xv driver, preliminary. */

-

-pointer

-xf86FindXvOptions(int scrnIndex, int adaptor_index, char *port_name,

-		  char **adaptor_name, pointer *adaptor_options)

-{

-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];

-    confXvAdaptorPtr adaptor;

-    int i;

-

-    if (adaptor_index >= pScrn->confScreen->numxvadaptors) {

-	if (adaptor_name) *adaptor_name = NULL;

-	if (adaptor_options) *adaptor_options = NULL;

-	return NULL;

-    }

-

-    adaptor = &pScrn->confScreen->xvadaptors[adaptor_index];

-    if (adaptor_name) *adaptor_name = adaptor->identifier;

-    if (adaptor_options) *adaptor_options = adaptor->options;

-

-    for (i = 0; i < adaptor->numports; i++)

-	if (!xf86NameCmp(adaptor->ports[i].identifier, port_name))

-	    return adaptor->ports[i].options;

-

-    return NULL;

-}

-

-/* Rather than duplicate loader's get OS function, just include it directly */

-#define LoaderGetOS xf86GetOS

-#include "loader/os.c"

-

-static void

-xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init,

-			   EntityProc enter, EntityProc leave, pointer private)

-{

-    ScrnInfoPtr pScrn;

-

-    if ((pScrn = xf86FindScreenForEntity(pEnt->index)))

-	xf86RemoveEntityFromScreen(pScrn,pEnt->index);

-    xf86SetEntityFuncs(pEnt->index,init,enter,leave,private);

-}

-

-ScrnInfoPtr

-xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,

-		   EntityProc init, EntityProc enter, EntityProc leave,

-		   pointer private)

-{

-    EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);

-    if (!pEnt) return pScrn;

-

-    if (!(pEnt->location.type == BUS_NONE)) {

-	free(pEnt);

-	return pScrn;

-    }

-

-    if (!pEnt->active) {

-	xf86ConfigFbEntityInactive(pEnt, init,  enter, leave,  private);

-	free(pEnt);

-	return pScrn;

-    }

-

-    if (!pScrn)

-	pScrn = xf86AllocateScreen(pEnt->driver,scrnFlag);

-    xf86AddEntityToScreen(pScrn,entityIndex);

-

-    xf86SetEntityFuncs(entityIndex,init,enter,leave,private);

-

-    return pScrn;

-}

-

-Bool

-xf86IsScreenPrimary(int scrnIndex)

-{

-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];

-    int i;

-

-    for (i=0 ; i < pScrn->numEntities; i++) {

-	if (xf86IsEntityPrimary(i))

-	    return TRUE;

-    }

-    return FALSE;

-}

-

-int

-xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,

-			       int format, unsigned long len, pointer value )

-{

-    RootWinPropPtr pNewProp = NULL, pRegProp;

-    int i;

-    Bool existing = FALSE;

-

-    DebugF("xf86RegisterRootWindowProperty(%d, %ld, %ld, %d, %ld, %p)\n",

-	   ScrnIndex, property, type, format, len, value);

-

-    if (ScrnIndex<0 || ScrnIndex>=xf86NumScreens) {

-      return BadMatch;

-    }

-

-    if (xf86RegisteredPropertiesTable &&

-	xf86RegisteredPropertiesTable[ScrnIndex]) {

-      for (pNewProp = xf86RegisteredPropertiesTable[ScrnIndex];

-	   pNewProp; pNewProp = pNewProp->next) {

-	if (strcmp(pNewProp->name, NameForAtom(property)) == 0)

-	  break;

-      }

-    }

-

-    if (!pNewProp) {

-      if ((pNewProp = (RootWinPropPtr)malloc(sizeof(RootWinProp))) == NULL) {

-	return BadAlloc;

-      }

-      /*

-       * We will put this property at the end of the list so that

-       * the changes are made in the order they were requested.

-       */

-      pNewProp->next = NULL;

-    } else {

-      free(pNewProp->name);

-      existing = TRUE;

-    }

-

-    pNewProp->name = xnfstrdup(NameForAtom(property));

-    pNewProp->type = type;

-    pNewProp->format = format;

-    pNewProp->size = len;

-    pNewProp->data = value;

-

-    DebugF("new property filled\n");

-

-    if (NULL==xf86RegisteredPropertiesTable) {

-      DebugF("creating xf86RegisteredPropertiesTable[] size %d\n",

-	     xf86NumScreens);

-      if ( NULL==(xf86RegisteredPropertiesTable=(RootWinPropPtr*)xnfcalloc(sizeof(RootWinProp),xf86NumScreens) )) {

-	return BadAlloc;

-      }

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

-	xf86RegisteredPropertiesTable[i] = NULL;

-      }

-    }

-

-    DebugF("xf86RegisteredPropertiesTable %p\n",

-	   (void *)xf86RegisteredPropertiesTable);

-    DebugF("xf86RegisteredPropertiesTable[%d] %p\n",

-	   ScrnIndex, (void *)xf86RegisteredPropertiesTable[ScrnIndex]);

-

-    if (!existing) {

-      if ( xf86RegisteredPropertiesTable[ScrnIndex] == NULL) {

-	xf86RegisteredPropertiesTable[ScrnIndex] = pNewProp;

-      } else {

-	pRegProp = xf86RegisteredPropertiesTable[ScrnIndex];

-	while (pRegProp->next != NULL) {

-	  DebugF("- next %p\n", (void *)pRegProp);

-	  pRegProp = pRegProp->next;

-        }

-	pRegProp->next = pNewProp;

-      }

-    }

-    DebugF("xf86RegisterRootWindowProperty succeeded\n");

-    return Success;

-}

-

-Bool

-xf86IsUnblank(int mode)

-{

-    switch(mode) {

-    case SCREEN_SAVER_OFF:

-    case SCREEN_SAVER_FORCER:

-	return TRUE;

-    case SCREEN_SAVER_ON:

-    case SCREEN_SAVER_CYCLE:

-	return FALSE;

-    default:

-	xf86MsgVerb(X_WARNING, 0, "Unexpected save screen mode: %d\n", mode);

-	return TRUE;

-    }

-}

-

-void

-xf86MotionHistoryAllocate(InputInfoPtr pInfo)

-{

-    AllocateMotionHistory(pInfo->dev);

-}

+/*
+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
+ *
+ * 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+/*
+ * Authors: Dirk Hohndel <hohndel@XFree86.Org>
+ *          David Dawes <dawes@XFree86.Org>
+ *          ... and others
+ *
+ * This file includes the helper functions that the server provides for
+ * different drivers.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include "os.h"
+#include "servermd.h"
+#include "pixmapstr.h"
+#include "windowstr.h"
+#include "propertyst.h"
+#include "gcstruct.h"
+#include "loaderProcs.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+#include "micmap.h"
+#include "xf86DDC.h"
+#include "xf86Xinput.h"
+#include "xf86InPriv.h"
+#include "mivalidate.h"
+#include "xf86Crtc.h"
+
+/* For xf86GetClocks */
+#if defined(CSRG_BASED) || defined(__GNU__)
+#define HAS_SETPRIORITY
+#include <sys/resource.h>
+#endif
+
+static int xf86ScrnInfoPrivateCount = 0;
+
+
+/* Add a pointer to a new DriverRec to xf86DriverList */
+
+void
+xf86AddDriver(DriverPtr driver, pointer module, int flags)
+{
+    /* Don't add null entries */
+    if (!driver)
+	return;
+
+    if (xf86DriverList == NULL)
+	xf86NumDrivers = 0;
+
+    xf86NumDrivers++;
+    xf86DriverList = xnfrealloc(xf86DriverList,
+				xf86NumDrivers * sizeof(DriverPtr));
+    xf86DriverList[xf86NumDrivers - 1] = xnfalloc(sizeof(DriverRec));
+    if (flags & HaveDriverFuncs)
+	*xf86DriverList[xf86NumDrivers - 1] = *driver;
+    else {
+	(void) memset( xf86DriverList[xf86NumDrivers - 1], 0,
+		       sizeof( DriverRec ) );
+	(void) memcpy( xf86DriverList[xf86NumDrivers - 1], driver,
+		       sizeof(DriverRec1));
+
+    }
+    xf86DriverList[xf86NumDrivers - 1]->module = module;
+    xf86DriverList[xf86NumDrivers - 1]->refCount = 0;
+}
+
+void
+xf86DeleteDriver(int drvIndex)
+{
+    if (xf86DriverList[drvIndex]
+	&& (!xf86DriverHasEntities(xf86DriverList[drvIndex]))) {
+	if (xf86DriverList[drvIndex]->module)
+	    UnloadModule(xf86DriverList[drvIndex]->module);
+	free(xf86DriverList[drvIndex]);
+	xf86DriverList[drvIndex] = NULL;
+    }
+}
+
+/* Add a pointer to a new InputDriverRec to xf86InputDriverList */
+
+void
+xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags)
+{
+    /* Don't add null entries */
+    if (!driver)
+	return;
+
+    if (xf86InputDriverList == NULL)
+	xf86NumInputDrivers = 0;
+
+    xf86NumInputDrivers++;
+    xf86InputDriverList = xnfrealloc(xf86InputDriverList,
+				xf86NumInputDrivers * sizeof(InputDriverPtr));
+    xf86InputDriverList[xf86NumInputDrivers - 1] =
+				xnfalloc(sizeof(InputDriverRec));
+    *xf86InputDriverList[xf86NumInputDrivers - 1] = *driver;
+    xf86InputDriverList[xf86NumInputDrivers - 1]->module = module;
+}
+
+void
+xf86DeleteInputDriver(int drvIndex)
+{
+    if (xf86InputDriverList[drvIndex] && xf86InputDriverList[drvIndex]->module)
+	UnloadModule(xf86InputDriverList[drvIndex]->module);
+    free(xf86InputDriverList[drvIndex]);
+    xf86InputDriverList[drvIndex] = NULL;
+}
+
+InputDriverPtr
+xf86LookupInputDriver(const char *name)
+{
+    int i;
+
+    for (i = 0; i < xf86NumInputDrivers; i++) {
+       if (xf86InputDriverList[i] && xf86InputDriverList[i]->driverName &&
+           xf86NameCmp(name, xf86InputDriverList[i]->driverName) == 0)
+           return xf86InputDriverList[i];
+    }
+    return NULL;
+}
+
+InputInfoPtr
+xf86LookupInput(const char *name)
+{
+    InputInfoPtr p;
+
+    for (p = xf86InputDevs; p != NULL; p = p->next) {
+        if (strcmp(name, p->name) == 0)
+            return p;
+    }
+
+    return NULL;
+}
+
+/* Allocate a new ScrnInfoRec in xf86Screens */
+
+ScrnInfoPtr
+xf86AllocateScreen(DriverPtr drv, int flags)
+{
+    int i;
+
+    if (xf86Screens == NULL)
+	xf86NumScreens = 0;
+
+    i = xf86NumScreens++;
+    xf86Screens = xnfrealloc(xf86Screens, xf86NumScreens * sizeof(ScrnInfoPtr));
+    xf86Screens[i] = xnfcalloc(sizeof(ScrnInfoRec), 1);
+    xf86Screens[i]->scrnIndex = i;	/* Changes when a screen is removed */
+    xf86Screens[i]->origIndex = i;	/* This never changes */
+    xf86Screens[i]->privates = xnfcalloc(sizeof(DevUnion),
+					 xf86ScrnInfoPrivateCount);
+    /*
+     * EnableDisableFBAccess now gets initialized in InitOutput()
+     * xf86Screens[i]->EnableDisableFBAccess = xf86EnableDisableFBAccess;
+     */
+
+    xf86Screens[i]->drv = drv;
+    drv->refCount++;
+    xf86Screens[i]->module = DuplicateModule(drv->module, NULL);
+
+    xf86Screens[i]->DriverFunc = drv->driverFunc;
+
+    return xf86Screens[i];
+}
+
+
+/*
+ * Remove an entry from xf86Screens.  Ideally it should free all allocated
+ * data.  To do this properly may require a driver hook.
+ */
+
+void
+xf86DeleteScreen(int scrnIndex, int flags)
+{
+    ScrnInfoPtr pScrn;
+    int i;
+
+    /* First check if the screen is valid */
+    if (xf86NumScreens == 0 || xf86Screens == NULL)
+	return;
+
+    if (scrnIndex > xf86NumScreens - 1)
+	return;
+
+    if (!(pScrn = xf86Screens[scrnIndex]))
+	return;
+
+    /* If a FreeScreen function is defined, call it here */
+    if (pScrn->FreeScreen != NULL)
+	pScrn->FreeScreen(scrnIndex, 0);
+
+    while (pScrn->modes)
+	xf86DeleteMode(&pScrn->modes, pScrn->modes);
+
+    while (pScrn->modePool)
+	xf86DeleteMode(&pScrn->modePool, pScrn->modePool);
+
+    xf86OptionListFree(pScrn->options);
+
+    if (pScrn->module)
+	UnloadModule(pScrn->module);
+
+    if (pScrn->drv)
+	pScrn->drv->refCount--;
+
+    free(pScrn->privates);
+
+    xf86ClearEntityListForScreen(scrnIndex);
+
+    free(pScrn);
+
+    /* Move the other entries down, updating their scrnIndex fields */
+
+    xf86NumScreens--;
+
+    for (i = scrnIndex; i < xf86NumScreens; i++) {
+	xf86Screens[i] = xf86Screens[i + 1];
+	xf86Screens[i]->scrnIndex = i;
+	/* Also need to take care of the screen layout settings */
+    }
+}
+
+/*
+ * Allocate a private in ScrnInfoRec.
+ */
+
+int
+xf86AllocateScrnInfoPrivateIndex(void)
+{
+    int idx, i;
+    ScrnInfoPtr pScr;
+    DevUnion *nprivs;
+
+    idx = xf86ScrnInfoPrivateCount++;
+    for (i = 0; i < xf86NumScreens; i++) {
+	pScr = xf86Screens[i];
+	nprivs = xnfrealloc(pScr->privates,
+			    xf86ScrnInfoPrivateCount * sizeof(DevUnion));
+	/* Zero the new private */
+	memset(&nprivs[idx], 0, sizeof(DevUnion));
+	pScr->privates = nprivs;
+    }
+    return idx;
+}
+
+Bool
+xf86AddPixFormat(ScrnInfoPtr pScrn, int depth, int bpp, int pad)
+{
+    int i;
+
+    if (pScrn->numFormats >= MAXFORMATS)
+	return FALSE;
+
+    if (bpp <= 0) {
+	if (depth == 1)
+	    bpp = 1;
+	else if (depth <= 8)
+	    bpp = 8;
+	else if (depth <= 16)
+	    bpp = 16;
+	else if (depth <= 32)
+	    bpp = 32;
+	else
+	    return FALSE;
+    }
+    if (pad <= 0)
+	pad = BITMAP_SCANLINE_PAD;
+
+    i = pScrn->numFormats++;
+    pScrn->formats[i].depth = depth;
+    pScrn->formats[i].bitsPerPixel = bpp;
+    pScrn->formats[i].scanlinePad = pad;
+    return TRUE;
+}
+
+/*
+ * Set the depth we are using based on (in the following order of preference):
+ *  - values given on the command line
+ *  - values given in the config file
+ *  - values provided by the driver
+ *  - an overall default when nothing else is given
+ *
+ * Also find a Display subsection matching the depth/bpp found.
+ *
+ * Sets the following ScrnInfoRec fields:
+ *     bitsPerPixel, pixmap24, depth, display, imageByteOrder,
+ *     bitmapScanlinePad, bitmapScanlineUnit, bitmapBitOrder, numFormats,
+ *     formats, fbFormat.
+ */
+
+/* Can the screen handle 24 bpp pixmaps */
+#define DO_PIX24(f) ((f & Support24bppFb) || \
+		     ((f & Support32bppFb) && (f & SupportConvert24to32)))
+
+/* Can the screen handle 32 bpp pixmaps */
+#define DO_PIX32(f) ((f & Support32bppFb) || \
+		     ((f & Support24bppFb) && (f & SupportConvert32to24)))
+
+/* Does the screen prefer 32bpp fb for 24bpp pixmaps */
+#define CHOOSE32FOR24(f) ((f & Support32bppFb) && (f & SupportConvert24to32) \
+			  && (f & PreferConvert24to32))
+
+/* Does the screen prefer 24bpp fb for 32bpp pixmaps */
+#define CHOOSE24FOR32(f) ((f & Support24bppFb) && (f & SupportConvert32to24) \
+			  && (f & PreferConvert32to24))
+
+/* Can the screen handle 32bpp pixmaps for 24bpp fb */
+#define DO_PIX32FOR24(f) ((f & Support24bppFb) && (f & SupportConvert32to24))
+
+/* Can the screen handle 24bpp pixmaps for 32bpp fb */
+#define DO_PIX24FOR32(f) ((f & Support32bppFb) && (f & SupportConvert24to32))
+
+#ifndef GLOBAL_DEFAULT_DEPTH
+#define GLOBAL_DEFAULT_DEPTH 24
+#endif
+
+Bool
+xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
+		int depth24flags)
+{
+    int i;
+    DispPtr disp;
+    Pix24Flags pix24 = xf86Info.pixmap24;
+    Bool nomatch = FALSE;
+
+    scrp->bitsPerPixel = -1;
+    scrp->depth = -1;
+    scrp->pixmap24 = Pix24DontCare;
+    scrp->bitsPerPixelFrom = X_DEFAULT;
+    scrp->depthFrom = X_DEFAULT;
+
+    if (xf86FbBpp > 0) {
+	scrp->bitsPerPixel = xf86FbBpp;
+	scrp->bitsPerPixelFrom = X_CMDLINE;
+    }
+
+    if (xf86Depth > 0) {
+	scrp->depth = xf86Depth;
+	scrp->depthFrom = X_CMDLINE;
+    }
+
+    if (xf86FbBpp < 0 && xf86Depth < 0) {
+	if (scrp->confScreen->defaultfbbpp > 0) {
+	    scrp->bitsPerPixel = scrp->confScreen->defaultfbbpp;
+	    scrp->bitsPerPixelFrom = X_CONFIG;
+	}
+	if (scrp->confScreen->defaultdepth > 0) {
+	    scrp->depth = scrp->confScreen->defaultdepth;
+	    scrp->depthFrom = X_CONFIG;
+	}
+
+	if (scrp->confScreen->defaultfbbpp <= 0 &&
+	    scrp->confScreen->defaultdepth <= 0) {
+	    /*
+	     * Check for DefaultDepth and DefaultFbBpp options in the
+	     * Device sections.
+	     */
+	    int i;
+	    GDevPtr device;
+	    Bool found = FALSE;
+
+	    for (i = 0; i < scrp->numEntities; i++) {
+		device = xf86GetDevFromEntity(scrp->entityList[i],
+					      scrp->entityInstanceList[i]);
+		if (device && device->options) {
+		    if (xf86FindOption(device->options, "DefaultDepth")) {
+			scrp->depth = xf86SetIntOption(device->options,
+						       "DefaultDepth", -1);
+			scrp->depthFrom = X_CONFIG;
+			found = TRUE;
+		    }
+		    if (xf86FindOption(device->options, "DefaultFbBpp")) {
+			scrp->bitsPerPixel = xf86SetIntOption(device->options,
+							      "DefaultFbBpp",
+							      -1);
+			scrp->bitsPerPixelFrom = X_CONFIG;
+			found = TRUE;
+		    }
+		}
+		if (found)
+		    break;
+	    }
+	}
+    }
+
+    /* If none of these is set, pick a default */
+    if (scrp->bitsPerPixel < 0 && scrp->depth < 0) {
+        if (fbbpp > 0 || depth > 0) {
+	    if (fbbpp > 0)
+		scrp->bitsPerPixel = fbbpp;
+	    if (depth > 0)
+		scrp->depth = depth;
+	} else {
+	    scrp->depth = GLOBAL_DEFAULT_DEPTH;
+	}
+    }
+
+    /* If any are not given, determine a default for the others */
+
+    if (scrp->bitsPerPixel < 0) {
+	/* The depth must be set */
+	if (scrp->depth > -1) {
+	    if (scrp->depth == 1)
+		scrp->bitsPerPixel = 1;
+	    else if (scrp->depth <= 4)
+		scrp->bitsPerPixel = 4;
+	    else if (scrp->depth <= 8)
+		scrp->bitsPerPixel = 8;
+	    else if (scrp->depth <= 16)
+		scrp->bitsPerPixel = 16;
+	    else if (scrp->depth <= 24) {
+		/*
+		 * Figure out if a choice is possible based on the depth24
+		 * and pix24 flags.
+		 */
+		/* Check pix24 first */
+		if (pix24 != Pix24DontCare) {
+		    if (pix24 == Pix24Use32) {
+			if (DO_PIX32(depth24flags)) {
+			    if (CHOOSE24FOR32(depth24flags))
+				scrp->bitsPerPixel = 24;
+			    else
+				scrp->bitsPerPixel = 32;
+			} else {
+			    nomatch = TRUE;
+			}
+		    } else if (pix24 == Pix24Use24) {
+			if (DO_PIX24(depth24flags)) {
+			    if (CHOOSE32FOR24(depth24flags))
+				scrp->bitsPerPixel = 32;
+			    else
+				scrp->bitsPerPixel = 24;
+			} else {
+			    nomatch = TRUE;
+			}
+		    }
+		} else {
+		    if (DO_PIX32(depth24flags)) {
+			if (CHOOSE24FOR32(depth24flags))
+			    scrp->bitsPerPixel = 24;
+			else
+			    scrp->bitsPerPixel = 32;
+		    } else if (DO_PIX24(depth24flags)) {
+			if (CHOOSE32FOR24(depth24flags))
+			    scrp->bitsPerPixel = 32;
+			else
+			    scrp->bitsPerPixel = 24;
+		    }
+		}
+	    } else if (scrp->depth <= 32)
+		scrp->bitsPerPixel = 32;
+	    else {
+		xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+			   "Specified depth (%d) is greater than 32\n",
+			   scrp->depth);
+		return FALSE;
+	    }
+	} else {
+	    xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+			"xf86SetDepthBpp: internal error: depth and fbbpp"
+			" are both not set\n");
+	    return FALSE;
+	}
+	if (scrp->bitsPerPixel < 0) {
+	    if (nomatch)
+		xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+			"Driver can't support depth 24 pixmap format (%d)\n",
+			PIX24TOBPP(pix24));
+	    else if ((depth24flags & (Support24bppFb | Support32bppFb)) ==
+		     NoDepth24Support)
+		xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+			"Driver can't support depth 24\n");
+	    else
+		xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+			"Can't find fbbpp for depth 24\n");
+	    return FALSE;
+	}
+	scrp->bitsPerPixelFrom = X_PROBED;
+    }
+
+    if (scrp->depth <= 0) {
+	/* bitsPerPixel is already set */
+	switch (scrp->bitsPerPixel) {
+	case 32:
+	    scrp->depth = 24;
+	    break;
+	default:
+	    /* 1, 4, 8, 16 and 24 */
+	    scrp->depth = scrp->bitsPerPixel;
+	    break;
+	}
+	scrp->depthFrom = X_PROBED;
+    }
+
+    /* Sanity checks */
+    if (scrp->depth < 1 || scrp->depth > 32) {
+	xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+		   "Specified depth (%d) is not in the range 1-32\n",
+		    scrp->depth);
+	return FALSE;
+    }
+    switch (scrp->bitsPerPixel) {
+    case 1:
+    case 4:
+    case 8:
+    case 16:
+    case 24:
+    case 32:
+	break;
+    default:
+	xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+		   "Specified fbbpp (%d) is not a permitted value\n",
+		   scrp->bitsPerPixel);
+	return FALSE;
+    }
+    if (scrp->depth > scrp->bitsPerPixel) {
+	xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+		   "Specified depth (%d) is greater than the fbbpp (%d)\n",
+		   scrp->depth, scrp->bitsPerPixel);
+	return FALSE;
+    }
+
+    /* set scrp->pixmap24 if the driver isn't flexible */
+    if (scrp->bitsPerPixel == 24 && !DO_PIX32FOR24(depth24flags)) {
+	scrp->pixmap24 = Pix24Use24;
+    }
+    if (scrp->bitsPerPixel == 32 && !DO_PIX24FOR32(depth24flags)) {
+	scrp->pixmap24 = Pix24Use32;
+    }
+
+    /*
+     * Find the Display subsection matching the depth/fbbpp and initialise
+     * scrp->display with it.
+     */
+    for (i = 0, disp = scrp->confScreen->displays;
+	 i < scrp->confScreen->numdisplays; i++, disp++) {
+	if ((disp->depth == scrp->depth && disp->fbbpp == scrp->bitsPerPixel)
+	    || (disp->depth == scrp->depth && disp->fbbpp <= 0)
+	    || (disp->fbbpp == scrp->bitsPerPixel && disp->depth <= 0)) {
+	    scrp->display = disp;
+	    break;
+	}
+    }
+
+    /*
+     * If an exact match can't be found, see if there is one with no
+     * depth or fbbpp specified.
+     */
+    if (i == scrp->confScreen->numdisplays) {
+	for (i = 0, disp = scrp->confScreen->displays;
+	     i < scrp->confScreen->numdisplays; i++, disp++) {
+	    if (disp->depth <= 0 && disp->fbbpp <= 0) {
+		scrp->display = disp;
+		break;
+	    }
+	}
+    }
+
+    /*
+     * If all else fails, create a default one.
+     */
+    if (i == scrp->confScreen->numdisplays) {
+	scrp->confScreen->numdisplays++;
+	scrp->confScreen->displays =
+		xnfrealloc(scrp->confScreen->displays,
+			   scrp->confScreen->numdisplays * sizeof(DispRec));
+	xf86DrvMsg(scrp->scrnIndex, X_INFO,
+		   "Creating default Display subsection in Screen section\n"
+		   "\t\"%s\" for depth/fbbpp %d/%d\n",
+		   scrp->confScreen->id, scrp->depth, scrp->bitsPerPixel);
+	memset(&scrp->confScreen->displays[i], 0, sizeof(DispRec));
+	scrp->confScreen->displays[i].blackColour.red = -1;
+	scrp->confScreen->displays[i].blackColour.green = -1;
+	scrp->confScreen->displays[i].blackColour.blue = -1;
+	scrp->confScreen->displays[i].whiteColour.red = -1;
+	scrp->confScreen->displays[i].whiteColour.green = -1;
+	scrp->confScreen->displays[i].whiteColour.blue = -1;
+	scrp->confScreen->displays[i].defaultVisual = -1;
+	scrp->confScreen->displays[i].modes = xnfalloc(sizeof(char *));
+	scrp->confScreen->displays[i].modes[0] = NULL;
+	scrp->confScreen->displays[i].depth = depth;
+	scrp->confScreen->displays[i].fbbpp = fbbpp;
+	scrp->display = &scrp->confScreen->displays[i];
+    }
+
+    /*
+     * Setup defaults for the display-wide attributes the framebuffer will
+     * need.  These defaults should eventually be set globally, and not
+     * dependent on the screens.
+     */
+    scrp->imageByteOrder = IMAGE_BYTE_ORDER;
+    scrp->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
+    if (scrp->depth < 8) {
+	/* Planar modes need these settings */
+	scrp->bitmapScanlineUnit = 8;
+	scrp->bitmapBitOrder = MSBFirst;
+    } else {
+	scrp->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
+	scrp->bitmapBitOrder = BITMAP_BIT_ORDER;
+    }
+
+    /*
+     * If an unusual depth is required, add it to scrp->formats.  The formats
+     * for the common depths are handled globally in InitOutput
+     */
+    switch (scrp->depth) {
+    case 1:
+    case 4:
+    case 8:
+    case 15:
+    case 16:
+    case 24:
+	/* Common depths.  Nothing to do for them */
+	break;
+    default:
+	if (!xf86AddPixFormat(scrp, scrp->depth, 0, 0)) {
+	    xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+		       "Can't add pixmap format for depth %d\n", scrp->depth);
+	    return FALSE;
+	}
+    }
+
+    /* Initialise the framebuffer format for this screen */
+    scrp->fbFormat.depth = scrp->depth;
+    scrp->fbFormat.bitsPerPixel = scrp->bitsPerPixel;
+    scrp->fbFormat.scanlinePad = BITMAP_SCANLINE_PAD;
+
+    return TRUE;
+}
+
+/*
+ * Print out the selected depth and bpp.
+ */
+void
+xf86PrintDepthBpp(ScrnInfoPtr scrp)
+{
+    xf86DrvMsg(scrp->scrnIndex, scrp->depthFrom, "Depth %d, ", scrp->depth);
+    xf86Msg(scrp->bitsPerPixelFrom, "framebuffer bpp %d\n", scrp->bitsPerPixel);
+}
+
+/*
+ * xf86SetWeight sets scrp->weight, scrp->mask, scrp->offset, and for depths
+ * greater than MAX_PSEUDO_DEPTH also scrp->rgbBits.
+ */
+Bool
+xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask)
+{
+    MessageType weightFrom = X_DEFAULT;
+
+    scrp->weight.red = 0;
+    scrp->weight.green = 0;
+    scrp->weight.blue = 0;
+
+    if (xf86Weight.red > 0 && xf86Weight.green > 0 && xf86Weight.blue > 0) {
+	scrp->weight = xf86Weight;
+	weightFrom = X_CMDLINE;
+    } else if (scrp->display->weight.red > 0 && scrp->display->weight.green > 0
+	       && scrp->display->weight.blue > 0) {
+	scrp->weight = scrp->display->weight;
+	weightFrom = X_CONFIG;
+    } else if (weight.red > 0 && weight.green > 0 && weight.blue > 0) {
+	scrp->weight = weight;
+    } else {
+	switch (scrp->depth) {
+	case 1:
+	case 4:
+	case 8:
+	    scrp->weight.red = scrp->weight.green =
+		scrp->weight.blue = scrp->rgbBits;
+	    break;
+	case 15:
+	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 5;
+	    break;
+	case 16:
+	    scrp->weight.red = scrp->weight.blue = 5;
+	    scrp->weight.green = 6;
+	    break;
+	case 18:
+	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 6;
+	    break;
+	case 24:
+	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 8;
+	    break;
+	case 30:
+	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 10;
+	    break;
+	}
+    }
+
+    if (scrp->weight.red)
+	xf86DrvMsg(scrp->scrnIndex, weightFrom, "RGB weight %d%d%d\n",
+		   (int)scrp->weight.red, (int)scrp->weight.green,
+		   (int)scrp->weight.blue);
+
+    if (scrp->depth > MAX_PSEUDO_DEPTH &&
+	(scrp->depth != scrp->weight.red + scrp->weight.green +
+			scrp->weight.blue)) {
+	xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+		   "Weight given (%d%d%d) is inconsistent with the "
+		   "depth (%d)\n",
+		   (int)scrp->weight.red, (int)scrp->weight.green,
+		   (int)scrp->weight.blue, scrp->depth);
+	return FALSE;
+    }
+    if (scrp->depth > MAX_PSEUDO_DEPTH && scrp->weight.red) {
+	/*
+	 * XXX Does this even mean anything for TrueColor visuals?
+	 * If not, we shouldn't even be setting it here.  However, this
+	 * matches the behaviour of 3.x versions of XFree86.
+	 */
+	scrp->rgbBits = scrp->weight.red;
+	if (scrp->weight.green > scrp->rgbBits)
+	    scrp->rgbBits = scrp->weight.green;
+	if (scrp->weight.blue > scrp->rgbBits)
+	    scrp->rgbBits = scrp->weight.blue;
+    }
+
+    /* Set the mask and offsets */
+    if (mask.red == 0 || mask.green == 0 || mask.blue == 0) {
+	/* Default to a setting common to PC hardware */
+	scrp->offset.red = scrp->weight.green + scrp->weight.blue;
+	scrp->offset.green = scrp->weight.blue;
+	scrp->offset.blue = 0;
+	scrp->mask.red = ((1 << scrp->weight.red) - 1) << scrp->offset.red;
+	scrp->mask.green = ((1 << scrp->weight.green) - 1)
+				<< scrp->offset.green;
+	scrp->mask.blue = (1 << scrp->weight.blue) - 1;
+    } else {
+	/* Initialise to the values passed */
+	scrp->mask.red = mask.red;
+	scrp->mask.green = mask.green;
+	scrp->mask.blue = mask.blue;
+	scrp->offset.red = ffs(mask.red);
+	scrp->offset.green = ffs(mask.green);
+	scrp->offset.blue = ffs(mask.blue);
+    }
+    return TRUE;
+}
+
+Bool
+xf86SetDefaultVisual(ScrnInfoPtr scrp, int visual)
+{
+    MessageType visualFrom = X_DEFAULT;
+
+    if (defaultColorVisualClass >= 0) {
+	scrp->defaultVisual = defaultColorVisualClass;
+	visualFrom = X_CMDLINE;
+    } else if (scrp->display->defaultVisual >= 0) {
+	scrp->defaultVisual = scrp->display->defaultVisual;
+	visualFrom = X_CONFIG;
+    } else if (visual >= 0) {
+	scrp->defaultVisual = visual;
+    } else {
+	if (scrp->depth == 1)
+	    scrp->defaultVisual = StaticGray;
+	else if (scrp->depth == 4)
+	    scrp->defaultVisual = StaticColor;
+	else if (scrp->depth <= MAX_PSEUDO_DEPTH)
+	    scrp->defaultVisual = PseudoColor;
+	else
+	    scrp->defaultVisual = TrueColor;
+    }
+    switch (scrp->defaultVisual) {
+    case StaticGray:
+    case GrayScale:
+    case StaticColor:
+    case PseudoColor:
+    case TrueColor:
+    case DirectColor:
+	xf86DrvMsg(scrp->scrnIndex, visualFrom, "Default visual is %s\n",
+		   xf86VisualNames[scrp->defaultVisual]);
+	    return TRUE;
+    default:
+
+	xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+		   "Invalid default visual class (%d)\n", scrp->defaultVisual);
+	return FALSE;
+    }
+}
+
+#define TEST_GAMMA(g) \
+	(g).red > GAMMA_ZERO || (g).green > GAMMA_ZERO || (g).blue > GAMMA_ZERO
+
+#define SET_GAMMA(g) \
+	(g) > GAMMA_ZERO ? (g) : 1.0
+
+Bool
+xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma)
+{
+    MessageType from = X_DEFAULT;
+#if 0
+    xf86MonPtr DDC = (xf86MonPtr)(scrp->monitor->DDC);
+#endif
+    if (TEST_GAMMA(xf86Gamma)) {
+	from = X_CMDLINE;
+	scrp->gamma.red = SET_GAMMA(xf86Gamma.red);
+	scrp->gamma.green = SET_GAMMA(xf86Gamma.green);
+	scrp->gamma.blue = SET_GAMMA(xf86Gamma.blue);
+    } else if (TEST_GAMMA(scrp->monitor->gamma)) {
+	from = X_CONFIG;
+	scrp->gamma.red = SET_GAMMA(scrp->monitor->gamma.red);
+	scrp->gamma.green = SET_GAMMA(scrp->monitor->gamma.green);
+	scrp->gamma.blue = SET_GAMMA(scrp->monitor->gamma.blue);
+#if 0
+    } else if ( DDC && DDC->features.gamma > GAMMA_ZERO ) {
+        from = X_PROBED;
+	scrp->gamma.red = SET_GAMMA(DDC->features.gamma);
+	scrp->gamma.green = SET_GAMMA(DDC->features.gamma);
+	scrp->gamma.blue = SET_GAMMA(DDC->features.gamma);
+	/* EDID structure version 2 gives optional seperate red, green & blue gamma values
+	 * in bytes 0x57-0x59 */
+#endif
+    } else if (TEST_GAMMA(gamma)) {
+	scrp->gamma.red = SET_GAMMA(gamma.red);
+	scrp->gamma.green = SET_GAMMA(gamma.green);
+	scrp->gamma.blue = SET_GAMMA(gamma.blue);
+    } else {
+	scrp->gamma.red = 1.0;
+	scrp->gamma.green = 1.0;
+	scrp->gamma.blue = 1.0;
+    }
+    /* Pretend we succeeded if we support better a gamma system.
+     * This avoids a confusing message.
+     */
+    if (xf86_crtc_supports_gamma(scrp))
+	return TRUE;
+    xf86DrvMsg(scrp->scrnIndex, from,
+	       "Using gamma correction (%.1f, %.1f, %.1f)\n",
+	       scrp->gamma.red, scrp->gamma.green, scrp->gamma.blue);
+
+    return TRUE;
+}
+
+#undef TEST_GAMMA
+#undef SET_GAMMA
+
+
+/*
+ * Set the DPI from the command line option.  XXX should allow it to be
+ * calculated from the widthmm/heightmm values.
+ */
+
+#undef MMPERINCH
+#define MMPERINCH 25.4
+
+void
+xf86SetDpi(ScrnInfoPtr pScrn, int x, int y)
+{
+    MessageType from = X_DEFAULT;
+    xf86MonPtr DDC = (xf86MonPtr)(pScrn->monitor->DDC);
+    int ddcWidthmm, ddcHeightmm;
+    int widthErr, heightErr;
+
+    /* XXX Maybe there is no need for widthmm/heightmm in ScrnInfoRec */
+    pScrn->widthmm = pScrn->monitor->widthmm;
+    pScrn->heightmm = pScrn->monitor->heightmm;
+
+    if (DDC && (DDC->features.hsize > 0 && DDC->features.vsize > 0) ) {
+      /* DDC gives display size in mm for individual modes,
+       * but cm for monitor
+       */
+      ddcWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */
+      ddcHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */
+    } else {
+      ddcWidthmm = ddcHeightmm = 0;
+    }
+
+    if (monitorResolution > 0) {
+	pScrn->xDpi = monitorResolution;
+	pScrn->yDpi = monitorResolution;
+	from = X_CMDLINE;
+    } else if (pScrn->widthmm > 0 || pScrn->heightmm > 0) {
+	from = X_CONFIG;
+	if (pScrn->widthmm > 0) {
+	   pScrn->xDpi =
+		(int)((double)pScrn->virtualX * MMPERINCH / pScrn->widthmm);
+	}
+	if (pScrn->heightmm > 0) {
+	   pScrn->yDpi =
+		(int)((double)pScrn->virtualY * MMPERINCH / pScrn->heightmm);
+	}
+	if (pScrn->xDpi > 0 && pScrn->yDpi <= 0)
+	    pScrn->yDpi = pScrn->xDpi;
+	if (pScrn->yDpi > 0 && pScrn->xDpi <= 0)
+	    pScrn->xDpi = pScrn->yDpi;
+	xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n",
+		   pScrn->widthmm, pScrn->heightmm);
+
+	/* Warn if config and probe disagree about display size */
+	if ( ddcWidthmm && ddcHeightmm ) {
+	  if (pScrn->widthmm > 0) {
+	    widthErr  = abs(ddcWidthmm  - pScrn->widthmm);
+	  } else {
+	    widthErr  = 0;
+	  }
+	  if (pScrn->heightmm > 0) {
+	    heightErr = abs(ddcHeightmm - pScrn->heightmm);
+	  } else {
+	    heightErr = 0;
+	  }
+	  if (widthErr>10 || heightErr>10) {
+	    /* Should include config file name for monitor here */
+	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		       "Probed monitor is %dx%d mm, using Displaysize %dx%d mm\n",
+		       ddcWidthmm,ddcHeightmm, pScrn->widthmm,pScrn->heightmm);
+	  }
+	}
+    } else if ( ddcWidthmm && ddcHeightmm ) {
+	from = X_PROBED;
+	xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n",
+		   ddcWidthmm, ddcHeightmm );
+	pScrn->widthmm = ddcWidthmm;
+	pScrn->heightmm = ddcHeightmm;
+	if (pScrn->widthmm > 0) {
+	   pScrn->xDpi =
+		(int)((double)pScrn->virtualX * MMPERINCH / pScrn->widthmm);
+	}
+	if (pScrn->heightmm > 0) {
+	   pScrn->yDpi =
+		(int)((double)pScrn->virtualY * MMPERINCH / pScrn->heightmm);
+	}
+	if (pScrn->xDpi > 0 && pScrn->yDpi <= 0)
+	    pScrn->yDpi = pScrn->xDpi;
+	if (pScrn->yDpi > 0 && pScrn->xDpi <= 0)
+	    pScrn->xDpi = pScrn->yDpi;
+    } else {
+	if (x > 0)
+	    pScrn->xDpi = x;
+	else
+	    pScrn->xDpi = DEFAULT_DPI;
+	if (y > 0)
+	    pScrn->yDpi = y;
+	else
+	    pScrn->yDpi = DEFAULT_DPI;
+    }
+    xf86DrvMsg(pScrn->scrnIndex, from, "DPI set to (%d, %d)\n",
+	       pScrn->xDpi, pScrn->yDpi);
+}
+
+#undef MMPERINCH
+
+
+void
+xf86SetBlackWhitePixels(ScreenPtr pScreen)
+{
+    if (xf86FlipPixels) {
+	pScreen->whitePixel = 0;
+	pScreen->blackPixel = 1;
+    } else {
+	pScreen->whitePixel = 1;
+	pScreen->blackPixel = 0;
+    }
+}
+
+/*
+ * xf86SetRootClip --
+ *	Enable or disable rendering to the screen by
+ *	setting the root clip list and revalidating
+ *	all of the windows
+ */
+
+static void
+xf86SetRootClip (ScreenPtr pScreen, Bool enable)
+{
+    WindowPtr	pWin = pScreen->root;
+    WindowPtr	pChild;
+    Bool	WasViewable = (Bool)(pWin->viewable);
+    Bool	anyMarked = FALSE;
+    WindowPtr   pLayerWin;
+    BoxRec	box;
+
+    if (WasViewable)
+    {
+	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)
+	{
+	    (void) (*pScreen->MarkOverlappedWindows)(pChild,
+						     pChild,
+						     &pLayerWin);
+	}
+	(*pScreen->MarkWindow) (pWin);
+	anyMarked = TRUE;
+	if (pWin->valdata)
+	{
+	    if (HasBorder (pWin))
+	    {
+		RegionPtr	borderVisible;
+
+		borderVisible = RegionCreate(NullBox, 1);
+		RegionSubtract(borderVisible,
+				&pWin->borderClip, &pWin->winSize);
+		pWin->valdata->before.borderVisible = borderVisible;
+	    }
+	    pWin->valdata->before.resized = TRUE;
+	}
+    }
+
+    /*
+     * Use REGION_BREAK to avoid optimizations in ValidateTree
+     * that assume the root borderClip can't change well, normally
+     * it doesn't...)
+     */
+    if (enable)
+    {
+	box.x1 = 0;
+	box.y1 = 0;
+	box.x2 = pScreen->width;
+	box.y2 = pScreen->height;
+	RegionInit(&pWin->winSize, &box, 1);
+	RegionInit(&pWin->borderSize, &box, 1);
+	if (WasViewable)
+	    RegionReset(&pWin->borderClip, &box);
+	pWin->drawable.width = pScreen->width;
+	pWin->drawable.height = pScreen->height;
+        RegionBreak(&pWin->clipList);
+    }
+    else
+    {
+	RegionEmpty(&pWin->borderClip);
+	RegionBreak(&pWin->clipList);
+    }
+
+    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);
+
+    if (WasViewable)
+    {
+	if (pWin->firstChild)
+	{
+	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,
+							   pWin->firstChild,
+							   (WindowPtr *)NULL);
+	}
+	else
+	{
+	    (*pScreen->MarkWindow) (pWin);
+	    anyMarked = TRUE;
+	}
+
+
+	if (anyMarked)
+	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);
+    }
+
+    if (WasViewable)
+    {
+	if (anyMarked)
+	    (*pScreen->HandleExposures)(pWin);
+	if (anyMarked && pScreen->PostValidateTree)
+	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);
+    }
+    if (pWin->realized)
+	WindowsRestructured ();
+    FlushAllOutput ();
+}
+
+/*
+ * Function to enable/disable access to the frame buffer
+ *
+ * This is used when VT switching and when entering/leaving DGA direct mode.
+ *
+ * This has been rewritten again to eliminate the saved pixmap.  The
+ * devPrivate field in the screen pixmap is set to NULL to catch code
+ * accidentally referencing the frame buffer while the X server is not
+ * supposed to touch it.
+ *
+ * Here, we exchange the pixmap private data, rather than the pixmaps
+ * themselves to avoid having to find and change any references to the screen
+ * pixmap such as GC's, window privates etc.  This also means that this code
+ * does not need to know exactly how the pixmap pixels are accessed.  Further,
+ * this exchange is >not< done through the screen's ModifyPixmapHeader()
+ * vector.  This means the called frame buffer code layers can determine
+ * whether they are switched in or out by keeping track of the root pixmap's
+ * private data, and therefore don't need to access pScrnInfo->vtSema.
+ */
+void
+xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
+{
+    ScrnInfoPtr pScrnInfo = xf86Screens[scrnIndex];
+    ScreenPtr pScreen = pScrnInfo->pScreen;
+    PixmapPtr pspix;
+
+    pspix = (*pScreen->GetScreenPixmap) (pScreen);
+    if (enable)
+    {
+	/*
+	 * Restore all of the clip lists on the screen
+	 */
+	if (!xf86Resetting)
+	    xf86SetRootClip (pScreen, TRUE);
+
+    }
+    else
+    {
+	/*
+	 * Empty all of the clip lists on the screen
+	 */
+	xf86SetRootClip (pScreen, FALSE);
+    }
+}
+
+/* Print driver messages in the standard format */
+
+#undef PREFIX_SIZE
+#define PREFIX_SIZE 14
+
+void
+xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format,
+		va_list args)
+{
+    char *tmpFormat;
+
+    /* Prefix the scrnIndex name to the format string. */
+    if (scrnIndex >= 0 && scrnIndex < xf86NumScreens &&
+	xf86Screens[scrnIndex]->name) {
+	tmpFormat = malloc(strlen(format) +
+			   strlen(xf86Screens[scrnIndex]->name) +
+			   PREFIX_SIZE + 1);
+	if (!tmpFormat)
+	    return;
+
+	snprintf(tmpFormat, PREFIX_SIZE + 1, "%s(%d): ",
+		 xf86Screens[scrnIndex]->name, scrnIndex);
+
+	strcat(tmpFormat, format);
+	LogVMessageVerb(type, verb, tmpFormat, args);
+	free(tmpFormat);
+    } else
+	LogVMessageVerb(type, verb, format, args);
+}
+#undef PREFIX_SIZE
+
+/* Print driver messages, with verbose level specified directly */
+void
+xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb, const char *format,
+	       ...)
+{
+    va_list ap;
+
+    va_start(ap, format);
+    xf86VDrvMsgVerb(scrnIndex, type, verb, format, ap);
+    va_end(ap);
+}
+
+/* Print driver messages, with verbose level of 1 (default) */
+void
+xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
+{
+    va_list ap;
+
+    va_start(ap, format);
+    xf86VDrvMsgVerb(scrnIndex, type, 1, format, ap);
+    va_end(ap);
+}
+
+/* Print input driver messages in the standard format of
+   <driver>: <device name>: <message> */
+void
+xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *format,
+		 va_list args)
+{
+    char *msg;
+
+    if (asprintf(&msg, "%s: %s: %s", dev->drv->driverName, dev->name, format)
+	== -1) {
+	LogVMessageVerb(type, verb, "%s", args);
+    } else {
+	LogVMessageVerb(type, verb, msg, args);
+	free(msg);
+    }
+}
+
+/* Print input driver message, with verbose level specified directly */
+void
+xf86IDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *format,
+	       ...)
+{
+    va_list ap;
+
+    va_start(ap, format);
+    xf86VIDrvMsgVerb(dev, type, verb, format, ap);
+    va_end(ap);
+}
+
+/* Print input driver messages, with verbose level of 1 (default) */
+void
+xf86IDrvMsg(InputInfoPtr dev, MessageType type, const char *format, ...)
+{
+    va_list ap;
+
+    va_start(ap, format);
+    xf86VIDrvMsgVerb(dev, type, 1, format, ap);
+    va_end(ap);
+}
+
+
+/* Print non-driver messages with verbose level specified directly */
+void
+xf86MsgVerb(MessageType type, int verb, const char *format, ...)
+{
+    va_list ap;
+
+    va_start(ap, format);
+    LogVMessageVerb(type, verb, format, ap);
+    va_end(ap);
+}
+
+/* Print non-driver messages with verbose level of 1 (default) */
+void
+xf86Msg(MessageType type, const char *format, ...)
+{
+    va_list ap;
+
+    va_start(ap, format);
+    LogVMessageVerb(type, 1, format, ap);
+    va_end(ap);
+}
+
+/* Just like ErrorF, but with the verbose level checked */
+void
+xf86ErrorFVerb(int verb, const char *format, ...)
+{
+    va_list ap;
+
+    va_start(ap, format);
+    if (xf86Verbose >= verb || xf86LogVerbose >= verb)
+	LogVWrite(verb, format, ap);
+    va_end(ap);
+}
+
+/* Like xf86ErrorFVerb, but with an implied verbose level of 1 */
+void
+xf86ErrorF(const char *format, ...)
+{
+    va_list ap;
+
+    va_start(ap, format);
+    if (xf86Verbose >= 1 || xf86LogVerbose >= 1)
+	LogVWrite(1, format, ap);
+    va_end(ap);
+}
+
+
+void
+xf86LogInit(void)
+{
+    char *lf = NULL;
+
+#define LOGSUFFIX ".log"
+#define LOGOLDSUFFIX ".old"
+
+    /* Get the log file name */
+    if (xf86LogFileFrom == X_DEFAULT) {
+	/* Append the display number and ".log" */
+	if (asprintf(&lf, "%s%%s" LOGSUFFIX, xf86LogFile) == -1)
+	    FatalError("Cannot allocate space for the log file name\n");
+	xf86LogFile = lf;
+    }
+
+    xf86LogFile = LogInit(xf86LogFile, LOGOLDSUFFIX);
+    xf86LogFileWasOpened = TRUE;
+
+    xf86SetVerbosity(xf86Verbose);
+    xf86SetLogVerbosity(xf86LogVerbose);
+
+#undef LOGSUFFIX
+#undef LOGOLDSUFFIX
+
+    free(lf);
+}
+
+void
+xf86CloseLog(void)
+{
+    LogClose();
+}
+
+
+/*
+ * Drivers can use these for using their own SymTabRecs.
+ */
+
+const char *
+xf86TokenToString(SymTabPtr table, int token)
+{
+    int i;
+
+    for (i = 0; table[i].token >= 0 && table[i].token != token; i++)
+	;
+
+    if (table[i].token < 0)
+	return NULL;
+    else
+	return table[i].name;
+}
+
+int
+xf86StringToToken(SymTabPtr table, const char *string)
+{
+    int i;
+
+    if (string == NULL)
+	return -1;
+
+    for (i = 0; table[i].token >= 0 && xf86NameCmp(string, table[i].name); i++)
+	;
+
+    return table[i].token;
+}
+
+/*
+ * helper to display the clocks found on a card
+ */
+void
+xf86ShowClocks(ScrnInfoPtr scrp, MessageType from)
+{
+    int j;
+
+    xf86DrvMsg(scrp->scrnIndex, from, "Pixel clocks available:");
+    for (j=0; j < scrp->numClocks; j++) {
+	if ((j % 4) == 0) {
+	    xf86ErrorF("\n");
+	    xf86DrvMsg(scrp->scrnIndex, from, "pixel clocks:");
+	}
+	xf86ErrorF(" %7.3f", (double)scrp->clock[j] / 1000.0);
+    }
+    xf86ErrorF("\n");
+}
+
+
+/*
+ * This prints out the driver identify message, including the names of
+ * the supported chipsets.
+ *
+ * XXX This makes assumptions about the line width, etc.  Maybe we could
+ * use a more general "pretty print" function for messages.
+ */
+void
+xf86PrintChipsets(const char *drvname, const char *drvmsg, SymTabPtr chips)
+{
+    int len, i;
+
+    len = 6 + strlen(drvname) + 2 + strlen(drvmsg) + 2;
+    xf86Msg(X_INFO, "%s: %s:", drvname, drvmsg);
+    for (i = 0; chips[i].name != NULL; i++) {
+	if (i != 0) {
+	    xf86ErrorF(",");
+	    len++;
+	}
+	if (len + 2 + strlen(chips[i].name) < 78) {
+	    xf86ErrorF(" ");
+	    len++;
+	} else {
+	    xf86ErrorF("\n\t");
+	    len = 8;
+	}
+	xf86ErrorF("%s", chips[i].name);
+	len += strlen(chips[i].name);
+    }
+    xf86ErrorF("\n");
+}
+
+
+int
+xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
+{
+    GDevPtr       gdp, *pgdp = NULL;
+    confScreenPtr screensecptr;
+    int i,j;
+
+    if (sectlist)
+	*sectlist = NULL;
+
+    /*
+     * This can happen when running Xorg -showopts and a module like ati
+     * or vmware tries to load its submodules when xf86ConfigLayout is empty
+     */
+    if (!xf86ConfigLayout.screens)
+	return 0;
+
+    /*
+     * This is a very important function that matches the device sections
+     * as they show up in the config file with the drivers that the server
+     * loads at run time.
+     *
+     * ChipProbe can call
+     * int xf86MatchDevice(char * drivername, GDevPtr ** sectlist)
+     * with its driver name. The function allocates an array of GDevPtr and
+     * returns this via sectlist and returns the number of elements in
+     * this list as return value. 0 means none found, -1 means fatal error.
+     *
+     * It can figure out which of the Device sections to use for which card
+     * (using things like the Card statement, etc). For single headed servers
+     * there will of course be just one such Device section.
+     */
+    i = 0;
+
+    /*
+     * first we need to loop over all the Screens sections to get to all
+     * 'active' device sections
+     */
+    for (j=0; xf86ConfigLayout.screens[j].screen != NULL; j++) {
+        screensecptr = xf86ConfigLayout.screens[j].screen;
+        if ((screensecptr->device->driver != NULL)
+            && (xf86NameCmp( screensecptr->device->driver,drivername) == 0)
+            && (! screensecptr->device->claimed)) {
+            /*
+             * we have a matching driver that wasn't claimed, yet
+             */
+            pgdp = xnfrealloc(pgdp, (i + 2) * sizeof(GDevPtr));
+            pgdp[i++] = screensecptr->device;
+        }
+    }
+
+    /* Then handle the inactive devices */
+    j = 0;
+    while (xf86ConfigLayout.inactives[j].identifier) {
+	gdp = &xf86ConfigLayout.inactives[j];
+	if (gdp->driver && !gdp->claimed &&
+	    !xf86NameCmp(gdp->driver,drivername)) {
+	    /* we have a matching driver that wasn't claimed yet */
+	    pgdp = xnfrealloc(pgdp, (i + 2) * sizeof(GDevPtr));
+	    pgdp[i++] = gdp;
+	}
+	j++;
+    }
+
+    /*
+     * make the array NULL terminated and return its address
+     */
+    if (i)
+        pgdp[i] = NULL;
+
+    if (sectlist)
+	*sectlist = pgdp;
+    else
+	free(pgdp);
+    return i;
+}
+
+/*
+ * xf86GetClocks -- get the dot-clocks via a BIG BAD hack ...
+ */
+void
+xf86GetClocks(ScrnInfoPtr pScrn, int num, Bool (*ClockFunc)(ScrnInfoPtr, int),
+	      void (*ProtectRegs)(ScrnInfoPtr, Bool),
+	      void (*BlankScreen)(ScrnInfoPtr, Bool), IOADDRESS vertsyncreg,
+	      int maskval, int knownclkindex, int knownclkvalue)
+{
+    register int status = vertsyncreg;
+    unsigned long i, cnt, rcnt, sync;
+
+    /* First save registers that get written on */
+    (*ClockFunc)(pScrn, CLK_REG_SAVE);
+
+    if (num > MAXCLOCKS)
+	num = MAXCLOCKS;
+
+    for (i = 0; i < num; i++)
+    {
+	if (ProtectRegs)
+	    (*ProtectRegs)(pScrn, TRUE);
+	if (!(*ClockFunc)(pScrn, i))
+	{
+	    pScrn->clock[i] = -1;
+	    continue;
+	}
+	if (ProtectRegs)
+	    (*ProtectRegs)(pScrn, FALSE);
+	if (BlankScreen)
+	    (*BlankScreen)(pScrn, FALSE);
+
+    	usleep(50000);     /* let VCO stabilise */
+
+    	cnt  = 0;
+    	sync = 200000;
+
+	while ((inb(status) & maskval) == 0x00)
+	    if (sync-- == 0) goto finish;
+	/* Something appears to be happening, so reset sync count */
+	sync = 200000;
+	while ((inb(status) & maskval) == maskval)
+	    if (sync-- == 0) goto finish;
+	/* Something appears to be happening, so reset sync count */
+	sync = 200000;
+	while ((inb(status) & maskval) == 0x00)
+	    if (sync-- == 0) goto finish;
+
+	for (rcnt = 0; rcnt < 5; rcnt++)
+	{
+	    while (!(inb(status) & maskval))
+		cnt++;
+	    while ((inb(status) & maskval))
+		cnt++;
+	}
+
+finish:
+	pScrn->clock[i] = cnt ? cnt : -1;
+	if (BlankScreen)
+            (*BlankScreen)(pScrn, TRUE);
+    }
+
+    for (i = 0; i < num; i++)
+    {
+	if (i != knownclkindex)
+	{
+	    if (pScrn->clock[i] == -1)
+	    {
+		pScrn->clock[i] = 0;
+	    }
+	    else
+	    {
+		pScrn->clock[i] = (int)(0.5 +
+                    (((float)knownclkvalue) * pScrn->clock[knownclkindex]) /
+	            (pScrn->clock[i]));
+		/* Round to nearest 10KHz */
+		pScrn->clock[i] += 5;
+		pScrn->clock[i] /= 10;
+		pScrn->clock[i] *= 10;
+	    }
+	}
+    }
+
+    pScrn->clock[knownclkindex] = knownclkvalue;
+    pScrn->numClocks = num;
+
+    /* Restore registers that were written on */
+    (*ClockFunc)(pScrn, CLK_REG_RESTORE);
+}
+
+const char *
+xf86GetVisualName(int visual)
+{
+    if (visual < 0 || visual > DirectColor)
+	return NULL;
+
+    return xf86VisualNames[visual];
+}
+
+
+int
+xf86GetVerbosity(void)
+{
+    return max(xf86Verbose, xf86LogVerbose);
+}
+
+Pix24Flags
+xf86GetPix24(void)
+{
+    return xf86Info.pixmap24;
+}
+
+
+int
+xf86GetDepth(void)
+{
+    return xf86Depth;
+}
+
+
+rgb
+xf86GetWeight(void)
+{
+    return xf86Weight;
+}
+
+
+Gamma
+xf86GetGamma(void)
+{
+    return xf86Gamma;
+}
+
+
+Bool
+xf86GetFlipPixels(void)
+{
+    return xf86FlipPixels;
+}
+
+
+const char *
+xf86GetServerName(void)
+{
+    return xf86ServerName;
+}
+
+
+Bool
+xf86ServerIsExiting(void)
+{
+    return (dispatchException & DE_TERMINATE) == DE_TERMINATE;
+}
+
+
+Bool
+xf86ServerIsResetting(void)
+{
+    return xf86Resetting;
+}
+
+
+Bool
+xf86ServerIsInitialising(void)
+{
+    return xf86Initialising;
+}
+
+
+Bool
+xf86ServerIsOnlyDetecting(void)
+{
+    return xf86DoConfigure;
+}
+
+
+Bool
+xf86CaughtSignal(void)
+{
+    return xf86Info.caughtSignal;
+}
+
+
+Bool
+xf86GetVidModeAllowNonLocal(void)
+{
+    return xf86Info.vidModeAllowNonLocal;
+}
+
+
+Bool
+xf86GetVidModeEnabled(void)
+{
+    return xf86Info.vidModeEnabled;
+}
+
+Bool
+xf86GetModInDevAllowNonLocal(void)
+{
+    return xf86Info.miscModInDevAllowNonLocal;
+}
+
+
+Bool
+xf86GetModInDevEnabled(void)
+{
+    return xf86Info.miscModInDevEnabled;
+}
+
+
+Bool
+xf86GetAllowMouseOpenFail(void)
+{
+    return xf86Info.allowMouseOpenFail;
+}
+
+
+Bool
+xf86IsPc98(void)
+{
+#if SUPPORT_PC98
+    return xf86Info.pc98;
+#else
+    return FALSE;
+#endif
+}
+
+void
+xf86DisableRandR(void)
+{
+    xf86Info.disableRandR = TRUE;
+    xf86Info.randRFrom = X_PROBED;
+}
+
+CARD32
+xf86GetModuleVersion(pointer module)
+{
+    return (CARD32)LoaderGetModuleVersion(module);
+}
+
+pointer
+xf86LoadDrvSubModule(DriverPtr drv, const char *name)
+{
+    pointer ret;
+    int errmaj = 0, errmin = 0;
+
+    ret = LoadSubModule(drv->module, name, NULL, NULL, NULL, NULL,
+			&errmaj, &errmin);
+    if (!ret)
+	LoaderErrorMsg(NULL, name, errmaj, errmin);
+    return ret;
+}
+
+pointer
+xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
+{
+    pointer ret;
+    int errmaj = 0, errmin = 0;
+
+    ret = LoadSubModule(pScrn->module, name, NULL, NULL, NULL, NULL,
+			&errmaj, &errmin);
+    if (!ret)
+	LoaderErrorMsg(pScrn->name, name, errmaj, errmin);
+    return ret;
+}
+
+/*
+ * xf86LoadOneModule loads a single module.
+ */
+pointer
+xf86LoadOneModule(char *name, pointer opt)
+{
+    int errmaj, errmin;
+    char *Name;
+    pointer mod;
+
+    if (!name)
+	return NULL;
+
+    /* Normalise the module name */
+    Name = xf86NormalizeName(name);
+
+    /* Skip empty names */
+    if (Name == NULL)
+	return NULL;
+    if (*Name == '\0') {
+	free(Name);
+	return NULL;
+    }
+
+    mod = LoadModule(Name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin);
+    if (!mod)
+	LoaderErrorMsg(NULL, Name, errmaj, errmin);
+    free(Name);
+    return mod;
+}
+
+void
+xf86UnloadSubModule(pointer mod)
+{
+    /*
+     * This is disabled for now.  The loader isn't smart enough yet to undo
+     * relocations.
+     */
+#if 0
+    UnloadSubModule(mod);
+#endif
+}
+
+Bool
+xf86LoaderCheckSymbol(const char *name)
+{
+    return LoaderSymbol(name) != NULL;
+}
+
+typedef enum {
+   OPTION_BACKING_STORE
+} BSOpts;
+
+static const OptionInfoRec BSOptions[] = {
+   { OPTION_BACKING_STORE, "BackingStore", OPTV_BOOLEAN, {0}, FALSE },
+   { -1,                   NULL,           OPTV_NONE,    {0}, FALSE }
+};
+
+void
+xf86SetBackingStore(ScreenPtr pScreen)
+{
+    Bool useBS = FALSE;
+    MessageType from = X_DEFAULT;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    OptionInfoPtr options;
+
+    options = xnfalloc(sizeof(BSOptions));
+    (void)memcpy(options, BSOptions, sizeof(BSOptions));
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
+
+    /* check for commandline option here */
+    if (xf86bsEnableFlag) {
+	from = X_CMDLINE;
+	useBS = TRUE;
+    } else if (xf86bsDisableFlag) {
+	from = X_CMDLINE;
+	useBS = FALSE;
+    } else {
+	if (xf86GetOptValBool(options, OPTION_BACKING_STORE, &useBS))
+	    from = X_CONFIG;
+    }
+    free(options);
+    pScreen->backingStoreSupport = useBS ? Always : NotUseful;
+    if (serverGeneration == 1)
+	xf86DrvMsg(pScreen->myNum, from, "Backing store %s\n",
+		   useBS ? "enabled" : "disabled");
+}
+
+
+typedef enum {
+   OPTION_SILKEN_MOUSE
+} SMOpts;
+
+static const OptionInfoRec SMOptions[] = {
+   { OPTION_SILKEN_MOUSE, "SilkenMouse",   OPTV_BOOLEAN, {0}, FALSE },
+   { -1,                   NULL,           OPTV_NONE,    {0}, FALSE }
+};
+
+void
+xf86SetSilkenMouse (ScreenPtr pScreen)
+{
+    Bool useSM = TRUE;
+    MessageType from = X_DEFAULT;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    OptionInfoPtr options;
+
+    options = xnfalloc(sizeof(SMOptions));
+    (void)memcpy(options, SMOptions, sizeof(SMOptions));
+    xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, options);
+
+    /* check for commandline option here */
+    /* disable if screen shares resources */
+	/* TODO VGA arb disable silken mouse */
+    if (xf86silkenMouseDisableFlag) {
+        from = X_CMDLINE;
+	useSM = FALSE;
+    } else {
+	if (xf86GetOptValBool(options, OPTION_SILKEN_MOUSE, &useSM))
+	    from = X_CONFIG;
+    }
+    free(options);
+    /*
+     * XXX quick hack to report correctly for OSs that can't do SilkenMouse
+     * yet.  Should handle this differently so that alternate async methods
+     * work correctly with this too.
+     */
+    pScrn->silkenMouse = useSM && xf86Info.useSIGIO && xf86SIGIOSupported();
+    if (serverGeneration == 1)
+	xf86DrvMsg(pScreen->myNum, from, "Silken mouse %s\n",
+		   pScrn->silkenMouse ? "enabled" : "disabled");
+}
+
+/* Wrote this function for the PM2 Xv driver, preliminary. */
+
+pointer
+xf86FindXvOptions(int scrnIndex, int adaptor_index, char *port_name,
+		  char **adaptor_name, pointer *adaptor_options)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    confXvAdaptorPtr adaptor;
+    int i;
+
+    if (adaptor_index >= pScrn->confScreen->numxvadaptors) {
+	if (adaptor_name) *adaptor_name = NULL;
+	if (adaptor_options) *adaptor_options = NULL;
+	return NULL;
+    }
+
+    adaptor = &pScrn->confScreen->xvadaptors[adaptor_index];
+    if (adaptor_name) *adaptor_name = adaptor->identifier;
+    if (adaptor_options) *adaptor_options = adaptor->options;
+
+    for (i = 0; i < adaptor->numports; i++)
+	if (!xf86NameCmp(adaptor->ports[i].identifier, port_name))
+	    return adaptor->ports[i].options;
+
+    return NULL;
+}
+
+/* Rather than duplicate loader's get OS function, just include it directly */
+#define LoaderGetOS xf86GetOS
+#include "loader/os.c"
+
+static void
+xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init,
+			   EntityProc enter, EntityProc leave, pointer private)
+{
+    ScrnInfoPtr pScrn;
+
+    if ((pScrn = xf86FindScreenForEntity(pEnt->index)))
+	xf86RemoveEntityFromScreen(pScrn,pEnt->index);
+    xf86SetEntityFuncs(pEnt->index,init,enter,leave,private);
+}
+
+ScrnInfoPtr
+xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
+		   EntityProc init, EntityProc enter, EntityProc leave,
+		   pointer private)
+{
+    EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
+    if (!pEnt) return pScrn;
+
+    if (!(pEnt->location.type == BUS_NONE)) {
+	free(pEnt);
+	return pScrn;
+    }
+
+    if (!pEnt->active) {
+	xf86ConfigFbEntityInactive(pEnt, init,  enter, leave,  private);
+	free(pEnt);
+	return pScrn;
+    }
+
+    if (!pScrn)
+	pScrn = xf86AllocateScreen(pEnt->driver,scrnFlag);
+    xf86AddEntityToScreen(pScrn,entityIndex);
+
+    xf86SetEntityFuncs(entityIndex,init,enter,leave,private);
+
+    return pScrn;
+}
+
+Bool
+xf86IsScreenPrimary(int scrnIndex)
+{
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    int i;
+
+    for (i=0 ; i < pScrn->numEntities; i++) {
+	if (xf86IsEntityPrimary(i))
+	    return TRUE;
+    }
+    return FALSE;
+}
+
+int
+xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
+			       int format, unsigned long len, pointer value )
+{
+    RootWinPropPtr pNewProp = NULL, pRegProp;
+    int i;
+    Bool existing = FALSE;
+
+    DebugF("xf86RegisterRootWindowProperty(%d, %ld, %ld, %d, %ld, %p)\n",
+	   ScrnIndex, property, type, format, len, value);
+
+    if (ScrnIndex<0 || ScrnIndex>=xf86NumScreens) {
+      return BadMatch;
+    }
+
+    if (xf86RegisteredPropertiesTable &&
+	xf86RegisteredPropertiesTable[ScrnIndex]) {
+      for (pNewProp = xf86RegisteredPropertiesTable[ScrnIndex];
+	   pNewProp; pNewProp = pNewProp->next) {
+	if (strcmp(pNewProp->name, NameForAtom(property)) == 0)
+	  break;
+      }
+    }
+
+    if (!pNewProp) {
+      if ((pNewProp = (RootWinPropPtr)malloc(sizeof(RootWinProp))) == NULL) {
+	return BadAlloc;
+      }
+      /*
+       * We will put this property at the end of the list so that
+       * the changes are made in the order they were requested.
+       */
+      pNewProp->next = NULL;
+    } else {
+      free(pNewProp->name);
+      existing = TRUE;
+    }
+
+    pNewProp->name = xnfstrdup(NameForAtom(property));
+    pNewProp->type = type;
+    pNewProp->format = format;
+    pNewProp->size = len;
+    pNewProp->data = value;
+
+    DebugF("new property filled\n");
+
+    if (NULL==xf86RegisteredPropertiesTable) {
+      DebugF("creating xf86RegisteredPropertiesTable[] size %d\n",
+	     xf86NumScreens);
+      if ( NULL==(xf86RegisteredPropertiesTable=(RootWinPropPtr*)xnfcalloc(sizeof(RootWinProp),xf86NumScreens) )) {
+	return BadAlloc;
+      }
+      for (i=0; i<xf86NumScreens; i++) {
+	xf86RegisteredPropertiesTable[i] = NULL;
+      }
+    }
+
+    DebugF("xf86RegisteredPropertiesTable %p\n",
+	   (void *)xf86RegisteredPropertiesTable);
+    DebugF("xf86RegisteredPropertiesTable[%d] %p\n",
+	   ScrnIndex, (void *)xf86RegisteredPropertiesTable[ScrnIndex]);
+
+    if (!existing) {
+      if ( xf86RegisteredPropertiesTable[ScrnIndex] == NULL) {
+	xf86RegisteredPropertiesTable[ScrnIndex] = pNewProp;
+      } else {
+	pRegProp = xf86RegisteredPropertiesTable[ScrnIndex];
+	while (pRegProp->next != NULL) {
+	  DebugF("- next %p\n", (void *)pRegProp);
+	  pRegProp = pRegProp->next;
+        }
+	pRegProp->next = pNewProp;
+      }
+    }
+    DebugF("xf86RegisterRootWindowProperty succeeded\n");
+    return Success;
+}
+
+Bool
+xf86IsUnblank(int mode)
+{
+    switch(mode) {
+    case SCREEN_SAVER_OFF:
+    case SCREEN_SAVER_FORCER:
+	return TRUE;
+    case SCREEN_SAVER_ON:
+    case SCREEN_SAVER_CYCLE:
+	return FALSE;
+    default:
+	xf86MsgVerb(X_WARNING, 0, "Unexpected save screen mode: %d\n", mode);
+	return TRUE;
+    }
+}
+
+void
+xf86MotionHistoryAllocate(InputInfoPtr pInfo)
+{
+    AllocateMotionHistory(pInfo->dev);
+}
diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index 49a98bd05..581047dcf 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -82,7 +82,7 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(9, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(10, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(12, 2)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(5, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
diff --git a/xorg-server/hw/xfree86/common/xf86sbusBus.c b/xorg-server/hw/xfree86/common/xf86sbusBus.c
index c0de88dda..181c6ab00 100644
--- a/xorg-server/hw/xfree86/common/xf86sbusBus.c
+++ b/xorg-server/hw/xfree86/common/xf86sbusBus.c
@@ -1,714 +1,714 @@
-/*

- * SBUS bus-specific code.

- *

- * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)

- *

- * 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

- * JAKUB JELINEK 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.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <ctype.h>

-#include <stdio.h>

-#include <unistd.h>

-#include <X11/X.h>

-#include "os.h"

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-#include "xf86cmap.h"

-

-#include "xf86Bus.h"

-

-#include "xf86sbusBus.h"

-#include "xf86Sbus.h"

-

-Bool sbusSlotClaimed = FALSE;

-

-static int xf86nSbusInfo;

-

-static void

-CheckSbusDevice(const char *device, int fbNum)

-{

-    int fd, i;

-    struct fbgattr fbattr;

-    sbusDevicePtr psdp;

-

-    fd = open(device, O_RDONLY, 0);

-    if (fd < 0)

-	return;

-    memset(&fbattr, 0, sizeof(fbattr));

-    if (ioctl(fd, FBIOGATTR, &fbattr) < 0) {

-	if (ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0) {

-	    close(fd);

-	    return;

-	}

-    }

-    close(fd);

-    for (i = 0; sbusDeviceTable[i].devId; i++)

-	if (sbusDeviceTable[i].fbType == fbattr.fbtype.fb_type)

-	    break;

-    if (! sbusDeviceTable[i].devId)

-	return;

-    xf86SbusInfo = xnfrealloc(xf86SbusInfo, sizeof(psdp) * (++xf86nSbusInfo + 1));

-    xf86SbusInfo[xf86nSbusInfo] = NULL;

-    xf86SbusInfo[xf86nSbusInfo - 1] = psdp = xnfcalloc(sizeof (sbusDevice), 1);

-    psdp->devId = sbusDeviceTable[i].devId;

-    psdp->fbNum = fbNum;

-    psdp->device = xnfstrdup(device);

-    psdp->width = fbattr.fbtype.fb_width;

-    psdp->height = fbattr.fbtype.fb_height;

-    psdp->fd = -1;

-}

-

-void

-xf86SbusProbe(void)

-{

-    int i, useProm = 0;

-    char fbDevName[32];

-    sbusDevicePtr psdp, *psdpp;

-

-    xf86SbusInfo = malloc(sizeof(psdp));

-    *xf86SbusInfo = NULL;

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

-	sprintf(fbDevName, "/dev/fb%d", i);

-	CheckSbusDevice(fbDevName, i);

-    }

-    if (sparcPromInit() >= 0) {

-	useProm = 1;

-	sparcPromAssignNodes();

-    }

-    for (psdpp = xf86SbusInfo; (psdp = *psdpp); psdpp++) {

-	for (i = 0; sbusDeviceTable[i].devId; i++)

-	    if (sbusDeviceTable[i].devId == psdp->devId)

-		psdp->descr = sbusDeviceTable[i].descr;

-	/*

-	 * If we can use PROM information and found the PROM node for this

-	 * device, we can tell more about the card.

-	 */

-	if (useProm && psdp->node.node) {

-	    char *prop, *promPath;

-	    int len, chiprev, vmsize;

-

-	    switch (psdp->devId) {

-	    case SBUS_DEVICE_MGX:

-		prop = sparcPromGetProperty(&psdp->node, "fb_size", &len);

-		if (prop && len == 4 && *(int *)prop == 0x400000)

-		    psdp->descr = "Quantum 3D MGXplus with 4M VRAM";

-		break;

-	    case SBUS_DEVICE_CG6:

-		chiprev = 0;

-		vmsize = 0;

-		prop = sparcPromGetProperty(&psdp->node, "chiprev", &len);

-		if (prop && len == 4)

-		    chiprev = *(int *)prop;

-		prop = sparcPromGetProperty(&psdp->node, "vmsize", &len);

-		if (prop && len == 4)

-		    vmsize = *(int *)prop;

-		switch (chiprev) {

-		case 1:

-		case 2:

-		case 3:

-		case 4:

-		    psdp->descr = "Sun Double width GX"; break;

-		case 5:

-		case 6:

-		case 7:

-		case 8:

-		case 9:

-		    psdp->descr = "Sun Single width GX"; break;

-		case 11:

-		    switch (vmsize) {

-		    case 2:

-			psdp->descr = "Sun Turbo GX with 1M VSIMM"; break;

-		    case 4:

-			psdp->descr = "Sun Turbo GX Plus"; break;

-		    default:

-			psdp->descr = "Sun Turbo GX"; break;

-		    }

-		}

-		break;

-	    case SBUS_DEVICE_CG14:

-		prop = sparcPromGetProperty(&psdp->node, "reg", &len);

-		vmsize = 0;

-		if (prop && !(len % 12) && len > 0)

-		    vmsize = *(int *)(prop + len - 4);

-		switch (vmsize) {

-		case 0x400000:

-		    psdp->descr = "Sun SX with 4M VSIMM"; break;

-		case 0x800000:

-		    psdp->descr = "Sun SX with 8M VSIMM"; break;

-		}

-		break;

-	    case SBUS_DEVICE_LEO:

-		prop = sparcPromGetProperty(&psdp->node, "model", &len);

-		if (prop && len > 0 && !strstr(prop, "501-2503"))

-		    psdp->descr = "Sun Turbo ZX";

-		break;

-	    case SBUS_DEVICE_TCX:

-		if (sparcPromGetBool(&psdp->node, "tcx-8-bit"))

-		    psdp->descr = "Sun TCX (8bit)";

-		else

-		    psdp->descr = "Sun TCX (S24)";

-		break;

-	    case SBUS_DEVICE_FFB:

-		prop = sparcPromGetProperty(&psdp->node, "name", &len);

-		chiprev = 0;

-		prop = sparcPromGetProperty(&psdp->node, "board_type", &len);

-		if (prop && len == 4)

-		    chiprev = *(int *)prop;

-		if (strstr (prop, "afb")) {

-		    if (chiprev == 3)

-			psdp->descr = "Sun|Elite3D-M6 Horizontal";

-		} else {

-		    switch (chiprev) {

-		    case 0x08:

-			psdp->descr = "Sun FFB 67MHz Creator"; break;

-		    case 0x0b:

-			psdp->descr = "Sun FFB 67MHz Creator 3D"; break;

-		    case 0x1b:

-			psdp->descr = "Sun FFB 75MHz Creator 3D"; break;

-		    case 0x20:

-		    case 0x28:

-			psdp->descr = "Sun FFB2 Vertical Creator"; break;

-		    case 0x23:

-		    case 0x2b:

-			psdp->descr = "Sun FFB2 Vertical Creator 3D"; break;

-		    case 0x30:

-			psdp->descr = "Sun FFB2+ Vertical Creator"; break;

-		    case 0x33:

-			psdp->descr = "Sun FFB2+ Vertical Creator 3D"; break;

-		    case 0x40:

-		    case 0x48:

-			psdp->descr = "Sun FFB2 Horizontal Creator"; break;

-		    case 0x43:

-		    case 0x4b:

-			psdp->descr = "Sun FFB2 Horizontal Creator 3D"; break;

-		    }

-		}

-		break;

-	    }

-

-	    xf86Msg(X_PROBED, "SBUS:(0x%08x) %s", psdp->node.node, psdp->descr);

-	    promPath = sparcPromNode2Pathname (&psdp->node);

-	    if (promPath) {

-		xf86ErrorF(" at %s", promPath);

-		free(promPath);

-	    }

-	} else

-	    xf86Msg(X_PROBED, "SBUS: %s", psdp->descr);

-	xf86ErrorF("\n");

-    }

-    if (useProm)

-	sparcPromClose();

-}

-

-/*

- * Parse a BUS ID string, and return the SBUS bus parameters if it was

- * in the correct format for a SBUS bus id.

- */

-

-Bool

-xf86ParseSbusBusString(const char *busID, int *fbNum)

-{

-    /*

-     * The format is assumed to be one of:

-     * "fbN", e.g. "fb1", which means the device corresponding to /dev/fbN

-     * "nameN", e.g. "cgsix0", which means Nth instance of card NAME

-     * "/prompath", e.g. "/sbus@0,10001000/cgsix@3,0" which is PROM pathname

-     * to the device.

-     */

-

-    const char *id;

-    int i, len;

-

-    if (StringToBusType(busID, &id) != BUS_SBUS)

-	return FALSE;

-

-    if (*id != '/') {

-	if (!strncmp (id, "fb", 2)) {

-	    if (!isdigit(id[2]))

-		return FALSE;

-	    *fbNum = atoi(id + 2);

-	    return TRUE;

-	} else {

-	    sbusDevicePtr *psdpp;

-	    int devId;

-

-	    for (i = 0, len = 0; sbusDeviceTable[i].devId; i++) {

-		len = strlen(sbusDeviceTable[i].promName);

-		if (!strncmp (sbusDeviceTable[i].promName, id, len)

-		    && isdigit(id[len]))

-		    break;

-	    }

-	    devId = sbusDeviceTable[i].devId;

-	    if (!devId) return FALSE;

-	    i = atoi(id + len);

-	    for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {

-		if ((*psdpp)->devId != devId)

-		    continue;

-		if (!i) {

-		    *fbNum = (*psdpp)->fbNum;

-		    return TRUE;

-		}

-		i--;

-	    }

-	}

-	return FALSE;

-    }

-

-    if (sparcPromInit() >= 0) {

-	i = sparcPromPathname2Node(id);

-	sparcPromClose();

-	if (i) {

-	    sbusDevicePtr *psdpp;

-	    for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {

-		if ((*psdpp)->node.node == i) {

-		    *fbNum = (*psdpp)->fbNum;

-		    return TRUE;

-		}

-	    }

-	}

-    }

-    return FALSE;

-}

-

-/*

- * Compare a BUS ID string with a SBUS bus id.  Return TRUE if they match.

- */

-

-Bool

-xf86CompareSbusBusString(const char *busID, int fbNum)

-{

-    int iFbNum;

-

-    if (xf86ParseSbusBusString(busID, &iFbNum)) {

-	return fbNum == iFbNum;

-    } else {

-	return FALSE;

-    }

-}

-

-/*

- * Check if the slot requested is free.  If it is already in use, return FALSE.

- */

-

-Bool

-xf86CheckSbusSlot(int fbNum)

-{

-    int i;

-    EntityPtr p;

-

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

-	p = xf86Entities[i];

-	/* Check if this SBUS slot is taken */

-	if (p->bus.type == BUS_SBUS && p->bus.id.sbus.fbNum == fbNum)

-	    return FALSE;

-    }

-

-    return TRUE;

-}

-

-/*

- * If the slot requested is already in use, return -1.

- * Otherwise, claim the slot for the screen requesting it.

- */

-

-int

-xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp,

-		  GDevPtr dev, Bool active)

-{

-    EntityPtr p = NULL;

-

-    int num;

-

-    if (xf86CheckSbusSlot(psdp->fbNum)) {

-        num = xf86AllocateEntity();

-        p = xf86Entities[num];

-        p->driver = drvp;

-        p->chipset = -1;

-        p->bus.type = BUS_SBUS;

-        xf86AddDevToEntity(num, dev);

-        p->bus.id.sbus.fbNum = psdp->fbNum;

-        p->active = active;

-        p->inUse = FALSE;

-	sbusSlotClaimed = TRUE;

-	return num;

-    } else

-	return -1;

-}

-

-int

-xf86MatchSbusInstances(const char *driverName, int sbusDevId, 

-		       GDevPtr *devList, int numDevs, DriverPtr drvp,

-		       int **foundEntities)

-{

-    int i,j;

-    sbusDevicePtr psdp, *psdpp;

-    int numClaimedInstances = 0;

-    int allocatedInstances = 0;

-    int numFound = 0;

-    GDevPtr devBus = NULL;

-    GDevPtr dev = NULL;

-    int *retEntities = NULL;

-    int useProm = 0;

-

-    struct Inst {

-	sbusDevicePtr	sbus;

-	GDevPtr		dev;

-	Bool		claimed;  /* BusID matches with a device section */

-    } *instances = NULL;

-

-    *foundEntities = NULL;

-    for (psdpp = xf86SbusInfo, psdp = *psdpp; psdp; psdp = *++psdpp) {

-	if (psdp->devId != sbusDevId)

-	    continue;

-	if (psdp->fd == -2)

-	    continue;

-	++allocatedInstances;

-	instances = xnfrealloc(instances,

-			       allocatedInstances * sizeof(struct Inst));

-	instances[allocatedInstances - 1].sbus = psdp;

-	instances[allocatedInstances - 1].dev = NULL;

-	instances[allocatedInstances - 1].claimed = FALSE;

-	numFound++;

-    }

-

-    /*

-     * This may be debatable, but if no SBUS devices with a matching vendor

-     * type is found, return zero now.  It is probably not desirable to

-     * allow the config file to override this.

-     */

-    if (allocatedInstances <= 0) {

-	free(instances);

-	return 0;

-    }

-

-    if (sparcPromInit() >= 0)

-	useProm = 1;

-

-    if (xf86DoConfigure && xf86DoConfigurePass1) {

-	GDevPtr pGDev;

-	int actualcards = 0;

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

-	    actualcards++;

-	    pGDev = xf86AddBusDeviceToConfigure(drvp->driverName, BUS_SBUS,

-						instances[i].sbus, -1);

-	    if (pGDev) {

-		/*

-		 * XF86Match???Instances() treat chipID and chipRev as

-		 * overrides, so clobber them here.

-		 */

-		pGDev->chipID = pGDev->chipRev = -1;

-	    }

-	}

-	free(instances);

-	if (useProm)

-	    sparcPromClose();

-	return actualcards;

-    }

-

-    DebugF("%s instances found: %d\n", driverName, allocatedInstances);

-

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

-	char *promPath = NULL;

-

-	psdp = instances[i].sbus;

-	devBus = NULL;

-	dev = NULL;

-	if (useProm && psdp->node.node)

-	    promPath = sparcPromNode2Pathname(&psdp->node);

-

-	for (j = 0; j < numDevs; j++) {

-	    if (devList[j]->busID && *devList[j]->busID) {

-		if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) {

-		    if (devBus)

-			xf86MsgVerb(X_WARNING,0,

-			    "%s: More than one matching Device section for "

-			    "instance (BusID: %s) found: %s\n",

-			    driverName,devList[j]->identifier,

-			    devList[j]->busID);

-		    else

-			devBus = devList[j];

-		} 

-	    } else {

-		if (!dev && !devBus) {

-		    if (promPath)

-			xf86Msg(X_PROBED, "Assigning device section with no busID to SBUS:%s\n",

-				promPath);

-		    else

-			xf86Msg(X_PROBED, "Assigning device section with no busID to SBUS:fb%d\n",

-				psdp->fbNum);

-		    dev = devList[j];

-		} else

-		    xf86MsgVerb(X_WARNING, 0,

-			    "%s: More than one matching Device section "

-			    "found: %s\n", driverName, devList[j]->identifier);

-	    }

-	}

-	if (devBus) dev = devBus;  /* busID preferred */ 

-	if (!dev && psdp->fd != -2) {

-	    if (promPath) {

-		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "

-			    "for instance (BusID SBUS:%s) found\n",

-			    driverName, promPath);

-	    } else

-		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "

-			    "for instance (BusID SBUS:fb%d) found\n",

-			    driverName, psdp->fbNum);

-	} else if (dev) {

-	    numClaimedInstances++;

-	    instances[i].claimed = TRUE;

-	    instances[i].dev = dev;

-	}

-	free(promPath);

-    }

-

-    DebugF("%s instances found: %d\n", driverName, numClaimedInstances);

-

-    /*

-     * Of the claimed instances, check that another driver hasn't already

-     * claimed its slot.

-     */

-    numFound = 0;

-    for (i = 0; i < allocatedInstances && numClaimedInstances > 0; i++) {

-	if (!instances[i].claimed)

-	    continue;

-	psdp = instances[i].sbus;

-	if (!xf86CheckSbusSlot(psdp->fbNum))

-	    continue;

-

-	DebugF("%s: card at fb%d %08x is claimed by a Device section\n",

-	       driverName, psdp->fbNum, psdp->node.node);

-

-	/* Allocate an entry in the lists to be returned */

-	numFound++;

-	retEntities = xnfrealloc(retEntities, numFound * sizeof(int));

-	retEntities[numFound - 1]

-	    = xf86ClaimSbusSlot(psdp, drvp, instances[i].dev,instances[i].dev->active ?

-				TRUE : FALSE);

-    }

-    free(instances);

-    if (numFound > 0) {

-	*foundEntities = retEntities;

-    }

-

-    if (useProm)

-	sparcPromClose();

-

-    return numFound;

-}

-

-/*

- * xf86GetSbusInfoForEntity() -- Get the sbusDevicePtr of entity.

- */

-sbusDevicePtr

-xf86GetSbusInfoForEntity(int entityIndex)

-{

-    sbusDevicePtr *psdpp;

-    EntityPtr p = xf86Entities[entityIndex];

-

-    if (entityIndex >= xf86NumEntities

-	|| p->bus.type != BUS_SBUS) return NULL;

-

-    for (psdpp = xf86SbusInfo; *psdpp != NULL; psdpp++) {

-	if (p->bus.id.sbus.fbNum == (*psdpp)->fbNum)

-	    return *psdpp;

-    }

-    return NULL;

-}

-

-int

-xf86GetEntityForSbusInfo(sbusDevicePtr psdp)

-{

-    int i;

-

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

-	EntityPtr p = xf86Entities[i];

-	if (p->bus.type != BUS_SBUS) continue;

-

-	if (p->bus.id.sbus.fbNum == psdp->fbNum)

-	    return i;

-    }

-    return -1;

-}

-

-void

-xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp)

-{

-    DisplayModePtr mode;

-

-    mode = xnfcalloc(sizeof(DisplayModeRec), 1);

-    mode->name = "current";

-    mode->next = mode;

-    mode->prev = mode;

-    mode->type = M_T_BUILTIN;

-    mode->Clock = 100000000;

-    mode->HDisplay = psdp->width;

-    mode->HSyncStart = psdp->width;

-    mode->HSyncEnd = psdp->width;

-    mode->HTotal = psdp->width;

-    mode->VDisplay = psdp->height;

-    mode->VSyncStart = psdp->height;

-    mode->VSyncEnd = psdp->height;

-    mode->VTotal = psdp->height;

-    mode->SynthClock = mode->Clock;

-    mode->CrtcHDisplay = mode->HDisplay;

-    mode->CrtcHSyncStart = mode->HSyncStart;

-    mode->CrtcHSyncEnd = mode->HSyncEnd;

-    mode->CrtcHTotal = mode->HTotal;

-    mode->CrtcVDisplay = mode->VDisplay;

-    mode->CrtcVSyncStart = mode->VSyncStart;

-    mode->CrtcVSyncEnd = mode->VSyncEnd;

-    mode->CrtcVTotal = mode->VTotal;

-    mode->CrtcHAdjusted = FALSE;

-    mode->CrtcVAdjusted = FALSE;

-    pScrn->modes = mode;

-    pScrn->virtualX = psdp->width;

-    pScrn->virtualY = psdp->height;

-}

-

-static sbusPaletteKeyIndex;

-static DevPrivateKey sbusPaletteKey = &sbusPaletteKeyIndex;

-typedef struct _sbusCmap {

-    sbusDevicePtr psdp;

-    CloseScreenProcPtr CloseScreen;

-    Bool origCmapValid;

-    unsigned char origRed[16];

-    unsigned char origGreen[16];

-    unsigned char origBlue[16];

-} sbusCmapRec, *sbusCmapPtr;

-

-#define SBUSCMAPPTR(pScreen) ((sbusCmapPtr) \

-    dixLookupPrivate(&(pScreen)->devPrivates, sbusPaletteKey))

-

-static void

-xf86SbusCmapLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,

-			LOCO *colors, VisualPtr pVisual)

-{

-    int i, index;

-    sbusCmapPtr cmap;

-    struct fbcmap fbcmap;

-    unsigned char *data = malloc(numColors*3);

-                             

-    cmap = SBUSCMAPPTR(pScrn->pScreen);

-    if (!cmap) return;

-    fbcmap.count = 0;

-    fbcmap.index = indices[0];

-    fbcmap.red = data;

-    fbcmap.green = data + numColors;

-    fbcmap.blue = fbcmap.green + numColors;

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

-	index = indices[i];

-	if (fbcmap.count && index != fbcmap.index + fbcmap.count) {

-	    ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);

-	    fbcmap.count = 0;

-	    fbcmap.index = index;

-	}

-	fbcmap.red[fbcmap.count] = colors[index].red;

-	fbcmap.green[fbcmap.count] = colors[index].green;

-	fbcmap.blue[fbcmap.count++] = colors[index].blue;

-    }

-    ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);

-    free(data);

-}

-

-static Bool

-xf86SbusCmapCloseScreen(int i, ScreenPtr pScreen)

-{

-    sbusCmapPtr cmap;

-    struct fbcmap fbcmap;

-                         

-    cmap = SBUSCMAPPTR(pScreen);

-    if (cmap->origCmapValid) {

-	fbcmap.index = 0;

-	fbcmap.count = 16;

-	fbcmap.red = cmap->origRed;

-	fbcmap.green = cmap->origGreen;

-	fbcmap.blue = cmap->origBlue;

-	ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);

-    }

-    pScreen->CloseScreen = cmap->CloseScreen;

-    free(cmap);

-    return (*pScreen->CloseScreen) (i, pScreen);

-}    

-

-Bool

-xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp)

-{

-    sbusCmapPtr cmap;

-    struct fbcmap fbcmap;

-    unsigned char data[2];

-

-    cmap = xnfcalloc(1, sizeof(sbusCmapRec));

-    dixSetPrivate(&pScreen->devPrivates, sbusPaletteKey, cmap);

-    cmap->psdp = psdp;

-    fbcmap.index = 0;

-    fbcmap.count = 16;

-    fbcmap.red = cmap->origRed;

-    fbcmap.green = cmap->origGreen;

-    fbcmap.blue = cmap->origBlue;

-    if (ioctl (psdp->fd, FBIOGETCMAP, &fbcmap) >= 0)

-	cmap->origCmapValid = TRUE;

-    fbcmap.index = 0;

-    fbcmap.count = 2;

-    fbcmap.red = data;

-    fbcmap.green = data;

-    fbcmap.blue = data;

-    if (pScreen->whitePixel == 0) {

-	data[0] = 255;

-	data[1] = 0;

-    } else {

-	data[0] = 0;

-	data[1] = 255;

-    }

-    ioctl (psdp->fd, FBIOPUTCMAP, &fbcmap);

-    cmap->CloseScreen = pScreen->CloseScreen;

-    pScreen->CloseScreen = xf86SbusCmapCloseScreen;

-    return xf86HandleColormaps(pScreen, 256, 8,

-			       xf86SbusCmapLoadPalette, NULL, 0);

-}

-

-Bool

-xf86SbusConfigure(void *busData, sbusDevicePtr sBus)

-{

-    if (sBus && sBus->fbNum == ((sbusDevicePtr) busData)->fbNum)

-        return 0;

-    return 1;

-}

-

-void

-xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec *GDev)

-{

-    char *promPath = NULL;

-

-    sBus = (sbusDevicePtr) busData;

-    GDev->identifier = sBus->descr;

-    if (sparcPromInit() >= 0) {

-        promPath = sparcPromNode2Pathname(&sBus->node);

-        sparcPromClose();

-    }

-    if (promPath) {

-        XNFasprintf(&GDev->busID, "SBUS:%s", promPath);

-        free(promPath);

-    } else {

-        XNFsprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);

-    }

-}

+/*
+ * SBUS bus-specific code.
+ *
+ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
+ *
+ * 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
+ * JAKUB JELINEK 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.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <X11/X.h>
+#include "os.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+#include "xf86cmap.h"
+
+#include "xf86Bus.h"
+
+#include "xf86sbusBus.h"
+#include "xf86Sbus.h"
+
+Bool sbusSlotClaimed = FALSE;
+
+static int xf86nSbusInfo;
+
+static void
+CheckSbusDevice(const char *device, int fbNum)
+{
+    int fd, i;
+    struct fbgattr fbattr;
+    sbusDevicePtr psdp;
+
+    fd = open(device, O_RDONLY, 0);
+    if (fd < 0)
+	return;
+    memset(&fbattr, 0, sizeof(fbattr));
+    if (ioctl(fd, FBIOGATTR, &fbattr) < 0) {
+	if (ioctl(fd, FBIOGTYPE, &fbattr.fbtype) < 0) {
+	    close(fd);
+	    return;
+	}
+    }
+    close(fd);
+    for (i = 0; sbusDeviceTable[i].devId; i++)
+	if (sbusDeviceTable[i].fbType == fbattr.fbtype.fb_type)
+	    break;
+    if (! sbusDeviceTable[i].devId)
+	return;
+    xf86SbusInfo = xnfrealloc(xf86SbusInfo, sizeof(psdp) * (++xf86nSbusInfo + 1));
+    xf86SbusInfo[xf86nSbusInfo] = NULL;
+    xf86SbusInfo[xf86nSbusInfo - 1] = psdp = xnfcalloc(sizeof (sbusDevice), 1);
+    psdp->devId = sbusDeviceTable[i].devId;
+    psdp->fbNum = fbNum;
+    psdp->device = xnfstrdup(device);
+    psdp->width = fbattr.fbtype.fb_width;
+    psdp->height = fbattr.fbtype.fb_height;
+    psdp->fd = -1;
+}
+
+void
+xf86SbusProbe(void)
+{
+    int i, useProm = 0;
+    char fbDevName[32];
+    sbusDevicePtr psdp, *psdpp;
+
+    xf86SbusInfo = malloc(sizeof(psdp));
+    *xf86SbusInfo = NULL;
+    for (i = 0; i < 32; i++) {
+	sprintf(fbDevName, "/dev/fb%d", i);
+	CheckSbusDevice(fbDevName, i);
+    }
+    if (sparcPromInit() >= 0) {
+	useProm = 1;
+	sparcPromAssignNodes();
+    }
+    for (psdpp = xf86SbusInfo; (psdp = *psdpp); psdpp++) {
+	for (i = 0; sbusDeviceTable[i].devId; i++)
+	    if (sbusDeviceTable[i].devId == psdp->devId)
+		psdp->descr = sbusDeviceTable[i].descr;
+	/*
+	 * If we can use PROM information and found the PROM node for this
+	 * device, we can tell more about the card.
+	 */
+	if (useProm && psdp->node.node) {
+	    char *prop, *promPath;
+	    int len, chiprev, vmsize;
+
+	    switch (psdp->devId) {
+	    case SBUS_DEVICE_MGX:
+		prop = sparcPromGetProperty(&psdp->node, "fb_size", &len);
+		if (prop && len == 4 && *(int *)prop == 0x400000)
+		    psdp->descr = "Quantum 3D MGXplus with 4M VRAM";
+		break;
+	    case SBUS_DEVICE_CG6:
+		chiprev = 0;
+		vmsize = 0;
+		prop = sparcPromGetProperty(&psdp->node, "chiprev", &len);
+		if (prop && len == 4)
+		    chiprev = *(int *)prop;
+		prop = sparcPromGetProperty(&psdp->node, "vmsize", &len);
+		if (prop && len == 4)
+		    vmsize = *(int *)prop;
+		switch (chiprev) {
+		case 1:
+		case 2:
+		case 3:
+		case 4:
+		    psdp->descr = "Sun Double width GX"; break;
+		case 5:
+		case 6:
+		case 7:
+		case 8:
+		case 9:
+		    psdp->descr = "Sun Single width GX"; break;
+		case 11:
+		    switch (vmsize) {
+		    case 2:
+			psdp->descr = "Sun Turbo GX with 1M VSIMM"; break;
+		    case 4:
+			psdp->descr = "Sun Turbo GX Plus"; break;
+		    default:
+			psdp->descr = "Sun Turbo GX"; break;
+		    }
+		}
+		break;
+	    case SBUS_DEVICE_CG14:
+		prop = sparcPromGetProperty(&psdp->node, "reg", &len);
+		vmsize = 0;
+		if (prop && !(len % 12) && len > 0)
+		    vmsize = *(int *)(prop + len - 4);
+		switch (vmsize) {
+		case 0x400000:
+		    psdp->descr = "Sun SX with 4M VSIMM"; break;
+		case 0x800000:
+		    psdp->descr = "Sun SX with 8M VSIMM"; break;
+		}
+		break;
+	    case SBUS_DEVICE_LEO:
+		prop = sparcPromGetProperty(&psdp->node, "model", &len);
+		if (prop && len > 0 && !strstr(prop, "501-2503"))
+		    psdp->descr = "Sun Turbo ZX";
+		break;
+	    case SBUS_DEVICE_TCX:
+		if (sparcPromGetBool(&psdp->node, "tcx-8-bit"))
+		    psdp->descr = "Sun TCX (8bit)";
+		else
+		    psdp->descr = "Sun TCX (S24)";
+		break;
+	    case SBUS_DEVICE_FFB:
+		prop = sparcPromGetProperty(&psdp->node, "name", &len);
+		chiprev = 0;
+		prop = sparcPromGetProperty(&psdp->node, "board_type", &len);
+		if (prop && len == 4)
+		    chiprev = *(int *)prop;
+		if (strstr (prop, "afb")) {
+		    if (chiprev == 3)
+			psdp->descr = "Sun|Elite3D-M6 Horizontal";
+		} else {
+		    switch (chiprev) {
+		    case 0x08:
+			psdp->descr = "Sun FFB 67MHz Creator"; break;
+		    case 0x0b:
+			psdp->descr = "Sun FFB 67MHz Creator 3D"; break;
+		    case 0x1b:
+			psdp->descr = "Sun FFB 75MHz Creator 3D"; break;
+		    case 0x20:
+		    case 0x28:
+			psdp->descr = "Sun FFB2 Vertical Creator"; break;
+		    case 0x23:
+		    case 0x2b:
+			psdp->descr = "Sun FFB2 Vertical Creator 3D"; break;
+		    case 0x30:
+			psdp->descr = "Sun FFB2+ Vertical Creator"; break;
+		    case 0x33:
+			psdp->descr = "Sun FFB2+ Vertical Creator 3D"; break;
+		    case 0x40:
+		    case 0x48:
+			psdp->descr = "Sun FFB2 Horizontal Creator"; break;
+		    case 0x43:
+		    case 0x4b:
+			psdp->descr = "Sun FFB2 Horizontal Creator 3D"; break;
+		    }
+		}
+		break;
+	    }
+
+	    xf86Msg(X_PROBED, "SBUS:(0x%08x) %s", psdp->node.node, psdp->descr);
+	    promPath = sparcPromNode2Pathname (&psdp->node);
+	    if (promPath) {
+		xf86ErrorF(" at %s", promPath);
+		free(promPath);
+	    }
+	} else
+	    xf86Msg(X_PROBED, "SBUS: %s", psdp->descr);
+	xf86ErrorF("\n");
+    }
+    if (useProm)
+	sparcPromClose();
+}
+
+/*
+ * Parse a BUS ID string, and return the SBUS bus parameters if it was
+ * in the correct format for a SBUS bus id.
+ */
+
+Bool
+xf86ParseSbusBusString(const char *busID, int *fbNum)
+{
+    /*
+     * The format is assumed to be one of:
+     * "fbN", e.g. "fb1", which means the device corresponding to /dev/fbN
+     * "nameN", e.g. "cgsix0", which means Nth instance of card NAME
+     * "/prompath", e.g. "/sbus@0,10001000/cgsix@3,0" which is PROM pathname
+     * to the device.
+     */
+
+    const char *id;
+    int i, len;
+
+    if (StringToBusType(busID, &id) != BUS_SBUS)
+	return FALSE;
+
+    if (*id != '/') {
+	if (!strncmp (id, "fb", 2)) {
+	    if (!isdigit(id[2]))
+		return FALSE;
+	    *fbNum = atoi(id + 2);
+	    return TRUE;
+	} else {
+	    sbusDevicePtr *psdpp;
+	    int devId;
+
+	    for (i = 0, len = 0; sbusDeviceTable[i].devId; i++) {
+		len = strlen(sbusDeviceTable[i].promName);
+		if (!strncmp (sbusDeviceTable[i].promName, id, len)
+		    && isdigit(id[len]))
+		    break;
+	    }
+	    devId = sbusDeviceTable[i].devId;
+	    if (!devId) return FALSE;
+	    i = atoi(id + len);
+	    for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {
+		if ((*psdpp)->devId != devId)
+		    continue;
+		if (!i) {
+		    *fbNum = (*psdpp)->fbNum;
+		    return TRUE;
+		}
+		i--;
+	    }
+	}
+	return FALSE;
+    }
+
+    if (sparcPromInit() >= 0) {
+	i = sparcPromPathname2Node(id);
+	sparcPromClose();
+	if (i) {
+	    sbusDevicePtr *psdpp;
+	    for (psdpp = xf86SbusInfo; *psdpp; ++psdpp) {
+		if ((*psdpp)->node.node == i) {
+		    *fbNum = (*psdpp)->fbNum;
+		    return TRUE;
+		}
+	    }
+	}
+    }
+    return FALSE;
+}
+
+/*
+ * Compare a BUS ID string with a SBUS bus id.  Return TRUE if they match.
+ */
+
+Bool
+xf86CompareSbusBusString(const char *busID, int fbNum)
+{
+    int iFbNum;
+
+    if (xf86ParseSbusBusString(busID, &iFbNum)) {
+	return fbNum == iFbNum;
+    } else {
+	return FALSE;
+    }
+}
+
+/*
+ * Check if the slot requested is free.  If it is already in use, return FALSE.
+ */
+
+Bool
+xf86CheckSbusSlot(int fbNum)
+{
+    int i;
+    EntityPtr p;
+
+    for (i = 0; i < xf86NumEntities; i++) {
+	p = xf86Entities[i];
+	/* Check if this SBUS slot is taken */
+	if (p->bus.type == BUS_SBUS && p->bus.id.sbus.fbNum == fbNum)
+	    return FALSE;
+    }
+
+    return TRUE;
+}
+
+/*
+ * If the slot requested is already in use, return -1.
+ * Otherwise, claim the slot for the screen requesting it.
+ */
+
+int
+xf86ClaimSbusSlot(sbusDevicePtr psdp, DriverPtr drvp,
+		  GDevPtr dev, Bool active)
+{
+    EntityPtr p = NULL;
+
+    int num;
+
+    if (xf86CheckSbusSlot(psdp->fbNum)) {
+        num = xf86AllocateEntity();
+        p = xf86Entities[num];
+        p->driver = drvp;
+        p->chipset = -1;
+        p->bus.type = BUS_SBUS;
+        xf86AddDevToEntity(num, dev);
+        p->bus.id.sbus.fbNum = psdp->fbNum;
+        p->active = active;
+        p->inUse = FALSE;
+	sbusSlotClaimed = TRUE;
+	return num;
+    } else
+	return -1;
+}
+
+int
+xf86MatchSbusInstances(const char *driverName, int sbusDevId, 
+		       GDevPtr *devList, int numDevs, DriverPtr drvp,
+		       int **foundEntities)
+{
+    int i,j;
+    sbusDevicePtr psdp, *psdpp;
+    int numClaimedInstances = 0;
+    int allocatedInstances = 0;
+    int numFound = 0;
+    GDevPtr devBus = NULL;
+    GDevPtr dev = NULL;
+    int *retEntities = NULL;
+    int useProm = 0;
+
+    struct Inst {
+	sbusDevicePtr	sbus;
+	GDevPtr		dev;
+	Bool		claimed;  /* BusID matches with a device section */
+    } *instances = NULL;
+
+    *foundEntities = NULL;
+    for (psdpp = xf86SbusInfo, psdp = *psdpp; psdp; psdp = *++psdpp) {
+	if (psdp->devId != sbusDevId)
+	    continue;
+	if (psdp->fd == -2)
+	    continue;
+	++allocatedInstances;
+	instances = xnfrealloc(instances,
+			       allocatedInstances * sizeof(struct Inst));
+	instances[allocatedInstances - 1].sbus = psdp;
+	instances[allocatedInstances - 1].dev = NULL;
+	instances[allocatedInstances - 1].claimed = FALSE;
+	numFound++;
+    }
+
+    /*
+     * This may be debatable, but if no SBUS devices with a matching vendor
+     * type is found, return zero now.  It is probably not desirable to
+     * allow the config file to override this.
+     */
+    if (allocatedInstances <= 0) {
+	free(instances);
+	return 0;
+    }
+
+    if (sparcPromInit() >= 0)
+	useProm = 1;
+
+    if (xf86DoConfigure && xf86DoConfigurePass1) {
+	GDevPtr pGDev;
+	int actualcards = 0;
+	for (i = 0; i < allocatedInstances; i++) {
+	    actualcards++;
+	    pGDev = xf86AddBusDeviceToConfigure(drvp->driverName, BUS_SBUS,
+						instances[i].sbus, -1);
+	    if (pGDev) {
+		/*
+		 * XF86Match???Instances() treat chipID and chipRev as
+		 * overrides, so clobber them here.
+		 */
+		pGDev->chipID = pGDev->chipRev = -1;
+	    }
+	}
+	free(instances);
+	if (useProm)
+	    sparcPromClose();
+	return actualcards;
+    }
+
+    DebugF("%s instances found: %d\n", driverName, allocatedInstances);
+
+    for (i = 0; i < allocatedInstances; i++) {
+	char *promPath = NULL;
+
+	psdp = instances[i].sbus;
+	devBus = NULL;
+	dev = NULL;
+	if (useProm && psdp->node.node)
+	    promPath = sparcPromNode2Pathname(&psdp->node);
+
+	for (j = 0; j < numDevs; j++) {
+	    if (devList[j]->busID && *devList[j]->busID) {
+		if (xf86CompareSbusBusString(devList[j]->busID, psdp->fbNum)) {
+		    if (devBus)
+			xf86MsgVerb(X_WARNING,0,
+			    "%s: More than one matching Device section for "
+			    "instance (BusID: %s) found: %s\n",
+			    driverName,devList[j]->identifier,
+			    devList[j]->busID);
+		    else
+			devBus = devList[j];
+		} 
+	    } else {
+		if (!dev && !devBus) {
+		    if (promPath)
+			xf86Msg(X_PROBED, "Assigning device section with no busID to SBUS:%s\n",
+				promPath);
+		    else
+			xf86Msg(X_PROBED, "Assigning device section with no busID to SBUS:fb%d\n",
+				psdp->fbNum);
+		    dev = devList[j];
+		} else
+		    xf86MsgVerb(X_WARNING, 0,
+			    "%s: More than one matching Device section "
+			    "found: %s\n", driverName, devList[j]->identifier);
+	    }
+	}
+	if (devBus) dev = devBus;  /* busID preferred */ 
+	if (!dev && psdp->fd != -2) {
+	    if (promPath) {
+		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
+			    "for instance (BusID SBUS:%s) found\n",
+			    driverName, promPath);
+	    } else
+		xf86MsgVerb(X_WARNING, 0, "%s: No matching Device section "
+			    "for instance (BusID SBUS:fb%d) found\n",
+			    driverName, psdp->fbNum);
+	} else if (dev) {
+	    numClaimedInstances++;
+	    instances[i].claimed = TRUE;
+	    instances[i].dev = dev;
+	}
+	free(promPath);
+    }
+
+    DebugF("%s instances found: %d\n", driverName, numClaimedInstances);
+
+    /*
+     * Of the claimed instances, check that another driver hasn't already
+     * claimed its slot.
+     */
+    numFound = 0;
+    for (i = 0; i < allocatedInstances && numClaimedInstances > 0; i++) {
+	if (!instances[i].claimed)
+	    continue;
+	psdp = instances[i].sbus;
+	if (!xf86CheckSbusSlot(psdp->fbNum))
+	    continue;
+
+	DebugF("%s: card at fb%d %08x is claimed by a Device section\n",
+	       driverName, psdp->fbNum, psdp->node.node);
+
+	/* Allocate an entry in the lists to be returned */
+	numFound++;
+	retEntities = xnfrealloc(retEntities, numFound * sizeof(int));
+	retEntities[numFound - 1]
+	    = xf86ClaimSbusSlot(psdp, drvp, instances[i].dev,instances[i].dev->active ?
+				TRUE : FALSE);
+    }
+    free(instances);
+    if (numFound > 0) {
+	*foundEntities = retEntities;
+    }
+
+    if (useProm)
+	sparcPromClose();
+
+    return numFound;
+}
+
+/*
+ * xf86GetSbusInfoForEntity() -- Get the sbusDevicePtr of entity.
+ */
+sbusDevicePtr
+xf86GetSbusInfoForEntity(int entityIndex)
+{
+    sbusDevicePtr *psdpp;
+    EntityPtr p = xf86Entities[entityIndex];
+
+    if (entityIndex >= xf86NumEntities
+	|| p->bus.type != BUS_SBUS) return NULL;
+
+    for (psdpp = xf86SbusInfo; *psdpp != NULL; psdpp++) {
+	if (p->bus.id.sbus.fbNum == (*psdpp)->fbNum)
+	    return *psdpp;
+    }
+    return NULL;
+}
+
+int
+xf86GetEntityForSbusInfo(sbusDevicePtr psdp)
+{
+    int i;
+
+    for (i = 0; i < xf86NumEntities; i++) {
+	EntityPtr p = xf86Entities[i];
+	if (p->bus.type != BUS_SBUS) continue;
+
+	if (p->bus.id.sbus.fbNum == psdp->fbNum)
+	    return i;
+    }
+    return -1;
+}
+
+void
+xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp)
+{
+    DisplayModePtr mode;
+
+    mode = xnfcalloc(sizeof(DisplayModeRec), 1);
+    mode->name = "current";
+    mode->next = mode;
+    mode->prev = mode;
+    mode->type = M_T_BUILTIN;
+    mode->Clock = 100000000;
+    mode->HDisplay = psdp->width;
+    mode->HSyncStart = psdp->width;
+    mode->HSyncEnd = psdp->width;
+    mode->HTotal = psdp->width;
+    mode->VDisplay = psdp->height;
+    mode->VSyncStart = psdp->height;
+    mode->VSyncEnd = psdp->height;
+    mode->VTotal = psdp->height;
+    mode->SynthClock = mode->Clock;
+    mode->CrtcHDisplay = mode->HDisplay;
+    mode->CrtcHSyncStart = mode->HSyncStart;
+    mode->CrtcHSyncEnd = mode->HSyncEnd;
+    mode->CrtcHTotal = mode->HTotal;
+    mode->CrtcVDisplay = mode->VDisplay;
+    mode->CrtcVSyncStart = mode->VSyncStart;
+    mode->CrtcVSyncEnd = mode->VSyncEnd;
+    mode->CrtcVTotal = mode->VTotal;
+    mode->CrtcHAdjusted = FALSE;
+    mode->CrtcVAdjusted = FALSE;
+    pScrn->modes = mode;
+    pScrn->virtualX = psdp->width;
+    pScrn->virtualY = psdp->height;
+}
+
+static sbusPaletteKeyIndex;
+static DevPrivateKey sbusPaletteKey = &sbusPaletteKeyIndex;
+typedef struct _sbusCmap {
+    sbusDevicePtr psdp;
+    CloseScreenProcPtr CloseScreen;
+    Bool origCmapValid;
+    unsigned char origRed[16];
+    unsigned char origGreen[16];
+    unsigned char origBlue[16];
+} sbusCmapRec, *sbusCmapPtr;
+
+#define SBUSCMAPPTR(pScreen) ((sbusCmapPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, sbusPaletteKey))
+
+static void
+xf86SbusCmapLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
+			LOCO *colors, VisualPtr pVisual)
+{
+    int i, index;
+    sbusCmapPtr cmap;
+    struct fbcmap fbcmap;
+    unsigned char *data = malloc(numColors*3);
+                             
+    cmap = SBUSCMAPPTR(pScrn->pScreen);
+    if (!cmap) return;
+    fbcmap.count = 0;
+    fbcmap.index = indices[0];
+    fbcmap.red = data;
+    fbcmap.green = data + numColors;
+    fbcmap.blue = fbcmap.green + numColors;
+    for (i = 0; i < numColors; i++) {
+	index = indices[i];
+	if (fbcmap.count && index != fbcmap.index + fbcmap.count) {
+	    ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+	    fbcmap.count = 0;
+	    fbcmap.index = index;
+	}
+	fbcmap.red[fbcmap.count] = colors[index].red;
+	fbcmap.green[fbcmap.count] = colors[index].green;
+	fbcmap.blue[fbcmap.count++] = colors[index].blue;
+    }
+    ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+    free(data);
+}
+
+static Bool
+xf86SbusCmapCloseScreen(int i, ScreenPtr pScreen)
+{
+    sbusCmapPtr cmap;
+    struct fbcmap fbcmap;
+                         
+    cmap = SBUSCMAPPTR(pScreen);
+    if (cmap->origCmapValid) {
+	fbcmap.index = 0;
+	fbcmap.count = 16;
+	fbcmap.red = cmap->origRed;
+	fbcmap.green = cmap->origGreen;
+	fbcmap.blue = cmap->origBlue;
+	ioctl (cmap->psdp->fd, FBIOPUTCMAP, &fbcmap);
+    }
+    pScreen->CloseScreen = cmap->CloseScreen;
+    free(cmap);
+    return (*pScreen->CloseScreen) (i, pScreen);
+}    
+
+Bool
+xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp)
+{
+    sbusCmapPtr cmap;
+    struct fbcmap fbcmap;
+    unsigned char data[2];
+
+    cmap = xnfcalloc(1, sizeof(sbusCmapRec));
+    dixSetPrivate(&pScreen->devPrivates, sbusPaletteKey, cmap);
+    cmap->psdp = psdp;
+    fbcmap.index = 0;
+    fbcmap.count = 16;
+    fbcmap.red = cmap->origRed;
+    fbcmap.green = cmap->origGreen;
+    fbcmap.blue = cmap->origBlue;
+    if (ioctl (psdp->fd, FBIOGETCMAP, &fbcmap) >= 0)
+	cmap->origCmapValid = TRUE;
+    fbcmap.index = 0;
+    fbcmap.count = 2;
+    fbcmap.red = data;
+    fbcmap.green = data;
+    fbcmap.blue = data;
+    if (pScreen->whitePixel == 0) {
+	data[0] = 255;
+	data[1] = 0;
+    } else {
+	data[0] = 0;
+	data[1] = 255;
+    }
+    ioctl (psdp->fd, FBIOPUTCMAP, &fbcmap);
+    cmap->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = xf86SbusCmapCloseScreen;
+    return xf86HandleColormaps(pScreen, 256, 8,
+			       xf86SbusCmapLoadPalette, NULL, 0);
+}
+
+Bool
+xf86SbusConfigure(void *busData, sbusDevicePtr sBus)
+{
+    if (sBus && sBus->fbNum == ((sbusDevicePtr) busData)->fbNum)
+        return 0;
+    return 1;
+}
+
+void
+xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec *GDev)
+{
+    char *promPath = NULL;
+
+    sBus = (sbusDevicePtr) busData;
+    GDev->identifier = sBus->descr;
+    if (sparcPromInit() >= 0) {
+        promPath = sparcPromNode2Pathname(&sBus->node);
+        sparcPromClose();
+    }
+    if (promPath) {
+        XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
+        free(promPath);
+    } else {
+        XNFasprintf(&GDev->busID, "SBUS:fb%d", sBus->fbNum);
+    }
+}
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index d721b131f..86f038aa1 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -1,3281 +1,3242 @@
-/*

- * Copyright © 2006 Keith Packard

- * Copyright © 2008 Red Hat, Inc.

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that copyright

- * notice and this permission notice appear in supporting documentation, and

- * that the name of the copyright holders not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  The copyright holders make no representations

- * about the suitability of this software for any purpose.  It is provided "as

- * is" without express or implied warranty.

- *

- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

- * OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#else

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#endif

-

-#include <stddef.h>

-#include <string.h>

-#include <stdio.h>

-

-#include "xf86.h"

-#include "xf86DDC.h"

-#include "xf86Crtc.h"

-#include "xf86Modes.h"

-#include "xf86Priv.h"

-#include "xf86RandR12.h"

-#include "X11/extensions/render.h"

-#include "X11/extensions/dpmsconst.h"

-#include "X11/Xatom.h"

-#include "picturestr.h"

-

-#include "xf86xv.h"

-

-#define NO_OUTPUT_DEFAULT_WIDTH 1024

-#define NO_OUTPUT_DEFAULT_HEIGHT 768

-/*

- * Initialize xf86CrtcConfig structure

- */

-

-int xf86CrtcConfigPrivateIndex = -1;

-

-void

-xf86CrtcConfigInit (ScrnInfoPtr scrn,

-		    const xf86CrtcConfigFuncsRec *funcs)

-{

-    xf86CrtcConfigPtr	config;

-    

-    if (xf86CrtcConfigPrivateIndex == -1)

-	xf86CrtcConfigPrivateIndex = xf86AllocateScrnInfoPrivateIndex();

-    config = xnfcalloc (1, sizeof (xf86CrtcConfigRec));

-

-    config->funcs = funcs;

-

-    scrn->privates[xf86CrtcConfigPrivateIndex].ptr = config;

-}

- 

-void

-xf86CrtcSetSizeRange (ScrnInfoPtr scrn,

-		      int minWidth, int minHeight,

-		      int maxWidth, int maxHeight)

-{

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-

-    config->minWidth = minWidth;

-    config->minHeight = minHeight;

-    config->maxWidth = maxWidth;

-    config->maxHeight = maxHeight;

-}

-

-void

-xf86CrtcSetScanoutFormats(ScrnInfoPtr		scrn,

-			  int			num_formats,

-			  xf86CrtcScanoutFormat	*formats)

-{

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-

-    config->num_scanout_formats = num_formats;

-    config->scanout_formats = formats;

-}

-

-/*

- * Crtc functions

- */

-xf86CrtcPtr

-xf86CrtcCreate (ScrnInfoPtr		scrn,

-		const xf86CrtcFuncsRec	*funcs)

-{

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    xf86CrtcPtr		crtc, *crtcs;

-

-    crtc = calloc(sizeof (xf86CrtcRec), 1);

-    if (!crtc)

-	return NULL;

-    crtc->version = XF86_CRTC_VERSION;

-    crtc->scrn = scrn;

-    crtc->funcs = funcs;

-#ifdef RANDR_12_INTERFACE

-    crtc->randr_crtc = NULL;

-#endif

-    crtc->rotation = RR_Rotate_0;

-    crtc->desiredRotation = RR_Rotate_0;

-    pixman_transform_init_identity (&crtc->crtc_to_framebuffer);

-    pixman_f_transform_init_identity (&crtc->f_crtc_to_framebuffer);

-    pixman_f_transform_init_identity (&crtc->f_framebuffer_to_crtc);

-    pixman_f_transform_init_identity (&crtc->f_screen_to_crtc);

-    pixman_f_transform_init_identity (&crtc->user_sprite_position_transform);

-    pixman_f_transform_init_identity (&crtc->f_crtc_to_cursor);

-    pixman_f_transform_init_identity (&crtc->user_sprite_image_transform);

-    crtc->filter = NULL;

-    crtc->params = NULL;

-    crtc->nparams = 0;

-    crtc->filter_width = 0;

-    crtc->filter_height = 0;

-    crtc->transform_in_use = FALSE;

-    crtc->sprite_transform_in_use = FALSE;

-    crtc->transformPresent = FALSE;

-    crtc->desiredTransformPresent = FALSE;

-    memset (&crtc->bounds, '\0', sizeof (crtc->bounds));

-

-    /* Preallocate gamma at a sensible size. */

-    crtc->gamma_size = 256;

-    crtc->gamma_red = malloc(3 * crtc->gamma_size * sizeof (CARD16));

-    if (!crtc->gamma_red) {

-	free(crtc);

-	return NULL;

-    }

-    crtc->gamma_green = crtc->gamma_red + crtc->gamma_size;

-    crtc->gamma_blue = crtc->gamma_green + crtc->gamma_size;

-

-    if (xf86_config->crtc)

-	crtcs = realloc(xf86_config->crtc,

-			  (xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr));

-    else

-	crtcs = malloc((xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr));

-    if (!crtcs)

-    {

-	free(crtc);

-	return NULL;

-    }

-    xf86_config->crtc = crtcs;

-    xf86_config->crtc[xf86_config->num_crtc++] = crtc;

-    return crtc;

-}

-

-void

-xf86CrtcDestroy (xf86CrtcPtr crtc)

-{

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);

-    int			c;

-    

-    (*crtc->funcs->destroy) (crtc);

-    for (c = 0; c < xf86_config->num_crtc; c++)

-	if (xf86_config->crtc[c] == crtc)

-	{

-	    memmove (&xf86_config->crtc[c],

-		     &xf86_config->crtc[c+1],

-		     ((xf86_config->num_crtc - (c + 1)) * sizeof(void*)));

-	    xf86_config->num_crtc--;

-	    break;

-	}

-    free(crtc->params);

-    free(crtc->gamma_red);

-    free(crtc);

-}

-

-

-/**

- * Return whether any outputs are connected to the specified pipe

- */

-

-Bool

-xf86CrtcInUse (xf86CrtcPtr crtc)

-{

-    ScrnInfoPtr		pScrn = crtc->scrn;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);

-    int			o;

-    

-    for (o = 0; o < xf86_config->num_output; o++)

-	if (xf86_config->output[o]->crtc == crtc)

-	    return TRUE;

-    return FALSE;

-}

-

-void

-xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)

-{

-    int			subpixel_order = SubPixelUnknown;

-    Bool		has_none = FALSE;

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

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			c, o;

-

-    for (c = 0; c < xf86_config->num_crtc; c++)

-    {

-	xf86CrtcPtr crtc = xf86_config->crtc[c];

-	

-	for (o = 0; o < xf86_config->num_output; o++)

-	{

-	    xf86OutputPtr   output = xf86_config->output[o];

-

-	    if (output->crtc == crtc)

-	    {

-		switch (output->subpixel_order) {

-		case SubPixelNone:

-		    has_none = TRUE;

-		    break;

-		case SubPixelUnknown:

-		    break;

-		default:

-		    subpixel_order = output->subpixel_order;

-		    break;

-		}

-	    }

-	    if (subpixel_order != SubPixelUnknown)

-		break;

-	}

-	if (subpixel_order != SubPixelUnknown)

-	{

-	    static const int circle[4] = {

-		SubPixelHorizontalRGB,

-		SubPixelVerticalRGB,

-		SubPixelHorizontalBGR,

-		SubPixelVerticalBGR,

-	    };

-	    int	rotate;

-	    int c;

-	    for (rotate = 0; rotate < 4; rotate++)

-		if (crtc->rotation & (1 << rotate))

-		    break;

-	    for (c = 0; c < 4; c++)

-		if (circle[c] == subpixel_order)

-		    break;

-	    c = (c + rotate) & 0x3;

-	    if ((crtc->rotation & RR_Reflect_X) && !(c & 1))

-		c ^= 2;

-	    if ((crtc->rotation & RR_Reflect_Y) && (c & 1))

-		c ^= 2;

-	    subpixel_order = circle[c];

-	    break;

-	}

-    }

-    if (subpixel_order == SubPixelUnknown && has_none)

-	subpixel_order = SubPixelNone;

-    PictureSetSubpixelOrder (pScreen, subpixel_order);

-}

-

-/**

- * Sets the given video mode on the given crtc

- */

-Bool

-xf86CrtcSet(xf86CrtcPtr crtc, xf86CrtcSetRec *set)

-{

-    ScrnInfoPtr		scrn = crtc->scrn;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			i;

-    Bool		ret = FALSE;

-    Bool		didLock = FALSE;

-    DisplayModePtr	adjusted_mode = NULL;

-    DisplayModeRec	saved_mode;

-    int			saved_x, saved_y;

-    Rotation		saved_rotation;

-    RRTransformRec	saved_transform;

-    Bool		saved_transform_present;

-    PixmapPtr		saved_scanout_pixmap;

-

-    crtc->enabled = xf86CrtcInUse (crtc);

-

-    /* We only hit this if someone explicitly sends a "disabled" modeset. */

-    if (!crtc->enabled)

-    {

-	/* Check everything for stuff that should be off. */

-	xf86DisableUnusedFunctions(scrn);

-	return TRUE;

-    }

-

-    /* See if nothing has changed */

-    if (!set->flags)

-	return TRUE;

-

-    saved_mode = crtc->mode;

-    saved_x = crtc->x;

-    saved_y = crtc->y;

-    saved_rotation = crtc->rotation;

-    saved_scanout_pixmap = crtc->scanoutPixmap;

-    if (crtc->transformPresent) {

-	RRTransformInit (&saved_transform);

-	RRTransformCopy (&saved_transform, &crtc->transform);

-    }

-    saved_transform_present = crtc->transformPresent;

-

-    /* Update crtc values up front so the driver can rely on them for mode

-     * setting.

-     */

-    if (set->flags & XF86CrtcSetMode)

-	crtc->mode = *set->mode;

-    if (set->flags & XF86CrtcSetOrigin) {

-	crtc->x = set->x;

-	crtc->y = set->y;

-    }

-    if (set->flags & XF86CrtcSetRotation)

-	crtc->rotation = set->rotation;

-    if (set->flags & XF86CrtcSetScanoutPixmap)

-	crtc->scanoutPixmap = set->scanout_pixmap;

-

-    if (set->flags & XF86CrtcSetTransform) {

-	if (set->transform) {

-	    RRTransformCopy (&crtc->transform, set->transform);

-	    crtc->transformPresent = TRUE;

-	} else

-	    crtc->transformPresent = FALSE;

-    }

-

-    if (crtc->funcs->set) {

-	ret = crtc->funcs->set(crtc, set->flags);

-	goto done;

-    }

-

-    if (set->flags == XF86CrtcSetOrigin && crtc->funcs->set_origin) {

-	ret = xf86CrtcRotate(crtc);

-	if (ret)

-	    crtc->funcs->set_origin(crtc, crtc->x, crtc->y);

-	goto done;

-    }

-

-    if (crtc->funcs->set_mode_major) {

-	ret = crtc->funcs->set_mode_major(crtc, &crtc->mode,

-					  crtc->rotation,

-					  crtc->x, crtc->y);

-	goto done;

-    }

-

-    adjusted_mode = xf86DuplicateMode(&crtc->mode);

-

-    didLock = crtc->funcs->lock (crtc);

-    /* Pass our mode to the outputs and the CRTC to give them a chance to

-     * adjust it according to limitations or output properties, and also

-     * a chance to reject the mode entirely.

-     */

-    for (i = 0; i < xf86_config->num_output; i++) {

-	xf86OutputPtr output = xf86_config->output[i];

-

-	if (output->crtc != crtc)

-	    continue;

-

-	if (!output->funcs->mode_fixup(output, &crtc->mode, adjusted_mode)) {

-	    goto done;

-	}

-    }

-

-    if (!crtc->funcs->mode_fixup(crtc, &crtc->mode, adjusted_mode)) {

-	goto done;

-    }

-

-    if (!xf86CrtcRotate (crtc))

-	goto done;

-

-    /* Prepare the outputs and CRTCs before setting the mode. */

-    for (i = 0; i < xf86_config->num_output; i++) {

-	xf86OutputPtr output = xf86_config->output[i];

-

-	if (output->crtc != crtc)

-	    continue;

-

-	/* Disable the output as the first thing we do. */

-	output->funcs->prepare(output);

-    }

-

-    crtc->funcs->prepare(crtc);

-

-    /* Set up the DPLL and any output state that needs to adjust or depend

-     * on the DPLL.

-     */

-    crtc->funcs->mode_set(crtc, &crtc->mode, adjusted_mode, crtc->x, crtc->y);

-    for (i = 0; i < xf86_config->num_output; i++) 

-    {

-	xf86OutputPtr output = xf86_config->output[i];

-	if (output->crtc == crtc)

-	    output->funcs->mode_set(output, &crtc->mode, adjusted_mode);

-    }

-

-    /* Only upload when needed, to avoid unneeded delays. */

-    if (!crtc->active && crtc->funcs->gamma_set)

-	crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,

-                                            crtc->gamma_blue, crtc->gamma_size);

-

-    /* Now, enable the clocks, plane, pipe, and outputs that we set up. */

-    crtc->funcs->commit(crtc);

-    for (i = 0; i < xf86_config->num_output; i++) 

-    {

-	xf86OutputPtr output = xf86_config->output[i];

-	if (output->crtc == crtc)

-	    output->funcs->commit(output);

-    }

-

-    ret = TRUE;

-

-done:

-    if (ret) {

-	crtc->active = TRUE;

-	if (scrn->pScreen)

-	    xf86CrtcSetScreenSubpixelOrder (scrn->pScreen);

-	if (scrn->ModeSet)

-	    scrn->ModeSet(scrn);

-    } else {

-	crtc->x = saved_x;

-	crtc->y = saved_y;

-	crtc->rotation = saved_rotation;

-	crtc->mode = saved_mode;

-	if (saved_transform_present)

-	    RRTransformCopy (&crtc->transform, &saved_transform);

-	crtc->transformPresent = saved_transform_present;

-	crtc->scanoutPixmap = saved_scanout_pixmap;

-    }

-

-    if (adjusted_mode) {

-	free(adjusted_mode->name);

-	free(adjusted_mode);

-    }

-

-    if (didLock)

-	crtc->funcs->unlock (crtc);

-

-    return ret;

-}

-

-/**

- * Pans the screen, does not change the mode

- */

-void

-xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y)

-{

-    xf86CrtcSetRec	set;

-

-    if (x != crtc->x || y != crtc->y) {

-	set.x = x;

-	set.y = y;

-	set.flags = XF86CrtcSetOrigin;

-	(void) xf86CrtcSet(crtc, &set);

-    }

-}

-

-/*

- * Output functions

- */

-

-extern XF86ConfigPtr xf86configptr;

-

-typedef enum {

-    OPTION_PREFERRED_MODE,

-    OPTION_POSITION,

-    OPTION_BELOW,

-    OPTION_RIGHT_OF,

-    OPTION_ABOVE,

-    OPTION_LEFT_OF,

-    OPTION_ENABLE,

-    OPTION_DISABLE,

-    OPTION_MIN_CLOCK,

-    OPTION_MAX_CLOCK,

-    OPTION_IGNORE,

-    OPTION_ROTATE,

-    OPTION_PANNING,

-    OPTION_PRIMARY,

-    OPTION_DEFAULT_MODES,

-} OutputOpts;

-

-static OptionInfoRec xf86OutputOptions[] = {

-    {OPTION_PREFERRED_MODE, "PreferredMode",	OPTV_STRING,  {0}, FALSE },

-    {OPTION_POSITION,	    "Position",		OPTV_STRING,  {0}, FALSE },

-    {OPTION_BELOW,	    "Below",		OPTV_STRING,  {0}, FALSE },

-    {OPTION_RIGHT_OF,	    "RightOf",		OPTV_STRING,  {0}, FALSE },

-    {OPTION_ABOVE,	    "Above",		OPTV_STRING,  {0}, FALSE },

-    {OPTION_LEFT_OF,	    "LeftOf",		OPTV_STRING,  {0}, FALSE },

-    {OPTION_ENABLE,	    "Enable",		OPTV_BOOLEAN, {0}, FALSE },

-    {OPTION_DISABLE,	    "Disable",		OPTV_BOOLEAN, {0}, FALSE },

-    {OPTION_MIN_CLOCK,	    "MinClock",		OPTV_FREQ,    {0}, FALSE },

-    {OPTION_MAX_CLOCK,	    "MaxClock",		OPTV_FREQ,    {0}, FALSE },

-    {OPTION_IGNORE,	    "Ignore",		OPTV_BOOLEAN, {0}, FALSE },

-    {OPTION_ROTATE,	    "Rotate",		OPTV_STRING,  {0}, FALSE },

-    {OPTION_PANNING,	    "Panning",		OPTV_STRING,  {0}, FALSE },

-    {OPTION_PRIMARY,	    "Primary",		OPTV_BOOLEAN, {0}, FALSE },

-    {OPTION_DEFAULT_MODES,  "DefaultModes",	OPTV_BOOLEAN, {0}, FALSE },

-    {-1,		    NULL,		OPTV_NONE,    {0}, FALSE },

-};

-

-enum {

-    OPTION_MODEDEBUG,

-};

-

-static OptionInfoRec xf86DeviceOptions[] = {

-    {OPTION_MODEDEBUG,	    "ModeDebug",	OPTV_BOOLEAN,  {0}, FALSE },

-    {-1,		    NULL,		OPTV_NONE,    {0}, FALSE },

-};

-

-static void

-xf86OutputSetMonitor (xf86OutputPtr output)

-{

-    char    *option_name;

-    char    *monitor;

-

-    if (!output->name)

-	return;

-

-    free(output->options);

-

-    output->options = xnfalloc (sizeof (xf86OutputOptions));

-    memcpy (output->options, xf86OutputOptions, sizeof (xf86OutputOptions));

-

-    XNFasprintf(&option_name, "monitor-%s", output->name);

-    monitor = xf86findOptionValue (output->scrn->options, option_name);

-    if (!monitor)

-	monitor = output->name;

-    else

-	xf86MarkOptionUsedByName (output->scrn->options, option_name);

-    free(option_name);

-    output->conf_monitor = xf86findMonitor (monitor,

-					    xf86configptr->conf_monitor_lst);

-    /*

-     * Find the monitor section of the screen and use that

-     */

-    if (!output->conf_monitor && output->use_screen_monitor)

-	output->conf_monitor = xf86findMonitor (output->scrn->monitor->id,

-						xf86configptr->conf_monitor_lst);

-    if (output->conf_monitor)

-    {

-	xf86DrvMsg (output->scrn->scrnIndex, X_INFO,

-		    "Output %s using monitor section %s\n",

-		    output->name, output->conf_monitor->mon_identifier);

-	xf86ProcessOptions (output->scrn->scrnIndex,

-			    output->conf_monitor->mon_option_lst,

-			    output->options);

-    }

-    else

-	xf86DrvMsg (output->scrn->scrnIndex, X_INFO,

-		    "Output %s has no monitor section\n",

-		    output->name);

-}

-

-static Bool

-xf86OutputEnabled (xf86OutputPtr output, Bool strict)

-{

-    Bool    enable, disable;

-

-    /* check to see if this output was enabled in the config file */

-    if (xf86GetOptValBool (output->options, OPTION_ENABLE, &enable) && enable)

-    {

-	xf86DrvMsg (output->scrn->scrnIndex, X_INFO,

-		    "Output %s enabled by config file\n", output->name);

-	return TRUE;

-    }

-    /* or if this output was disabled in the config file */

-    if (xf86GetOptValBool (output->options, OPTION_DISABLE, &disable) && disable)

-    {

-	xf86DrvMsg (output->scrn->scrnIndex, X_INFO,

-		    "Output %s disabled by config file\n", output->name);

-	return FALSE;

-    }

-

-    /* If not, try to only light up the ones we know are connected */

-    if (strict) {

-	enable = output->status == XF86OutputStatusConnected;

-    }

-    /* But if that fails, try to light up even outputs we're unsure of */

-    else {

-	enable = output->status != XF86OutputStatusDisconnected;

-    }

-

-    xf86DrvMsg (output->scrn->scrnIndex, X_INFO,

-    	    "Output %s %sconnected\n", output->name, enable ? "" : "dis");

-    return enable;

-}

-

-static Bool

-xf86OutputIgnored (xf86OutputPtr    output)

-{

-    return xf86ReturnOptValBool (output->options, OPTION_IGNORE, FALSE);

-}

-

-static char *direction[4] = {

-    "normal", 

-    "left", 

-    "inverted", 

-    "right"

-};

-

-static Rotation

-xf86OutputInitialRotation (xf86OutputPtr output)

-{

-    char    *rotate_name = xf86GetOptValString (output->options, 

-						OPTION_ROTATE);

-    int	    i;

-

-    if (!rotate_name) {

-	if (output->initial_rotation)

-	    return output->initial_rotation;

-	return RR_Rotate_0;

-    }

-    

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

-	if (xf86nameCompare (direction[i], rotate_name) == 0)

-	    return 1 << i;

-    return RR_Rotate_0;

-}

-

-xf86OutputPtr

-xf86OutputCreate (ScrnInfoPtr		    scrn,

-		  const xf86OutputFuncsRec  *funcs,

-		  const char		    *name)

-{

-    xf86OutputPtr	output, *outputs;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			len;

-    Bool		primary;

-

-    if (name)

-	len = strlen (name) + 1;

-    else

-	len = 0;

-

-    output = calloc(sizeof (xf86OutputRec) + len, 1);

-    if (!output)

-	return NULL;

-    output->scrn = scrn;

-    output->funcs = funcs;

-    if (name)

-    {

-	output->name = (char *) (output + 1);

-	strcpy (output->name, name);

-    }

-    output->subpixel_order = SubPixelUnknown;

-    /*

-     * Use the old per-screen monitor section for the first output

-     */

-    output->use_screen_monitor = (xf86_config->num_output == 0);

-#ifdef RANDR_12_INTERFACE

-    output->randr_output = NULL;

-#endif

-    if (name)

-    {

-	xf86OutputSetMonitor (output);

-	if (xf86OutputIgnored (output))

-	{

-	    free(output);

-	    return FALSE;

-	}

-    }

-    

-    

-    if (xf86_config->output)

-	outputs = realloc(xf86_config->output,

-			  (xf86_config->num_output + 1) * sizeof (xf86OutputPtr));

-    else

-	outputs = malloc((xf86_config->num_output + 1) * sizeof (xf86OutputPtr));

-    if (!outputs)

-    {

-	free(output);

-	return NULL;

-    }

-

-    xf86_config->output = outputs;

-

-    if (xf86GetOptValBool (output->options, OPTION_PRIMARY, &primary) && primary)

-    {

-	memmove(xf86_config->output + 1, xf86_config->output,

-		xf86_config->num_output * sizeof (xf86OutputPtr));

-	xf86_config->output[0] = output;

-    }

-    else

-    {

-	xf86_config->output[xf86_config->num_output] = output;

-    }

-

-    xf86_config->num_output++;

-

-    return output;

-}

-

-Bool

-xf86OutputRename (xf86OutputPtr output, const char *name)

-{

-    char    *newname = strdup(name);

-    

-    if (!newname)

-	return FALSE;	/* so sorry... */

-    

-    if (output->name && output->name != (char *) (output + 1))

-	free(output->name);

-    output->name = newname;

-    xf86OutputSetMonitor (output);

-    if (xf86OutputIgnored (output))

-	return FALSE;

-    return TRUE;

-}

-

-void

-xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor)

-{

-    if (use_screen_monitor != output->use_screen_monitor)

-    {

-	output->use_screen_monitor = use_screen_monitor;

-	xf86OutputSetMonitor (output);

-    }

-}

-

-void

-xf86OutputDestroy (xf86OutputPtr output)

-{

-    ScrnInfoPtr		scrn = output->scrn;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			o;

-    

-    (*output->funcs->destroy) (output);

-    while (output->probed_modes)

-	xf86DeleteMode (&output->probed_modes, output->probed_modes);

-    for (o = 0; o < xf86_config->num_output; o++)

-	if (xf86_config->output[o] == output)

-	{

-	    memmove (&xf86_config->output[o],

-		     &xf86_config->output[o+1],

-		     ((xf86_config->num_output - (o + 1)) * sizeof(void*)));

-	    xf86_config->num_output--;

-	    break;

-	}

-    if (output->name && output->name != (char *) (output + 1))

-	free(output->name);

-    free(output);

-}

-

-/*

- * Called during CreateScreenResources to hook up RandR

- */

-static Bool

-xf86CrtcCreateScreenResources (ScreenPtr screen)

-{

-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-

-    screen->CreateScreenResources = config->CreateScreenResources;

-    

-    if (!(*screen->CreateScreenResources)(screen))

-	return FALSE;

-

-    if (!xf86RandR12CreateScreenResources (screen))

-	return FALSE;

-

-    return TRUE;

-}

-

-/*

- * Clean up config on server reset

- */

-static Bool

-xf86CrtcCloseScreen (int index, ScreenPtr screen)

-{

-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			o, c;

-    

-    screen->CloseScreen = config->CloseScreen;

-

-    xf86RotateCloseScreen (screen);

-

-    for (o = 0; o < config->num_output; o++)

-    {

-	xf86OutputPtr	output = config->output[o];

-

-	output->randr_output = NULL;

-    }

-    for (c = 0; c < config->num_crtc; c++)

-    {

-	xf86CrtcPtr	crtc = config->crtc[c];

-

-	crtc->randr_crtc = NULL;

-    }

-    xf86RandR12CloseScreen (screen);

-

-    return screen->CloseScreen (index, screen);

-}

-

-/*

- * Called at ScreenInit time to set up

- */

-#ifdef RANDR_13_INTERFACE

-int

-#else

-Bool

-#endif

-xf86CrtcScreenInit (ScreenPtr screen)

-{

-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			c;

-

-    /* Rotation */

-    xf86DrvMsg(scrn->scrnIndex, X_INFO, "RandR 1.2 enabled, ignore the following RandR disabled message.\n");

-    xf86DisableRandR(); /* Disable old RandR extension support */

-    xf86RandR12Init (screen);

-

-    /* support all rotations if every crtc has the shadow alloc funcs */

-    for (c = 0; c < config->num_crtc; c++)

-    {

-	xf86CrtcPtr crtc = config->crtc[c];

-	if (!crtc->funcs->shadow_allocate || !crtc->funcs->shadow_create)

-	    break;

-    }

-    if (c == config->num_crtc)

-    {

-	xf86RandR12SetRotations (screen, RR_Rotate_0 | RR_Rotate_90 |

-				 RR_Rotate_180 | RR_Rotate_270 |

-				 RR_Reflect_X | RR_Reflect_Y);

-	xf86RandR12SetTransformSupport (screen, TRUE);

-    }

-    else

-    {

-	xf86RandR12SetRotations (screen, RR_Rotate_0);

-	xf86RandR12SetTransformSupport (screen, FALSE);

-    }

-    

-    /* Wrap CreateScreenResources so we can initialize the RandR code */

-    config->CreateScreenResources = screen->CreateScreenResources;

-    screen->CreateScreenResources = xf86CrtcCreateScreenResources;

-

-    config->CloseScreen = screen->CloseScreen;

-    screen->CloseScreen = xf86CrtcCloseScreen;

-    

-#ifdef XFreeXDGA

-    _xf86_di_dga_init_internal(screen);

-#endif

-#ifdef RANDR_13_INTERFACE

-    return RANDR_INTERFACE_VERSION;

-#else

-    return TRUE;

-#endif

-}

-

-static DisplayModePtr

-xf86DefaultMode (xf86OutputPtr output, int width, int height)

-{

-    DisplayModePtr  target_mode = NULL;

-    DisplayModePtr  mode;

-    int		    target_diff = 0;

-    int		    target_preferred = 0;

-    int		    mm_height;

-    

-    mm_height = output->mm_height;

-    if (!mm_height)

-	mm_height = (768 * 25.4) / DEFAULT_DPI;

-    /*

-     * Pick a mode closest to DEFAULT_DPI

-     */

-    for (mode = output->probed_modes; mode; mode = mode->next)

-    {

-	int	    dpi;

-	int	    preferred = (((mode->type & M_T_PREFERRED) != 0) +

-				 ((mode->type & M_T_USERPREF) != 0));

-	int	    diff;

-

-	if (xf86ModeWidth (mode, output->initial_rotation) > width ||

-	    xf86ModeHeight (mode, output->initial_rotation) > height)

-	    continue;

-	

-	/* yes, use VDisplay here, not xf86ModeHeight */

-	dpi = (mode->VDisplay * 254) / (mm_height * 10);

-	diff = dpi - DEFAULT_DPI;

-	diff = diff < 0 ? -diff : diff;

-	if (target_mode == NULL || (preferred > target_preferred) ||

-	    (preferred == target_preferred && diff < target_diff))

-	{

-	    target_mode = mode;

-	    target_diff = diff;

-	    target_preferred = preferred;

-	}

-    }

-    return target_mode;

-}

-

-static DisplayModePtr

-xf86ClosestMode (xf86OutputPtr output, 

-		 DisplayModePtr match, Rotation match_rotation,

-		 int width, int height)

-{

-    DisplayModePtr  target_mode = NULL;

-    DisplayModePtr  mode;

-    int		    target_diff = 0;

-    

-    /*

-     * Pick a mode closest to the specified mode

-     */

-    for (mode = output->probed_modes; mode; mode = mode->next)

-    {

-	int	    dx, dy;

-	int	    diff;

-

-	if (xf86ModeWidth (mode, output->initial_rotation) > width ||

-	    xf86ModeHeight (mode, output->initial_rotation) > height)

-	    continue;

-	

-	/* exact matches are preferred */

-	if (output->initial_rotation == match_rotation &&

-	    xf86ModesEqual (mode, match))

-	    return mode;

-	

-	dx = xf86ModeWidth (match, match_rotation) - xf86ModeWidth (mode, output->initial_rotation);

-	dy = xf86ModeHeight (match, match_rotation) - xf86ModeHeight (mode, output->initial_rotation);

-	diff = dx * dx + dy * dy;

-	if (target_mode == NULL || diff < target_diff)

-	{

-	    target_mode = mode;

-	    target_diff = diff;

-	}

-    }

-    return target_mode;

-}

-

-static DisplayModePtr

-xf86OutputHasPreferredMode (xf86OutputPtr output, int width, int height)

-{

-    DisplayModePtr  mode;

-

-    for (mode = output->probed_modes; mode; mode = mode->next)

-    {

-	if (xf86ModeWidth (mode, output->initial_rotation) > width ||

-	    xf86ModeHeight (mode, output->initial_rotation) > height)

-	    continue;

-

-	if (mode->type & M_T_PREFERRED)

-	    return mode;

-    }

-    return NULL;

-}

-

-static DisplayModePtr

-xf86OutputHasUserPreferredMode (xf86OutputPtr output)

-{

-    DisplayModePtr mode, first = output->probed_modes;

-

-    for (mode = first; mode && mode->next != first; mode = mode->next)

-	if (mode->type & M_T_USERPREF)

-	    return mode;

-

-    return NULL;

-}

-

-static int

-xf86PickCrtcs (ScrnInfoPtr	scrn,

-	       xf86CrtcPtr	*best_crtcs,

-	       DisplayModePtr	*modes,

-	       int		n,

-	       int		width,

-	       int		height)

-{

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    int		    c, o;

-    xf86OutputPtr   output;

-    xf86CrtcPtr	    crtc;

-    xf86CrtcPtr	    *crtcs;

-    xf86CrtcPtr	    best_crtc;

-    int		    best_score;

-    int		    score;

-    int		    my_score;

-    

-    if (n == config->num_output)

-	return 0;

-    output = config->output[n];

-    

-    /*

-     * Compute score with this output disabled

-     */

-    best_crtcs[n] = NULL;

-    best_crtc = NULL;

-    best_score = xf86PickCrtcs (scrn, best_crtcs, modes, n+1, width, height);

-    if (modes[n] == NULL)

-	return best_score;

-    

-    crtcs = malloc(config->num_output * sizeof (xf86CrtcPtr));

-    if (!crtcs)

-	return best_score;

-

-    my_score = 1;

-    /* Score outputs that are known to be connected higher */

-    if (output->status == XF86OutputStatusConnected)

-	my_score++;

-    /* Score outputs with preferred modes higher */

-    if (xf86OutputHasPreferredMode (output, width, height))

-	my_score++;

-    /*

-     * Select a crtc for this output and

-     * then attempt to configure the remaining

-     * outputs

-     */

-    for (c = 0; c < config->num_crtc; c++)

-    {

-	if ((output->possible_crtcs & (1 << c)) == 0)

-	    continue;

-	

-	crtc = config->crtc[c];

-	/*

-	 * Check to see if some other output is

-	 * using this crtc

-	 */

-	for (o = 0; o < n; o++)

-	    if (best_crtcs[o] == crtc)

-		break;

-	if (o < n)

-	{

-	    /*

-	     * If the two outputs desire the same mode,

-	     * see if they can be cloned

-	     */

-	    if (xf86ModesEqual (modes[o], modes[n]) &&

-		config->output[o]->initial_rotation == config->output[n]->initial_rotation &&

-		config->output[o]->initial_x == config->output[n]->initial_x &&

-		config->output[o]->initial_y == config->output[n]->initial_y)

-	    {

-		if ((output->possible_clones & (1 << o)) == 0)

-		    continue;		/* nope, try next CRTC */

-	    }

-	    else

-		continue;		/* different modes, can't clone */

-	}

-	crtcs[n] = crtc;

-	memcpy (crtcs, best_crtcs, n * sizeof (xf86CrtcPtr));

-	score = my_score + xf86PickCrtcs (scrn, crtcs, modes, n+1, width, height);

-	if (score > best_score)

-	{

-	    best_crtc = crtc;

-	    best_score = score;

-	    memcpy (best_crtcs, crtcs, config->num_output * sizeof (xf86CrtcPtr));

-	}

-    }

-    free(crtcs);

-    return best_score;

-}

-

-

-/*

- * Compute the virtual size necessary to place all of the available

- * crtcs in the specified configuration.

- *

- * canGrow indicates that the driver can make the screen larger than its initial

- * configuration.  If FALSE, this function will enlarge the screen to include

- * the largest available mode.

- */

-

-static void

-xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,

-			 Bool canGrow)

-{

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    int	    width = 0, height = 0;

-    int	    o;

-    int	    c;

-    int	    s;

-

-    for (c = 0; c < config->num_crtc; c++)

-    {

-	int	    crtc_width = 0, crtc_height = 0;

-	xf86CrtcPtr crtc = config->crtc[c];

-

-	if (crtc->enabled)

-	{

-	    crtc_width = crtc->desiredX + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation);

-	    crtc_height = crtc->desiredY + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation);

-	}

-	if (!canGrow) {

-	    for (o = 0; o < config->num_output; o++)

-	    {

-		xf86OutputPtr   output = config->output[o];

-

-		for (s = 0; s < config->num_crtc; s++)

-		    if (output->possible_crtcs & (1 << s))

-		    {

-			DisplayModePtr  mode;

-			for (mode = output->probed_modes; mode; mode = mode->next)

-			{

-			    if (mode->HDisplay > crtc_width)

-				crtc_width = mode->HDisplay;

-			    if (mode->VDisplay > crtc_width)

-				crtc_width = mode->VDisplay;

-			    if (mode->VDisplay > crtc_height)

-				crtc_height = mode->VDisplay;

-			    if (mode->HDisplay > crtc_height)

-				crtc_height = mode->HDisplay;

-			}

-		    }

-	    }

-	}

-	if (crtc_width > width)

-	    width = crtc_width;

-	if (crtc_height > height)

-	    height = crtc_height;

-    }

-    if (config->maxWidth && width > config->maxWidth) width = config->maxWidth;

-    if (config->maxHeight && height > config->maxHeight) height = config->maxHeight;

-    if (config->minWidth && width < config->minWidth) width = config->minWidth;

-    if (config->minHeight && height < config->minHeight) height = config->minHeight;

-    *widthp = width;

-    *heightp = height;

-}

-

-#define POSITION_UNSET	-100000

-

-/*

- * check if the user configured any outputs at all 

- * with either a position or a relative setting or a mode.

- */

-static Bool

-xf86UserConfiguredOutputs(ScrnInfoPtr scrn, DisplayModePtr *modes)

-{

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    int o;

-    Bool user_conf = FALSE;

-

-    for (o = 0; o < config->num_output; o++)

-    {

-	xf86OutputPtr output = config->output[o];

-	char	    *position;

-	char	    *relative_name;

-	OutputOpts	    relation;

-	int r;

-	static const OutputOpts	relations[] = {

-	    OPTION_BELOW, OPTION_RIGHT_OF, OPTION_ABOVE, OPTION_LEFT_OF

-	};

-

-	position = xf86GetOptValString (output->options,

-					OPTION_POSITION);

-	if (position)

-	    user_conf = TRUE;

-

-	relation = 0;

-	relative_name = NULL;

-	for (r = 0; r < 4; r++)

-	{

-	    relation = relations[r];

-	    relative_name = xf86GetOptValString (output->options,

-						     relation);

-	    if (relative_name)

-		break;

-	}

-	if (relative_name)

-	    user_conf = TRUE;

-

-	modes[o] = xf86OutputHasUserPreferredMode(output);

-	if (modes[o])

-	    user_conf = TRUE;

-    }

-

-    return user_conf;

-}

-

-static Bool

-xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)

-{

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			o;

-    int			min_x, min_y;

-    

-    for (o = 0; o < config->num_output; o++)

-    {

-	xf86OutputPtr	output = config->output[o];

-

-	output->initial_x = output->initial_y = POSITION_UNSET;

-    }

-    

-    /*

-     * Loop until all outputs are set

-     */

-    for (;;)

-    {

-	Bool	any_set = FALSE;

-	Bool	keep_going = FALSE;

-

-	for (o = 0; o < config->num_output; o++)	

-	{

-	    static const OutputOpts	relations[] = {

-		OPTION_BELOW, OPTION_RIGHT_OF, OPTION_ABOVE, OPTION_LEFT_OF

-	    };

-	    xf86OutputPtr   output = config->output[o];

-	    xf86OutputPtr   relative;

-	    char	    *relative_name;

-	    char	    *position;

-	    OutputOpts	    relation;

-	    int		    r;

-

-	    if (output->initial_x != POSITION_UNSET)

-		continue;

-	    position = xf86GetOptValString (output->options,

-					    OPTION_POSITION);

-	    /*

-	     * Absolute position wins

-	     */

-	    if (position)

-	    {

-		int		    x, y;

-		if (sscanf (position, "%d %d", &x, &y) == 2)

-		{

-		    output->initial_x = x;

-		    output->initial_y = y;

-		}

-		else

-		{

-		    xf86DrvMsg (scrn->scrnIndex, X_ERROR,

-				"Output %s position not of form \"x y\"\n",

-				output->name);

-		    output->initial_x = output->initial_y = 0;

-		}

-		any_set = TRUE;

-		continue;

-	    }

-	    /*

-	     * Next comes relative positions

-	     */

-	    relation = 0;

-	    relative_name = NULL;

-	    for (r = 0; r < 4; r++)

-	    {

-		relation = relations[r];

-		relative_name = xf86GetOptValString (output->options,

-						     relation);

-		if (relative_name)

-		    break;

-	    }

-	    if (relative_name)

-	    {

-		int or;

-		relative = NULL;

-		for (or = 0; or < config->num_output; or++)

-		{

-		    xf86OutputPtr	out_rel = config->output[or];

-		    XF86ConfMonitorPtr	rel_mon = out_rel->conf_monitor;

-

-		    if (rel_mon)

-		    {

-			if (xf86nameCompare (rel_mon->mon_identifier,

-					      relative_name) == 0)

-			{

-			    relative = config->output[or];

-			    break;

-			}

-		    }

-		    if (strcmp (out_rel->name, relative_name) == 0)

-		    {

-			relative = config->output[or];

-			break;

-		    }

-		}

-		if (!relative)

-		{

-		    xf86DrvMsg (scrn->scrnIndex, X_ERROR,

-				"Cannot position output %s relative to unknown output %s\n",

-				output->name, relative_name);

-		    output->initial_x = 0;

-		    output->initial_y = 0;

-		    any_set = TRUE;

-		    continue;

-		}

-		if (!modes[or])

-		{

-		    xf86DrvMsg (scrn->scrnIndex, X_ERROR,

-				"Cannot position output %s relative to output %s without modes\n",

-				output->name, relative_name);

-		    output->initial_x = 0;

-		    output->initial_y = 0;

-		    any_set = TRUE;

-		    continue;

-		}

-		if (relative->initial_x == POSITION_UNSET)

-		{

-		    keep_going = TRUE;

-		    continue;

-		}

-		output->initial_x = relative->initial_x;

-		output->initial_y = relative->initial_y;

-		switch (relation) {

-		case OPTION_BELOW:

-		    output->initial_y += xf86ModeHeight (modes[or], relative->initial_rotation);

-		    break;

-		case OPTION_RIGHT_OF:

-		    output->initial_x += xf86ModeWidth (modes[or], relative->initial_rotation);

-		    break;

-		case OPTION_ABOVE:

-		    if (modes[o])

-			output->initial_y -= xf86ModeHeight (modes[o], output->initial_rotation);

-		    break;

-		case OPTION_LEFT_OF:

-		    if (modes[o])

-			output->initial_x -= xf86ModeWidth (modes[o], output->initial_rotation);

-		    break;

-		default:

-		    break;

-		}

-		any_set = TRUE;

-		continue;

-	    }

-	    

-	    /* Nothing set, just stick them at 0,0 */

-	    output->initial_x = 0;

-	    output->initial_y = 0;

-	    any_set = TRUE;

-	}

-	if (!keep_going)

-	    break;

-	if (!any_set) 

-	{

-	    for (o = 0; o < config->num_output; o++)

-	    {

-		xf86OutputPtr   output = config->output[o];

-		if (output->initial_x == POSITION_UNSET)

-		{

-		    xf86DrvMsg (scrn->scrnIndex, X_ERROR,

-				"Output position loop. Moving %s to 0,0\n",

-				output->name);

-		    output->initial_x = output->initial_y = 0;

-		    break;

-		}

-	    }

-	}

-    }

-

-    /*

-     * normalize positions

-     */

-    min_x = 1000000;

-    min_y = 1000000;

-    for (o = 0; o < config->num_output; o++)

-    {

-	xf86OutputPtr	output = config->output[o];

-

-	if (output->initial_x < min_x)

-	    min_x = output->initial_x;

-	if (output->initial_y < min_y)

-	    min_y = output->initial_y;

-    }

-    

-    for (o = 0; o < config->num_output; o++)

-    {

-	xf86OutputPtr	output = config->output[o];

-

-	output->initial_x -= min_x;

-	output->initial_y -= min_y;

-    }

-    return TRUE;

-}

-

-static void

-xf86InitialPanning (ScrnInfoPtr scrn)

-{

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			o;

-    

-    for (o = 0; o < config->num_output; o++)

-    {

-	xf86OutputPtr	output = config->output[o];

-	char	       *panning = xf86GetOptValString (output->options, OPTION_PANNING);

-	int		width, height, left, top;

-	int		track_width, track_height, track_left, track_top;

-	int		brdr[4];

-

-	memset (&output->initialTotalArea,    0, sizeof(BoxRec));

-	memset (&output->initialTrackingArea, 0, sizeof(BoxRec));

-	memset (output->initialBorder,        0, 4*sizeof(INT16));

-

-	if (! panning)

-	    continue;

-

-	switch (sscanf (panning, "%dx%d+%d+%d/%dx%d+%d+%d/%d/%d/%d/%d",

-			&width, &height, &left, &top,

-			&track_width, &track_height, &track_left, &track_top,

-			&brdr[0], &brdr[1], &brdr[2], &brdr[3])) {

-	case 12:

-	    output->initialBorder[0] = brdr[0];

-	    output->initialBorder[1] = brdr[1];

-	    output->initialBorder[2] = brdr[2];

-	    output->initialBorder[3] = brdr[3];

-	    /* fall through */

-	case 8:

-	    output->initialTrackingArea.x1 = track_left;

-	    output->initialTrackingArea.y1 = track_top;

-	    output->initialTrackingArea.x2 = track_left + track_width;

-	    output->initialTrackingArea.y2 = track_top  + track_height;

-	    /* fall through */

-	case 4:

-	    output->initialTotalArea.x1 = left;

-	    output->initialTotalArea.y1 = top;

-	    /* fall through */

-	case 2:

-	    output->initialTotalArea.x2 = output->initialTotalArea.x1 + width;

-	    output->initialTotalArea.y2 = output->initialTotalArea.y1 + height;

-	    break;

-	default:

-	    xf86DrvMsg (scrn->scrnIndex, X_ERROR,

-			"Broken panning specification '%s' for output %s in config file\n",

-			panning, output->name);

-	}

-    }

-}

-

-/** Return - 0 + if a should be earlier, same or later than b in list

- */

-static int

-xf86ModeCompare (DisplayModePtr a, DisplayModePtr b)

-{

-    int	diff;

-

-    diff = ((b->type & M_T_PREFERRED) != 0) - ((a->type & M_T_PREFERRED) != 0);

-    if (diff)

-	return diff;

-    diff = b->HDisplay * b->VDisplay - a->HDisplay * a->VDisplay;

-    if (diff)

-	return diff;

-    diff = b->Clock - a->Clock;

-    return diff;

-}

-

-/**

- * Insertion sort input in-place and return the resulting head

- */

-static DisplayModePtr

-xf86SortModes (DisplayModePtr input)

-{

-    DisplayModePtr  output = NULL, i, o, n, *op, prev;

-

-    /* sort by preferred status and pixel area */

-    while (input)

-    {

-	i = input;

-	input = input->next;

-	for (op = &output; (o = *op); op = &o->next)

-	    if (xf86ModeCompare (o, i) > 0)

-		break;

-	i->next = *op;

-	*op = i;

-    }

-    /* prune identical modes */

-    for (o = output; o && (n = o->next); o = n)

-    {

-	if (!strcmp (o->name, n->name) && xf86ModesEqual (o, n))

-	{

-	    o->next = n->next;

-	    free(n->name);

-	    free(n);

-	    n = o;

-	}

-    }

-    /* hook up backward links */

-    prev = NULL;

-    for (o = output; o; o = o->next)

-    {

-	o->prev = prev;

-	prev = o;

-    }

-    return output;

-}

-

-static char *

-preferredMode(ScrnInfoPtr pScrn, xf86OutputPtr output)

-{

-    char *preferred_mode = NULL;

-

-    /* Check for a configured preference for a particular mode */

-    preferred_mode = xf86GetOptValString (output->options,

-					  OPTION_PREFERRED_MODE);

-    if (preferred_mode)

-	return preferred_mode;

-

-    if (pScrn->display->modes && *pScrn->display->modes)

-	preferred_mode = *pScrn->display->modes;

-

-    return preferred_mode;

-}

-

-static void

-GuessRangeFromModes(MonPtr mon, DisplayModePtr mode)

-{

-    if (!mon || !mode)

-       return;

-

-    mon->nHsync = 1;

-    mon->hsync[0].lo = 1024.0;

-    mon->hsync[0].hi = 0.0;

-

-    mon->nVrefresh = 1;

-    mon->vrefresh[0].lo = 1024.0;

-    mon->vrefresh[0].hi = 0.0;

-

-    while (mode) {

-	if (!mode->HSync)

-	    mode->HSync = ((float) mode->Clock ) / ((float) mode->HTotal);

-

-	if (!mode->VRefresh)

-	    mode->VRefresh = (1000.0 * ((float) mode->Clock)) / 

-		((float) (mode->HTotal * mode->VTotal));

-

-	if (mode->HSync < mon->hsync[0].lo)

-	    mon->hsync[0].lo = mode->HSync;

-

-	if (mode->HSync > mon->hsync[0].hi)

-	    mon->hsync[0].hi = mode->HSync;

-

-	if (mode->VRefresh < mon->vrefresh[0].lo)

-	    mon->vrefresh[0].lo = mode->VRefresh;

-

-	if (mode->VRefresh > mon->vrefresh[0].hi)

-	    mon->vrefresh[0].hi = mode->VRefresh;

-

-	mode = mode->next;

-    }

-

-    /* stretch out the bottom to fit 640x480@60 */

-    if (mon->hsync[0].lo > 31.0)

-       mon->hsync[0].lo = 31.0;

-    if (mon->vrefresh[0].lo > 58.0)

-       mon->vrefresh[0].lo = 58.0;

-}

-

-enum det_monrec_source {

-    sync_config, sync_edid, sync_default

-};

-

-struct det_monrec_parameter {

-    MonRec *mon_rec;

-    int *max_clock;

-    Bool set_hsync;

-    Bool set_vrefresh;

-    enum det_monrec_source *sync_source;

-};

-

-static void handle_detailed_monrec(struct detailed_monitor_section *det_mon,

-                                   void *data)

-{

-    struct det_monrec_parameter *p;

-    p = (struct det_monrec_parameter *)data;

-

-    if (det_mon->type == DS_RANGES) {

-        struct monitor_ranges *ranges = &det_mon->section.ranges;

-        if (p->set_hsync && ranges->max_h) {

-            p->mon_rec->hsync[p->mon_rec->nHsync].lo = ranges->min_h;

-            p->mon_rec->hsync[p->mon_rec->nHsync].hi = ranges->max_h;

-            p->mon_rec->nHsync++;

-            if (*p->sync_source == sync_default)

-                *p->sync_source = sync_edid;

-        }

-        if (p->set_vrefresh && ranges->max_v) {

-            p->mon_rec->vrefresh[p->mon_rec->nVrefresh].lo = ranges->min_v;

-            p->mon_rec->vrefresh[p->mon_rec->nVrefresh].hi = ranges->max_v;

-            p->mon_rec->nVrefresh++;

-            if (*p->sync_source == sync_default)

-                *p->sync_source = sync_edid;

-        }

-        if (ranges->max_clock * 1000 > *p->max_clock)

-            *p->max_clock = ranges->max_clock * 1000;

-    }

-}

-

-void

-xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)

-{

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			o;

-

-    /* When canGrow was TRUE in the initial configuration we have to

-     * compare against the maximum values so that we don't drop modes.

-     * When canGrow was FALSE, the maximum values would have been clamped

-     * anyway.

-     */

-    if (maxX == 0 || maxY == 0) {

-	maxX = config->maxWidth;

-	maxY = config->maxHeight;

-    }

-

-    /* Probe the list of modes for each output. */

-    for (o = 0; o < config->num_output; o++) 

-    {

-	xf86OutputPtr	    output = config->output[o];

-	DisplayModePtr	    mode;

-	DisplayModePtr	    config_modes = NULL, output_modes, default_modes = NULL;

-	char		    *preferred_mode;

-	xf86MonPtr	    edid_monitor;

-	XF86ConfMonitorPtr  conf_monitor;

-	MonRec		    mon_rec;

-	int		    min_clock = 0;

-	int		    max_clock = 0;

-	double		    clock;

-	Bool		    add_default_modes = xf86ReturnOptValBool(output->options, OPTION_DEFAULT_MODES, TRUE);

-	Bool		    debug_modes = config->debug_modes ||

-					  xf86Initialising;

-	enum det_monrec_source sync_source = sync_default;

-	

-	while (output->probed_modes != NULL)

-	    xf86DeleteMode(&output->probed_modes, output->probed_modes);

-

-	/*

-	 * Check connection status

-	 */

-	output->status = (*output->funcs->detect)(output);

-

-	if (output->status == XF86OutputStatusDisconnected &&

-		!xf86ReturnOptValBool(output->options, OPTION_ENABLE, FALSE))

-	{

-	    xf86OutputSetEDID (output, NULL);

-	    continue;

-	}

-

-	memset (&mon_rec, '\0', sizeof (mon_rec));

-	

-	conf_monitor = output->conf_monitor;

-	

-	if (conf_monitor)

-	{

-	    int	i;

-	    

-	    for (i = 0; i < conf_monitor->mon_n_hsync; i++)

-	    {

-		mon_rec.hsync[mon_rec.nHsync].lo = conf_monitor->mon_hsync[i].lo;

-		mon_rec.hsync[mon_rec.nHsync].hi = conf_monitor->mon_hsync[i].hi;

-		mon_rec.nHsync++;

-		sync_source = sync_config;

-	    }

-	    for (i = 0; i < conf_monitor->mon_n_vrefresh; i++)

-	    {

-		mon_rec.vrefresh[mon_rec.nVrefresh].lo = conf_monitor->mon_vrefresh[i].lo;

-		mon_rec.vrefresh[mon_rec.nVrefresh].hi = conf_monitor->mon_vrefresh[i].hi;

-		mon_rec.nVrefresh++;

-		sync_source = sync_config;

-	    }

-	    config_modes = xf86GetMonitorModes (scrn, conf_monitor);

-	}

-	

-	output_modes = (*output->funcs->get_modes) (output);

-	

-	edid_monitor = output->MonInfo;

-	

-        if (edid_monitor)

-        {

-            struct det_monrec_parameter p;

-            struct disp_features    *features = &edid_monitor->features;

-

-	    /* if display is not continuous-frequency, don't add default modes */

-	    if (!GTF_SUPPORTED(features->msc))

-		add_default_modes = FALSE;

-

-	    p.mon_rec = &mon_rec;

-	    p.max_clock = &max_clock;

-	    p.set_hsync = mon_rec.nHsync == 0;

-	    p.set_vrefresh = mon_rec.nVrefresh == 0;

-	    p.sync_source = &sync_source;

-

-	    xf86ForEachDetailedBlock(edid_monitor,

-			             handle_detailed_monrec,

-			             &p);

-	}

-

-	if (xf86GetOptValFreq (output->options, OPTION_MIN_CLOCK,

-			       OPTUNITS_KHZ, &clock))

-	    min_clock = (int) clock;

-	if (xf86GetOptValFreq (output->options, OPTION_MAX_CLOCK,

-			       OPTUNITS_KHZ, &clock))

-	    max_clock = (int) clock;

-

-	/* If we still don't have a sync range, guess wildly */

-	if (!mon_rec.nHsync || !mon_rec.nVrefresh)

-	    GuessRangeFromModes(&mon_rec, output_modes);

-

-	/*

-	 * These limits will end up setting a 1024x768@60Hz mode by default,

-	 * which seems like a fairly good mode to use when nothing else is

-	 * specified

-	 */

-	if (mon_rec.nHsync == 0)

-	{

-	    mon_rec.hsync[0].lo = 31.0;

-	    mon_rec.hsync[0].hi = 55.0;

-	    mon_rec.nHsync = 1;

-	}

-	if (mon_rec.nVrefresh == 0)

-	{

-	    mon_rec.vrefresh[0].lo = 58.0;

-	    mon_rec.vrefresh[0].hi = 62.0;

-	    mon_rec.nVrefresh = 1;

-	}

-

-	if (add_default_modes)

-	    default_modes = xf86GetDefaultModes ();

-

-	/*

-	 * If this is not an RB monitor, remove RB modes from the default

-	 * pool.  RB modes from the config or the monitor itself are fine.

-	 */

-	if (!mon_rec.reducedblanking)

-	    xf86ValidateModesReducedBlanking (scrn, default_modes);

-

-	if (sync_source == sync_config)

-	{

-	    /* 

-	     * Check output and config modes against sync range from config file

-	     */

-	    xf86ValidateModesSync (scrn, output_modes, &mon_rec);

-	    xf86ValidateModesSync (scrn, config_modes, &mon_rec);

-	}

-	/*

-	 * Check default modes against sync range

-	 */

-        xf86ValidateModesSync (scrn, default_modes, &mon_rec);

-	/*

-	 * Check default modes against monitor max clock

-	 */

-	if (max_clock) {

-	    xf86ValidateModesClocks(scrn, default_modes,

-				    &min_clock, &max_clock, 1);

-	    xf86ValidateModesClocks(scrn, output_modes,

-				    &min_clock, &max_clock, 1);

-	}

-	

-	output->probed_modes = NULL;

-	output->probed_modes = xf86ModesAdd (output->probed_modes, config_modes);

-	output->probed_modes = xf86ModesAdd (output->probed_modes, output_modes);

-	output->probed_modes = xf86ModesAdd (output->probed_modes, default_modes);

-	

-	/*

-	 * Check all modes against max size, interlace, and doublescan

-	 */

-	if (maxX && maxY)

-	    xf86ValidateModesSize (scrn, output->probed_modes,

-				       maxX, maxY, 0);

-

-	{

-	    int flags = (output->interlaceAllowed ? V_INTERLACE : 0) |

-			(output->doubleScanAllowed ? V_DBLSCAN : 0);

-	    xf86ValidateModesFlags (scrn, output->probed_modes, flags);

-	}

-	 

-	/*

-	 * Check all modes against output

-	 */

-	for (mode = output->probed_modes; mode != NULL; mode = mode->next) 

-	    if (mode->status == MODE_OK)

-		mode->status = (*output->funcs->mode_valid)(output, mode);

-	

-	xf86PruneInvalidModes(scrn, &output->probed_modes, debug_modes);

-	

-	output->probed_modes = xf86SortModes (output->probed_modes);

-	

-	/* Check for a configured preference for a particular mode */

-	preferred_mode = preferredMode(scrn, output);

-

-	if (preferred_mode)

-	{

-	    for (mode = output->probed_modes; mode; mode = mode->next)

-	    {

-		if (!strcmp (preferred_mode, mode->name))

-		{

-		    if (mode != output->probed_modes)

-		    {

-			if (mode->prev)

-			    mode->prev->next = mode->next;

-			if (mode->next)

-			    mode->next->prev = mode->prev;

-			mode->next = output->probed_modes;

-			output->probed_modes->prev = mode;

-			mode->prev = NULL;

-			output->probed_modes = mode;

-		    }

-		    mode->type |= (M_T_PREFERRED|M_T_USERPREF);

-		    break;

-		}

-	    }

-	}

-	

-	output->initial_rotation = xf86OutputInitialRotation (output);

-

-	if (debug_modes) {

-	    if (output->probed_modes != NULL) {

-		xf86DrvMsg(scrn->scrnIndex, X_INFO,

-			   "Printing probed modes for output %s\n",

-			   output->name);

-	    } else {

-		xf86DrvMsg(scrn->scrnIndex, X_INFO,

-			   "No remaining probed modes for output %s\n",

-			   output->name);

-	    }

-	}

-	for (mode = output->probed_modes; mode != NULL; mode = mode->next)

-	{

-	    /* The code to choose the best mode per pipe later on will require

-	     * VRefresh to be set.

-	     */

-	    mode->VRefresh = xf86ModeVRefresh(mode);

-	    xf86SetModeCrtc(mode, INTERLACE_HALVE_V);

-

-	    if (debug_modes)

-		xf86PrintModeline(scrn->scrnIndex, mode);

-	}

-    }

-}

-

-

-/**

- * Copy one of the output mode lists to the ScrnInfo record

- */

-

-/* XXX where does this function belong? Here? */

-void

-xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr scrn, int *x, int *y);

-

-static DisplayModePtr

-biggestMode(DisplayModePtr a, DisplayModePtr b)

-{

-    int A, B;

-

-    if (!a)

-	return b;

-    if (!b)

-	return a;

-

-    A = a->HDisplay * a->VDisplay;

-    B = b->HDisplay * b->VDisplay;

-

-    if (A > B)

-	return a;

-

-    return b;

-}

-

-static xf86OutputPtr

-SetCompatOutput(xf86CrtcConfigPtr config)

-{

-    xf86OutputPtr output = NULL, test = NULL;

-    DisplayModePtr maxmode = NULL, testmode, mode;

-    int o, compat = -1, count, mincount = 0;

-

-    /* Look for one that's definitely connected */

-    for (o = 0; o < config->num_output; o++)

-    {

-	test = config->output[o];

-	if (!test->crtc)

-	    continue;

-	if (test->status != XF86OutputStatusConnected)

-	    continue;

-	if (!test->probed_modes)

-	    continue;

-

-	testmode = mode = test->probed_modes;

-	for (count = 0; mode; mode = mode->next, count++)

-	    testmode = biggestMode(testmode, mode);

-

-	if (!output) {

-	    output = test;

-	    compat = o;

-	    maxmode = testmode;

-	    mincount = count;

-	} else if (maxmode == biggestMode(maxmode, testmode)) {

-	    output = test;

-	    compat = o;

-	    maxmode = testmode;

-	    mincount = count;

-	} else if ((maxmode->HDisplay == testmode->HDisplay) && 

-		(maxmode->VDisplay == testmode->VDisplay) &&

-		count <= mincount) {

-	    output = test;

-	    compat = o;

-	    maxmode = testmode;

-	    mincount = count;

-	}

-    }

-

-    /* If we didn't find one, take anything we can get */

-    if (!output)

-    {

-	for (o = 0; o < config->num_output; o++)

-	{

-	    test = config->output[o];

-	    if (!test->crtc)

-		continue;

-	    if (!test->probed_modes)

-		continue;

-

-	    if (!output) {

-		output = test;

-		compat = o;

-	    } else if (test->probed_modes->HDisplay < output->probed_modes->HDisplay) {

-		output = test;

-		compat = o;

-	    }

-	}

-    }

-

-    if (compat >= 0) {

-	config->compat_output = compat;

-    } else {

-	/* Don't change the compat output when no valid outputs found */

-	output = config->output[config->compat_output];

-    }

-

-    return output;

-}

-

-void

-xf86SetScrnInfoModes (ScrnInfoPtr scrn)

-{

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    xf86OutputPtr	output;

-    xf86CrtcPtr		crtc;

-    DisplayModePtr	last, mode = NULL;

-

-    output = SetCompatOutput(config);

-

-    if (!output)

-	return; /* punt */

-

-    crtc = output->crtc;

-

-    /* Clear any existing modes from scrn->modes */

-    while (scrn->modes != NULL)

-	xf86DeleteMode(&scrn->modes, scrn->modes);

-

-    /* Set scrn->modes to the mode list for the 'compat' output */

-    scrn->modes = xf86DuplicateModes(scrn, output->probed_modes);

-

-    if (crtc) {

-	for (mode = scrn->modes; mode; mode = mode->next)

-	    if (xf86ModesEqual (mode, &crtc->desiredMode))

-		break;

-    }

-

-    if (scrn->modes != NULL) {

-	/* For some reason, scrn->modes is circular, unlike the other mode

-	 * lists.  How great is that?

-	 */

-	for (last = scrn->modes; last && last->next; last = last->next)

-	    ;

-	last->next = scrn->modes;

-	scrn->modes->prev = last;

-	if (mode) {

-	    while (scrn->modes != mode)

-		scrn->modes = scrn->modes->next;

-	}

-    }

-    scrn->currentMode = scrn->modes;

-#ifdef XFreeXDGA

-    if (scrn->pScreen)

-	    _xf86_di_dga_reinit_internal(scrn->pScreen);

-#endif

-}

-

-static Bool

-xf86CollectEnabledOutputs(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,

-			  Bool *enabled)

-{

-    Bool any_enabled = FALSE;

-    int o;

-

-    for (o = 0; o < config->num_output; o++)

-	any_enabled |= enabled[o] = xf86OutputEnabled(config->output[o], TRUE);

-    

-    if (!any_enabled) {

-	xf86DrvMsg(scrn->scrnIndex, X_WARNING,

-		   "No outputs definitely connected, trying again...\n");

-

-	for (o = 0; o < config->num_output; o++)

-	    any_enabled |= enabled[o] = xf86OutputEnabled(config->output[o], FALSE);

-    }

-

-    return any_enabled;

-}

-

-static Bool

-nextEnabledOutput(xf86CrtcConfigPtr config, Bool *enabled, int *index)

-{

-    int o = *index;

-

-    for (o++; o < config->num_output; o++) {

-	if (enabled[o]) {

-	    *index = o;

-	    return TRUE;

-	}

-    }

-    

-    return FALSE;

-}

-

-static Bool

-aspectMatch(float a, float b)

-{

-    return fabs(1 - (a / b)) < 0.05;

-}

-

-static DisplayModePtr

-nextAspectMode(xf86OutputPtr o, DisplayModePtr last, float aspect)

-{

-    DisplayModePtr m = NULL;

-

-    if (!o)

-	return NULL;

-

-    if (!last)

-	m = o->probed_modes;

-    else

-	m = last->next;

-

-    for (; m; m = m->next)

-	if (aspectMatch(aspect, (float)m->HDisplay / (float)m->VDisplay))

-	    return m;

-

-    return NULL;

-}

-

-static DisplayModePtr

-bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)

-{

-    int o = -1, p;

-    DisplayModePtr mode = NULL, test = NULL, match = NULL;

-

-    if (!nextEnabledOutput(config, enabled, &o))

-	return NULL;

-    while ((mode = nextAspectMode(config->output[o], mode, aspect))) {

-	test = mode;

-	for (p = o; nextEnabledOutput(config, enabled, &p); ) {

-	    test = xf86OutputFindClosestMode(config->output[p], mode);

-	    if (!test)

-		break;

-	    if (test->HDisplay != mode->HDisplay ||

-		    test->VDisplay != mode->VDisplay) {

-		test = NULL;

-		break;

-	    }

-	}

-

-	/* if we didn't match it on all outputs, try the next one */

-	if (!test)

-	    continue;

-

-	/* if it's bigger than the last one, save it */

-	if (!match || (test->HDisplay > match->HDisplay))

-	    match = test;

-    }

-

-    /* return the biggest one found */

-    return match;

-}

-

-static Bool

-xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,

-		    DisplayModePtr *modes, Bool *enabled,

-		    int width, int height)

-{

-    int o, p;

-    int max_pref_width = 0, max_pref_height = 0;

-    DisplayModePtr *preferred, *preferred_match;

-    Bool ret = FALSE;

-

-    preferred = xnfcalloc(config->num_output, sizeof(DisplayModePtr));

-    preferred_match = xnfcalloc(config->num_output, sizeof(DisplayModePtr));

-

-    /* Check if the preferred mode is available on all outputs */

-    for (p = -1; nextEnabledOutput(config, enabled, &p); ) {

-	Rotation r = config->output[p]->initial_rotation;

-	DisplayModePtr mode;

-	if ((preferred[p] = xf86OutputHasPreferredMode(config->output[p],

-			width, height))) {

-	    int pref_width = xf86ModeWidth(preferred[p], r);

-	    int pref_height = xf86ModeHeight(preferred[p], r);

-	    Bool all_match = TRUE;

-

-	    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {

-		Bool match = FALSE;

-		xf86OutputPtr output = config->output[o];

-		if (o == p)

-		    continue;

-

-		for (mode = output->probed_modes; mode; mode = mode->next) {

-		    Rotation r = output->initial_rotation;

-		    if (xf86ModeWidth(mode, r) == pref_width &&

-			    xf86ModeHeight(mode, r) == pref_height) {

-			preferred[o] = mode;

-			match = TRUE;

-		    }

-		}

-

-		all_match &= match;

-	    }

-

-	    if (all_match &&

-		    (pref_width*pref_height > max_pref_width*max_pref_height)) {

-		for (o = -1; nextEnabledOutput(config, enabled, &o); )

-		    preferred_match[o] = preferred[o];

-		max_pref_width = pref_width;

-		max_pref_height = pref_height;

-		ret = TRUE;

-	    }

-	}

-    }

-

-    /*

-     * If there's no preferred mode, but only one monitor, pick the

-     * biggest mode for its aspect ratio, assuming one exists.

-     */

-    if (!ret) do {

-	int i = 0;

-	float aspect = 0.0;

-

-	/* count the number of enabled outputs */

-	for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ;

-

-	if (i != 1)

-	    break;

-

-	p = -1;

-	nextEnabledOutput(config, enabled, &p);

-	if (config->output[p]->mm_height)

-	    aspect = (float)config->output[p]->mm_width /

-		     (float)config->output[p]->mm_height;

-

-	if (aspect)

-	    preferred_match[p] = bestModeForAspect(config, enabled, aspect);

-

-	if (preferred_match[p])

-	    ret = TRUE;

-

-    } while (0);

-

-    if (ret) {

-	/* oh good, there is a match.  stash the selected modes and return. */

-	memcpy(modes, preferred_match,

-		config->num_output * sizeof(DisplayModePtr));

-    }

-

-    free(preferred);

-    free(preferred_match);

-    return ret;

-}

-

-static Bool

-xf86TargetAspect(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,

-		 DisplayModePtr *modes, Bool *enabled,

-		 int width, int height)

-{

-    int o;

-    float aspect = 0.0, *aspects;

-    xf86OutputPtr output;

-    Bool ret = FALSE;

-    DisplayModePtr guess = NULL, aspect_guess = NULL, base_guess = NULL;

-

-    aspects = xnfcalloc(config->num_output, sizeof(float));

-

-    /* collect the aspect ratios */

-    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {

-	output = config->output[o];

-	if (output->mm_height)

-	    aspects[o] = (float)output->mm_width / (float)output->mm_height;

-	else

-	    aspects[o] = 4.0 / 3.0;

-    }

-

-    /* check that they're all the same */

-    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {

-	output = config->output[o];

-	if (!aspect) {

-	    aspect = aspects[o];

-	} else if (!aspectMatch(aspect, aspects[o])) {

-	    goto no_aspect_match;

-	}

-    }

-

-    /* if they're all 4:3, just skip ahead and save effort */

-    if (!aspectMatch(aspect, 4.0/3.0))

-	aspect_guess = bestModeForAspect(config, enabled, aspect);

-

-no_aspect_match:

-    base_guess = bestModeForAspect(config, enabled, 4.0/3.0);

-

-    guess = biggestMode(base_guess, aspect_guess);

-

-    if (!guess)

-	goto out;

-

-    /* found a mode that works everywhere, now apply it */

-    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {

-	modes[o] = xf86OutputFindClosestMode(config->output[o], guess);

-    }

-    ret = TRUE;

-

-out:

-    free(aspects);

-    return ret;

-}

-

-static Bool

-xf86TargetFallback(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,

-		   DisplayModePtr *modes, Bool *enabled,

-		   int width, int height)

-{

-    DisplayModePtr target_mode = NULL;

-    Rotation target_rotation = RR_Rotate_0;

-    DisplayModePtr default_mode;

-    int default_preferred, target_preferred = 0, o;

-

-    /* User preferred > preferred > other modes */

-    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {

-	default_mode = xf86DefaultMode (config->output[o], width, height);

-	if (!default_mode)

-	    continue;

-

-	default_preferred = (((default_mode->type & M_T_PREFERRED) != 0) +

-		((default_mode->type & M_T_USERPREF) != 0));

-

-	if (default_preferred > target_preferred || !target_mode) {

-	    target_mode = default_mode;

-	    target_preferred = default_preferred;

-	    target_rotation = config->output[o]->initial_rotation;

-	    config->compat_output = o;

-	}

-    }

-

-    if (target_mode)

-	modes[config->compat_output] = target_mode;

-

-    /* Fill in other output modes */

-    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {

-	if (!modes[o])

-	    modes[o] = xf86ClosestMode(config->output[o], target_mode,

-				       target_rotation, width, height);

-    }

-

-    return target_mode != NULL;

-}

-

-static Bool

-xf86TargetUserpref(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,

-		   DisplayModePtr *modes, Bool *enabled,

-		   int width, int height)

-{

-    int o;

-

-    if (xf86UserConfiguredOutputs(scrn, modes))

-	return xf86TargetFallback(scrn, config, modes, enabled, width, height);

-    

-    for (o = -1; nextEnabledOutput(config, enabled, &o); )

-	if (xf86OutputHasUserPreferredMode(config->output[o]))

-	    return 

-		xf86TargetFallback(scrn, config, modes, enabled, width, height);

-

-    return FALSE;

-}

-

-static Bool

-xf86CrtcSetInitialGamma(xf86CrtcPtr crtc, float gamma_red, float gamma_green,

-        float gamma_blue)

-{

-    int i, size = 256;

-    CARD16 *red, *green, *blue;

-

-    red = malloc(3 * size * sizeof(CARD16));

-    green = red + size;

-    blue = green + size;

-

-     /* Only cause warning if user wanted gamma to be set. */

-    if (!crtc->funcs->gamma_set && (gamma_red != 1.0 || gamma_green != 1.0 || gamma_blue != 1.0)) {

-        free(red);

-        return FALSE;

-    } else if (!crtc->funcs->gamma_set) {

-        free(red);

-        return TRUE;

-      }

-

-    /* At this early stage none of the randr-interface stuff is up.

-     * So take the default gamma size for lack of something better.

-     */

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

-        if (gamma_red == 1.0)

-            red[i] = i << 8;

-        else

-            red[i] = (CARD16)(pow((double)i/(double)(size - 1),

-			1. / (double)gamma_red) * (double)(size - 1) * 256);

-

-        if (gamma_green == 1.0)

-            green[i] = i << 8;

-        else

-            green[i] = (CARD16)(pow((double)i/(double)(size - 1),

-			1. / (double)gamma_green) * (double)(size - 1) * 256);

-

-        if (gamma_blue == 1.0)

-            blue[i] = i << 8;

-        else

-            blue[i] = (CARD16)(pow((double)i/(double)(size - 1),

-			1. / (double)gamma_blue) * (double)(size - 1) * 256);

-    }

-

-    /* Default size is 256, so anything else is failure. */

-    if (size != crtc->gamma_size) {

-        free(red);

-        return FALSE;

-      }

-

-    crtc->gamma_size = size;

-    memcpy (crtc->gamma_red, red, crtc->gamma_size * sizeof (CARD16));

-    memcpy (crtc->gamma_green, green, crtc->gamma_size * sizeof (CARD16));

-    memcpy (crtc->gamma_blue, blue, crtc->gamma_size * sizeof (CARD16));

-

-    /* Do not set gamma now, delay until the crtc is activated. */

-

-    free(red);

-

-    return TRUE;

-}

-

-static Bool

-xf86OutputSetInitialGamma(xf86OutputPtr output)

-{

-    XF86ConfMonitorPtr mon = output->conf_monitor;

-    float gamma_red = 1.0, gamma_green = 1.0, gamma_blue = 1.0;

-    

-    if (!mon)

-        return TRUE;

-

-    if (!output->crtc)

-        return FALSE;

-

-    /* Get configured values, where they exist. */

-    if (mon->mon_gamma_red >= GAMMA_MIN &&

-        mon->mon_gamma_red <= GAMMA_MAX)

-            gamma_red = mon->mon_gamma_red;

-

-    if (mon->mon_gamma_green >= GAMMA_MIN &&

-        mon->mon_gamma_green <= GAMMA_MAX)

-            gamma_green = mon->mon_gamma_green;

-

-    if (mon->mon_gamma_blue >= GAMMA_MIN &&

-        mon->mon_gamma_blue <= GAMMA_MAX)

-            gamma_blue = mon->mon_gamma_blue;

-

-    /* This avoids setting gamma 1.0 in case another cloned output on this crtc has a specific gamma. */

-    if (gamma_red != 1.0 || gamma_green != 1.0 || gamma_blue != 1.0) {

-	xf86DrvMsg(output->scrn->scrnIndex, X_INFO, "Output %s wants gamma correction (%.1f, %.1f, %.1f)\n", output->name, gamma_red, gamma_green, gamma_blue);

-	return xf86CrtcSetInitialGamma(output->crtc, gamma_red, gamma_green, gamma_blue);

-    }else

-	return TRUE;

-}

-

-/**

- * Construct default screen configuration

- *

- * Given auto-detected (and, eventually, configured) values,

- * construct a usable configuration for the system

- *

- * canGrow indicates that the driver can resize the screen to larger than its

- * initially configured size via the config->funcs->resize hook.  If TRUE, this

- * function will set virtualX and virtualY to match the initial configuration

- * and leave config->max{Width,Height} alone.  If FALSE, it will bloat

- * virtual[XY] to include the largest modes and set config->max{Width,Height}

- * accordingly.

- */

-

-Bool

-xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)

-{

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			o, c;

-    xf86CrtcPtr		*crtcs;

-    DisplayModePtr	*modes;

-    Bool		*enabled;

-    int			width, height;

-    int			i = scrn->scrnIndex;

-    Bool have_outputs = TRUE;

-    Bool ret;

-

-    /* Set up the device options */

-    config->options = xnfalloc (sizeof (xf86DeviceOptions));

-    memcpy (config->options, xf86DeviceOptions, sizeof (xf86DeviceOptions));

-    xf86ProcessOptions (scrn->scrnIndex,

-			scrn->options,

-			config->options);

-    config->debug_modes = xf86ReturnOptValBool (config->options,

-						OPTION_MODEDEBUG, FALSE);

-

-    if (scrn->display->virtualX)

-	width = scrn->display->virtualX;

-    else

-	width = config->maxWidth;

-    if (scrn->display->virtualY)

-	height = scrn->display->virtualY;

-    else

-	height = config->maxHeight;

-

-    xf86ProbeOutputModes (scrn, width, height);

-

-    crtcs = xnfcalloc (config->num_output, sizeof (xf86CrtcPtr));

-    modes = xnfcalloc (config->num_output, sizeof (DisplayModePtr));

-    enabled = xnfcalloc (config->num_output, sizeof (Bool));

-    

-    ret = xf86CollectEnabledOutputs(scrn, config, enabled);

-    if (ret == FALSE && canGrow) {

-	xf86DrvMsg(i, X_WARNING, "Unable to find connected outputs - setting %dx%d initial framebuffer\n",

-		   NO_OUTPUT_DEFAULT_WIDTH, NO_OUTPUT_DEFAULT_HEIGHT);

-	have_outputs = FALSE;

-    } else {

-	if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))

-	    xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");

-	else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height))

-	    xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");

-	else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))

-	    xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n");

-	else if (xf86TargetFallback(scrn, config, modes, enabled, width, height))

-	    xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n");

-	else

-	    xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n");

-    }

-

-    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {

-	if (!modes[o])

-	    xf86DrvMsg (scrn->scrnIndex, X_ERROR,

-			"Output %s enabled but has no modes\n",

-			config->output[o]->name);

-	else

-	    xf86DrvMsg (scrn->scrnIndex, X_INFO,

-			"Output %s using initial mode %s\n",

-			config->output[o]->name, modes[o]->name);

-    }

-

-    /*

-     * Set the position of each output

-     */

-    if (!xf86InitialOutputPositions (scrn, modes))

-    {

-	free(crtcs);

-	free(modes);

-	return FALSE;

-    }

-

-    /*

-     * Set initial panning of each output

-     */

-    xf86InitialPanning (scrn);

-	

-    /*

-     * Assign CRTCs to fit output configuration

-     */

-    if (have_outputs && !xf86PickCrtcs (scrn, crtcs, modes, 0, width, height))

-    {

-	free(crtcs);

-	free(modes);

-	return FALSE;

-    }

-    

-    /* XXX override xf86 common frame computation code */

-    

-    scrn->display->frameX0 = 0;

-    scrn->display->frameY0 = 0;

-    

-    for (c = 0; c < config->num_crtc; c++)

-    {

-	xf86CrtcPtr	crtc = config->crtc[c];

-

-	crtc->enabled = FALSE;

-	memset (&crtc->desiredMode, '\0', sizeof (crtc->desiredMode));

-	/* Set default gamma for all crtc's. */

-	/* This is done to avoid problems later on with cloned outputs. */

-	xf86CrtcSetInitialGamma(crtc, 1.0, 1.0, 1.0);

-    }

-

-    if (xf86_crtc_supports_gamma(scrn))

-	xf86DrvMsg(scrn->scrnIndex, X_INFO, "Using default gamma of (1.0, 1.0, 1.0) unless otherwise stated.\n");

-

-    /*

-     * Set initial configuration

-     */

-    for (o = 0; o < config->num_output; o++)

-    {

-	xf86OutputPtr	output = config->output[o];

-	DisplayModePtr	mode = modes[o];

-        xf86CrtcPtr	crtc = crtcs[o];

-

-	if (mode && crtc)

-	{

-	    crtc->desiredMode = *mode;

-	    crtc->desiredRotation = output->initial_rotation;

-	    crtc->desiredX = output->initial_x;

-	    crtc->desiredY = output->initial_y;

-	    crtc->desiredTransformPresent = FALSE;

-	    crtc->enabled = TRUE;

-	    memcpy (&crtc->panningTotalArea,    &output->initialTotalArea,    sizeof(BoxRec));

-	    memcpy (&crtc->panningTrackingArea, &output->initialTrackingArea, sizeof(BoxRec));

-	    memcpy (crtc->panningBorder,        output->initialBorder,        4*sizeof(INT16));

-	    output->crtc = crtc;

-	    if (!xf86OutputSetInitialGamma(output))

-		xf86DrvMsg (scrn->scrnIndex, X_WARNING, "Initial gamma correction for output %s: failed.\n", output->name);

-	} else {

-	    output->crtc = NULL;

-	}

-    }

-

-    if (scrn->display->virtualX == 0)

-    {

-	/*

-	 * Expand virtual size to cover the current config and potential mode

-	 * switches, if the driver can't enlarge the screen later.

-	 */

-	xf86DefaultScreenLimits (scrn, &width, &height, canGrow);

-    

-	if (have_outputs == FALSE) {

-	    if (width < NO_OUTPUT_DEFAULT_WIDTH && height < NO_OUTPUT_DEFAULT_HEIGHT) {

-		width = NO_OUTPUT_DEFAULT_WIDTH;

-		height = NO_OUTPUT_DEFAULT_HEIGHT;

-	    }

-	}

-

-	scrn->display->virtualX = width;

-	scrn->display->virtualY = height;

-    }

-

-    if (width > scrn->virtualX)

-	scrn->virtualX = width;

-    if (height > scrn->virtualY)

-	scrn->virtualY = height;

-

-    /*

-     * Make sure the configuration isn't too small.

-     */

-    if (width < config->minWidth || height < config->minHeight)

-	return FALSE;

-

-    /*

-     * Limit the crtc config to virtual[XY] if the driver can't grow the

-     * desktop.

-     */

-    if (!canGrow)

-    {

-	xf86CrtcSetSizeRange (scrn, config->minWidth, config->minHeight,

-			      width, height);

-    }

-

-    if (have_outputs) {

-	/* Mirror output modes to scrn mode list */

-	xf86SetScrnInfoModes (scrn);

-    } else {

-	/* Clear any existing modes from scrn->modes */

-	while (scrn->modes != NULL)

-	    xf86DeleteMode(&scrn->modes, scrn->modes);

-	scrn->modes = xf86ModesAdd(scrn->modes,

-				   xf86CVTMode(width, height, 60, 0, 0));

-    }

-

-    

-    free(crtcs);

-    free(modes);

-    return TRUE;

-}

-

-/*

- * Check the CRTC we're going to map each output to vs. it's current

- * CRTC.  If they don't match, we have to disable the output and the CRTC

- * since the driver will have to re-route things.

- */

-static void

-xf86PrepareOutputs (ScrnInfoPtr scrn)

-{

-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			o;

-

-    for (o = 0; o < config->num_output; o++) {

-	xf86OutputPtr output = config->output[o];

-#if RANDR_GET_CRTC_INTERFACE

-	/* Disable outputs that are unused or will be re-routed */

-	if (!output->funcs->get_crtc ||

-	    output->crtc != (*output->funcs->get_crtc)(output) ||

-	    output->crtc == NULL)

-#endif

-	    (*output->funcs->dpms)(output, DPMSModeOff);

-    }

-}

-

-static void

-xf86PrepareCrtcs (ScrnInfoPtr scrn)

-{

-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			c;

-

-    for (c = 0; c < config->num_crtc; c++) {

-#if RANDR_GET_CRTC_INTERFACE

-	xf86CrtcPtr	crtc = config->crtc[c];

-	xf86OutputPtr	output = NULL;

-	uint32_t	desired_outputs = 0, current_outputs = 0;

-	int		o;

-

-	for (o = 0; o < config->num_output; o++) {

-	    output = config->output[o];

-	    if (output->crtc == crtc)

-		desired_outputs |= (1<<o);

-	    /* If we can't tell where it's mapped, force it off */

-	    if (!output->funcs->get_crtc) {

-		desired_outputs = 0;

-		break;

-	    }

-	    if ((*output->funcs->get_crtc)(output) == crtc)

-		current_outputs |= (1<<o);

-	}

-

-	/*

-	 * If mappings are different or the CRTC is unused,

-	 * we need to disable it

-	 */

-	if (desired_outputs != current_outputs ||

-	    !desired_outputs)

-	    (*crtc->funcs->dpms)(crtc, DPMSModeOff);

-#else

-	(*crtc->funcs->dpms)(crtc, DPMSModeOff);

-#endif

-    }

-}

-

-/*

- * Using the desired mode information in each crtc, set

- * modes (used in EnterVT functions, or at server startup)

- */

-

-Bool

-xf86SetDesiredModes (ScrnInfoPtr scrn)

-{

-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(scrn);

-    xf86CrtcPtr         crtc = config->crtc[0];

-    int			c;

-

-    /* A driver with this hook will take care of this */

-    if (!crtc->funcs->set_mode_major) {

-	xf86PrepareOutputs(scrn);

-	xf86PrepareCrtcs(scrn);

-    }

-

-    for (c = 0; c < config->num_crtc; c++)

-    {

-	xf86OutputPtr	output = NULL;

-	xf86CrtcSetRec	set;

-	int		o;

-	RRTransformPtr	transform;

-

-	crtc = config->crtc[c];

-

-	/* Skip disabled CRTCs */

-	if (!crtc->enabled)

-	    continue;

-

-	if (xf86CompatOutput(scrn) && xf86CompatCrtc(scrn) == crtc)

-	    output = xf86CompatOutput(scrn);

-	else

-	{

-	    for (o = 0; o < config->num_output; o++)

-		if (config->output[o]->crtc == crtc)

-		{

-		    output = config->output[o];

-		    break;

-		}

-	}

-	/* paranoia */

-	if (!output)

-	    continue;

-

-	/* Mark that we'll need to re-set the mode for sure */

-	memset(&crtc->mode, 0, sizeof(crtc->mode));

-	if (!crtc->desiredMode.CrtcHDisplay)

-	{

-	    DisplayModePtr  mode = xf86OutputFindClosestMode (output, scrn->currentMode);

-

-	    if (!mode)

-		return FALSE;

-	    crtc->desiredMode = *mode;

-	    crtc->desiredRotation = RR_Rotate_0;

-	    crtc->desiredTransformPresent = FALSE;

-	    crtc->desiredX = 0;

-	    crtc->desiredY = 0;

-	}

-

-	if (crtc->desiredTransformPresent)

-	    transform = &crtc->desiredTransform;

-	else

-	    transform = NULL;

-	set.mode = &crtc->desiredMode;

-	set.rotation = crtc->desiredRotation;

-	set.transform = transform;

-	set.x = crtc->desiredX;

-	set.y = crtc->desiredY;

-	set.flags = (XF86CrtcSetMode | XF86CrtcSetOutput |

-		     XF86CrtcSetOrigin | XF86CrtcSetTransform |

-		     XF86CrtcSetRotation);

-	if (!xf86CrtcSet(crtc, &set))

-	    return FALSE;

-    }

-

-    xf86DisableUnusedFunctions(scrn);

-    return TRUE;

-}

-

-/**

- * In the current world order, there are lists of modes per output, which may

- * or may not include the mode that was asked to be set by XFree86's mode

- * selection.  Find the closest one, in the following preference order:

- *

- * - Equality

- * - Closer in size to the requested mode, but no larger

- * - Closer in refresh rate to the requested mode.

- */

-

-DisplayModePtr

-xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired)

-{

-    DisplayModePtr	best = NULL, scan = NULL;

-

-    for (scan = output->probed_modes; scan != NULL; scan = scan->next) 

-    {

-	/* If there's an exact match, we're done. */

-	if (xf86ModesEqual(scan, desired)) {

-	    best = desired;

-	    break;

-	}

-

-	/* Reject if it's larger than the desired mode. */

-	if (scan->HDisplay > desired->HDisplay || 

-	    scan->VDisplay > desired->VDisplay)

-	{

-	    continue;

-	}

-

-	/*

-	 * If we haven't picked a best mode yet, use the first

-	 * one in the size range

-	 */

-	if (best == NULL) 

-	{

-	    best = scan;

-	    continue;

-	}

-

-	/* Find if it's closer to the right size than the current best

-	 * option.

-	 */

-	if ((scan->HDisplay > best->HDisplay &&

-	     scan->VDisplay >= best->VDisplay) ||

-	    (scan->HDisplay >= best->HDisplay &&

-	     scan->VDisplay > best->VDisplay))

-	{

-	    best = scan;

-	    continue;

-	}

-

-	/* Find if it's still closer to the right refresh than the current

-	 * best resolution.

-	 */

-	if (scan->HDisplay == best->HDisplay &&

-	    scan->VDisplay == best->VDisplay &&

-	    (fabs(scan->VRefresh - desired->VRefresh) <

-	     fabs(best->VRefresh - desired->VRefresh))) {

-	    best = scan;

-	}

-    }

-    return best;

-}

-

-/**

- * When setting a mode through XFree86-VidModeExtension or XFree86-DGA,

- * take the specified mode and apply it to the crtc connected to the compat

- * output. Then, find similar modes for the other outputs, as with the

- * InitialConfiguration code above. The goal is to clone the desired

- * mode across all outputs that are currently active.

- */

-

-Bool

-xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)

-{

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(pScrn);

-    Bool		ok = TRUE;

-    xf86OutputPtr	compat_output;

-    DisplayModePtr	compat_mode = NULL;

-    int			c;

-

-    /*

-     * Let the compat output drive the final mode selection

-     */

-    compat_output = xf86CompatOutput(pScrn);

-    if (compat_output)

-	compat_mode = xf86OutputFindClosestMode (compat_output, desired);

-    if (compat_mode)

-	desired = compat_mode;

-    

-    for (c = 0; c < config->num_crtc; c++)

-    {

-	xf86CrtcPtr	crtc = config->crtc[c];

-	DisplayModePtr	crtc_mode = NULL;

-	int		o;

-	xf86CrtcSetRec	set;

-

-	if (!crtc->enabled)

-	    continue;

-	

-	for (o = 0; o < config->num_output; o++)

-	{

-	    xf86OutputPtr   output = config->output[o];

-	    DisplayModePtr  output_mode;

-

-	    /* skip outputs not on this crtc */

-	    if (output->crtc != crtc)

-		continue;

-	    

-	    if (crtc_mode)

-	    {

-		output_mode = xf86OutputFindClosestMode (output, crtc_mode);

-		if (output_mode != crtc_mode)

-		    output->crtc = NULL;

-	    }

-	    else

-		crtc_mode = xf86OutputFindClosestMode (output, desired);

-	}

-	if (!crtc_mode)

-	{

-	    crtc->enabled = FALSE;

-	    continue;

-	}

-	set.mode = crtc_mode;

-	set.rotation = rotation;

-	set.transform = NULL;

-	set.x = 0;

-	set.y = 0;

-	set.flags = (XF86CrtcSetMode | XF86CrtcSetOutput |

-		     XF86CrtcSetOrigin | XF86CrtcSetTransform |

-		     XF86CrtcSetRotation);

-	if (!xf86CrtcSet (crtc, &set))

-	    ok = FALSE;

-	else

-	{

-	    crtc->desiredMode = *crtc_mode;

-	    crtc->desiredRotation = rotation;

-	    crtc->desiredTransformPresent = FALSE;

-	    crtc->desiredX = 0;

-	    crtc->desiredY = 0;

-	}

-    }

-    xf86DisableUnusedFunctions(pScrn);

-#ifdef RANDR_12_INTERFACE

-    xf86RandR12TellChanged (pScrn->pScreen);

-#endif

-    return ok;

-}

-

-

-/**

- * Set the DPMS power mode of all outputs and CRTCs.

- *

- * If the new mode is off, it will turn off outputs and then CRTCs.

- * Otherwise, it will affect CRTCs before outputs.

- */

-void

-xf86DPMSSet(ScrnInfoPtr scrn, int mode, int flags)

-{

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			i;

-

-    if (!scrn->vtSema)

-	return;

-

-    if (mode == DPMSModeOff) {

-	for (i = 0; i < config->num_output; i++) {

-	    xf86OutputPtr output = config->output[i];

-	    if (output->crtc != NULL)

-		(*output->funcs->dpms) (output, mode);

-	}

-    }

-

-    for (i = 0; i < config->num_crtc; i++) {

-	xf86CrtcPtr crtc = config->crtc[i];

-	if (crtc->enabled)

-	    (*crtc->funcs->dpms) (crtc, mode);

-    }

-

-    if (mode != DPMSModeOff) {

-	for (i = 0; i < config->num_output; i++) {

-	    xf86OutputPtr output = config->output[i];

-	    if (output->crtc != NULL)

-		(*output->funcs->dpms) (output, mode);

-	}

-    }

-}

-

-/**

- * Implement the screensaver by just calling down into the driver DPMS hooks.

- *

- * Even for monitors with no DPMS support, by the definition of our DPMS hooks,

- * the outputs will still get disabled (blanked).

- */

-Bool

-xf86SaveScreen(ScreenPtr pScreen, int mode)

-{

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

-

-    if (xf86IsUnblank(mode))

-	xf86DPMSSet(pScrn, DPMSModeOn, 0);

-    else

-	xf86DPMSSet(pScrn, DPMSModeOff, 0);

-

-    return TRUE;

-}

-

-/**

- * Disable all inactive crtcs and outputs

- */

-void

-xf86DisableUnusedFunctions(ScrnInfoPtr pScrn)

-{

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);

-    int			o, c;

-

-    for (o = 0; o < xf86_config->num_output; o++) 

-    {

-	xf86OutputPtr  output = xf86_config->output[o];

-	if (!output->crtc) 

-	    (*output->funcs->dpms)(output, DPMSModeOff);

-    }

-

-    for (c = 0; c < xf86_config->num_crtc; c++) 

-    {

-	xf86CrtcPtr crtc = xf86_config->crtc[c];

-

-	if (!crtc->enabled) 

-	{

-	    crtc->funcs->dpms(crtc, DPMSModeOff);

-	    memset(&crtc->mode, 0, sizeof(crtc->mode));

-	    xf86RotateDestroy(crtc);

-	    crtc->active = FALSE;

-	}

-    }

-    if (pScrn->pScreen)

-	xf86_crtc_notify(pScrn->pScreen);

-    if (pScrn->ModeSet)

-	pScrn->ModeSet(pScrn);

-}

-

-#ifdef RANDR_12_INTERFACE

-

-#define EDID_ATOM_NAME		"EDID"

-

-/**

- * Set the RandR EDID property

- */

-static void

-xf86OutputSetEDIDProperty (xf86OutputPtr output, void *data, int data_len)

-{

-    Atom edid_atom = MakeAtom(EDID_ATOM_NAME, sizeof(EDID_ATOM_NAME) - 1, TRUE);

-

-    /* This may get called before the RandR resources have been created */

-    if (output->randr_output == NULL)

-	return;

-

-    if (data_len != 0) {

-	RRChangeOutputProperty(output->randr_output, edid_atom, XA_INTEGER, 8,

-			       PropModeReplace, data_len, data, FALSE, TRUE);

-    } else {

-	RRDeleteOutputProperty(output->randr_output, edid_atom);

-    }

-}

-

-#endif

-

-/* Pull out a phyiscal size from a detailed timing if available. */

-struct det_phySize_parameter {

-    xf86OutputPtr output;

-    ddc_quirk_t quirks;

-    Bool ret;

-};

-

-static void  handle_detailed_physical_size(struct detailed_monitor_section

-		                          *det_mon, void *data)

-{

-    struct det_phySize_parameter *p;

-    p = (struct det_phySize_parameter *)data;

-

-    if (p->ret == TRUE )

-        return ;

-

-    xf86DetTimingApplyQuirks(det_mon, p->quirks,

-                             p->output->MonInfo->features.hsize,

-                             p->output->MonInfo->features.vsize);

-    if (det_mon->type == DT &&

-        det_mon->section.d_timings.h_size != 0 &&

-        det_mon->section.d_timings.v_size != 0) {

-

-        p->output->mm_width = det_mon->section.d_timings.h_size;

-        p->output->mm_height = det_mon->section.d_timings.v_size;

-        p->ret = TRUE;

-    }

-}

-

-/**

- * Set the EDID information for the specified output

- */

-void

-xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)

-{

-    ScrnInfoPtr		scrn = output->scrn;

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    Bool		debug_modes = config->debug_modes || xf86Initialising;

-#ifdef RANDR_12_INTERFACE

-    int			size;

-#endif

-    

-    free(output->MonInfo);

-    

-    output->MonInfo = edid_mon;

-    output->mm_width = 0;

-    output->mm_height = 0;

-

-    if (debug_modes) {

-	xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n",

-		   output->name);

-	xf86PrintEDID(edid_mon);

-    }

-

-    /* Set the DDC properties for the 'compat' output */

-    if (output == xf86CompatOutput(scrn))

-        xf86SetDDCproperties(scrn, edid_mon);

-

-#ifdef RANDR_12_INTERFACE

-    /* Set the RandR output properties */

-    size = 0;

-    if (edid_mon)

-    {

-	if (edid_mon->ver.version == 1) {

-	    size = 128;

-	    if (edid_mon->flags & EDID_COMPLETE_RAWDATA)

-		size += edid_mon->no_sections * 128;

-	} else if (edid_mon->ver.version == 2)

-	    size = 256;

-    }

-    xf86OutputSetEDIDProperty (output, edid_mon ? edid_mon->rawData : NULL, size);

-#endif

-

-    if (edid_mon) {

-

-        struct det_phySize_parameter p;

-        p.output = output;

-        p.quirks = xf86DDCDetectQuirks(scrn->scrnIndex,edid_mon, FALSE);

-        p.ret = FALSE;

-        xf86ForEachDetailedBlock(edid_mon,

-                                 handle_detailed_physical_size, &p);

-

-	/* if no mm size is available from a detailed timing, check the max size field */

-	if ((!output->mm_width || !output->mm_height) &&

-	    (edid_mon->features.hsize && edid_mon->features.vsize))

-	{

-	    output->mm_width = edid_mon->features.hsize * 10;

-	    output->mm_height = edid_mon->features.vsize * 10;

-	}

-    }

-}

-

-/**

- * Return the list of modes supported by the EDID information

- * stored in 'output'

- */

-DisplayModePtr

-xf86OutputGetEDIDModes (xf86OutputPtr output)

-{

-    ScrnInfoPtr	scrn = output->scrn;

-    xf86MonPtr	edid_mon = output->MonInfo;

-

-    if (!edid_mon)

-	return NULL;

-    return xf86DDCGetModes(scrn->scrnIndex, edid_mon);

-}

-

-/* maybe we should care about DDC1?  meh. */

-xf86MonPtr

-xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)

-{

-    ScrnInfoPtr	scrn = output->scrn;

-    xf86MonPtr mon;

-

-    mon = xf86DoEEDID(scrn->scrnIndex, pDDCBus, TRUE);

-    if (mon)

-        xf86DDCApplyQuirks(scrn->scrnIndex, mon);

-

-    return mon;

-}

-

-static char *_xf86ConnectorNames[] = {

-					"None", "VGA", "DVI-I", "DVI-D",

-					"DVI-A", "Composite", "S-Video",

-					"Component", "LFP", "Proprietary",

-					"HDMI", "DisplayPort",

-				     };

-char *

-xf86ConnectorGetName(xf86ConnectorType connector)

-{

-    return _xf86ConnectorNames[connector];

-}

-

-static void

-x86_crtc_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b)

-{

-    dest->x1 = a->x1 > b->x1 ? a->x1 : b->x1;

-    dest->x2 = a->x2 < b->x2 ? a->x2 : b->x2;

-    dest->y1 = a->y1 > b->y1 ? a->y1 : b->y1;

-    dest->y2 = a->y2 < b->y2 ? a->y2 : b->y2;

-

-    if (dest->x1 >= dest->x2 || dest->y1 >= dest->y2)

-	dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0;

-}

-

-static void

-x86_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box)

-{

-    if (crtc->enabled) {

-	crtc_box->x1 = crtc->x;

-	crtc_box->x2 = crtc->x + xf86ModeWidth(&crtc->mode, crtc->rotation);

-	crtc_box->y1 = crtc->y;

-	crtc_box->y2 = crtc->y + xf86ModeHeight(&crtc->mode, crtc->rotation);

-    } else

-	crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0;

-}

-

-static int

-xf86_crtc_box_area(BoxPtr box)

-{

-    return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);

-}

-

-/*

- * Return the crtc covering 'box'. If two crtcs cover a portion of

- * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc

- * with greater coverage

- */

-

-static xf86CrtcPtr

-xf86_covering_crtc(ScrnInfoPtr pScrn,

-		   BoxPtr      box,

-		   xf86CrtcPtr desired,

-		   BoxPtr      crtc_box_ret)

-{

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);

-    xf86CrtcPtr		crtc, best_crtc;

-    int			coverage, best_coverage;

-    int			c;

-    BoxRec		crtc_box, cover_box;

-

-    best_crtc = NULL;

-    best_coverage = 0;

-    crtc_box_ret->x1 = 0;

-    crtc_box_ret->x2 = 0;

-    crtc_box_ret->y1 = 0;

-    crtc_box_ret->y2 = 0;

-    for (c = 0; c < xf86_config->num_crtc; c++) {

-	crtc = xf86_config->crtc[c];

-	x86_crtc_box(crtc, &crtc_box);

-	x86_crtc_box_intersect(&cover_box, &crtc_box, box);

-	coverage = xf86_crtc_box_area(&cover_box);

-	if (coverage && crtc == desired) {

-	    *crtc_box_ret = crtc_box;

-	    return crtc;

-	} else if (coverage > best_coverage) {

-	    *crtc_box_ret = crtc_box;

-	    best_crtc = crtc;

-	    best_coverage = coverage;

-	}

-    }

-    return best_crtc;

-}

-

-/*

- * For overlay video, compute the relevant CRTC and

- * clip video to that.

- *

- * returning FALSE means there was a memory failure of some kind,

- * not that the video shouldn't be displayed

- */

-

-Bool

-xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,

-			    xf86CrtcPtr *crtc_ret,

-			    xf86CrtcPtr desired_crtc,

-			    BoxPtr      dst,

-			    INT32	*xa,

-			    INT32	*xb,

-			    INT32	*ya,

-			    INT32	*yb,

-			    RegionPtr   reg,

-			    INT32	width,

-			    INT32	height)

-{

-    Bool	ret;

-    RegionRec	crtc_region_local;

-    RegionPtr	crtc_region = reg;

-    

-    if (crtc_ret) {

-	BoxRec		crtc_box;

-	xf86CrtcPtr	crtc = xf86_covering_crtc(pScrn, dst,

-						  desired_crtc,

-						  &crtc_box);

-

-	if (crtc) {

-	    RegionInit(&crtc_region_local, &crtc_box, 1);

-	    crtc_region = &crtc_region_local;

-	    RegionIntersect(crtc_region, crtc_region, reg);

-	}

-	*crtc_ret = crtc;

-    }

-

-    ret = xf86XVClipVideoHelper(dst, xa, xb, ya, yb, 

-				crtc_region, width, height);

-

-    if (crtc_region != reg)

-	RegionUninit(&crtc_region_local);

-

-    return ret;

-}

-

-xf86_crtc_notify_proc_ptr

-xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)

-{

-    if (xf86CrtcConfigPrivateIndex != -1)

-    {

-	ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-	xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-	xf86_crtc_notify_proc_ptr	old;

-	

-	old = config->xf86_crtc_notify;

-	config->xf86_crtc_notify = new;

-	return old;

-    }

-    return NULL;

-}

-

-void

-xf86_unwrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr old)

-{

-    if (xf86CrtcConfigPrivateIndex != -1)

-    {

-	ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-	xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    

-	config->xf86_crtc_notify = old;

-    }

-}

-

-void

-xf86_crtc_notify(ScreenPtr screen)

-{

-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    

-    if (config->xf86_crtc_notify)

-	config->xf86_crtc_notify(screen);

-}

-

-Bool

-xf86_crtc_supports_gamma(ScrnInfoPtr pScrn)

-{

-    if (xf86CrtcConfigPrivateIndex != -1) {

-	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);

-	xf86CrtcPtr crtc;

-

-	/* for multiple drivers loaded we need this */

-	if (!xf86_config)

-		return FALSE;

-	if (xf86_config->num_crtc == 0)

-	    return FALSE;

-	crtc = xf86_config->crtc[0];

-

-	return crtc->funcs->gamma_set != NULL;

-    }

-

-    return FALSE;

-}

+/*
+ * Copyright © 2006 Keith Packard
+ * Copyright © 2008 Red Hat, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#else
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#endif
+
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "xf86.h"
+#include "xf86DDC.h"
+#include "xf86Crtc.h"
+#include "xf86Modes.h"
+#include "xf86Priv.h"
+#include "xf86RandR12.h"
+#include "X11/extensions/render.h"
+#include "X11/extensions/dpmsconst.h"
+#include "X11/Xatom.h"
+#include "picturestr.h"
+
+#include "xf86xv.h"
+
+#define NO_OUTPUT_DEFAULT_WIDTH 1024
+#define NO_OUTPUT_DEFAULT_HEIGHT 768
+/*
+ * Initialize xf86CrtcConfig structure
+ */
+
+int xf86CrtcConfigPrivateIndex = -1;
+
+void
+xf86CrtcConfigInit (ScrnInfoPtr scrn,
+		    const xf86CrtcConfigFuncsRec *funcs)
+{
+    xf86CrtcConfigPtr	config;
+    
+    if (xf86CrtcConfigPrivateIndex == -1)
+	xf86CrtcConfigPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
+    config = xnfcalloc (1, sizeof (xf86CrtcConfigRec));
+
+    config->funcs = funcs;
+
+    scrn->privates[xf86CrtcConfigPrivateIndex].ptr = config;
+}
+ 
+void
+xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
+		      int minWidth, int minHeight,
+		      int maxWidth, int maxHeight)
+{
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+
+    config->minWidth = minWidth;
+    config->minHeight = minHeight;
+    config->maxWidth = maxWidth;
+    config->maxHeight = maxHeight;
+}
+
+/*
+ * Crtc functions
+ */
+xf86CrtcPtr
+xf86CrtcCreate (ScrnInfoPtr		scrn,
+		const xf86CrtcFuncsRec	*funcs)
+{
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CrtcPtr		crtc, *crtcs;
+
+    crtc = calloc(sizeof (xf86CrtcRec), 1);
+    if (!crtc)
+	return NULL;
+    crtc->version = XF86_CRTC_VERSION;
+    crtc->scrn = scrn;
+    crtc->funcs = funcs;
+#ifdef RANDR_12_INTERFACE
+    crtc->randr_crtc = NULL;
+#endif
+    crtc->rotation = RR_Rotate_0;
+    crtc->desiredRotation = RR_Rotate_0;
+    pixman_transform_init_identity (&crtc->crtc_to_framebuffer);
+    pixman_f_transform_init_identity (&crtc->f_crtc_to_framebuffer);
+    pixman_f_transform_init_identity (&crtc->f_framebuffer_to_crtc);
+    crtc->filter = NULL;
+    crtc->params = NULL;
+    crtc->nparams = 0;
+    crtc->filter_width = 0;
+    crtc->filter_height = 0;
+    crtc->transform_in_use = FALSE;
+    crtc->transformPresent = FALSE;
+    crtc->desiredTransformPresent = FALSE;
+    memset (&crtc->bounds, '\0', sizeof (crtc->bounds));
+
+    /* Preallocate gamma at a sensible size. */
+    crtc->gamma_size = 256;
+    crtc->gamma_red = malloc(3 * crtc->gamma_size * sizeof (CARD16));
+    if (!crtc->gamma_red) {
+	free(crtc);
+	return NULL;
+    }
+    crtc->gamma_green = crtc->gamma_red + crtc->gamma_size;
+    crtc->gamma_blue = crtc->gamma_green + crtc->gamma_size;
+
+    if (xf86_config->crtc)
+	crtcs = realloc(xf86_config->crtc,
+			  (xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr));
+    else
+	crtcs = malloc((xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr));
+    if (!crtcs)
+    {
+	free(crtc);
+	return NULL;
+    }
+    xf86_config->crtc = crtcs;
+    xf86_config->crtc[xf86_config->num_crtc++] = crtc;
+    return crtc;
+}
+
+void
+xf86CrtcDestroy (xf86CrtcPtr crtc)
+{
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
+    int			c;
+    
+    (*crtc->funcs->destroy) (crtc);
+    for (c = 0; c < xf86_config->num_crtc; c++)
+	if (xf86_config->crtc[c] == crtc)
+	{
+	    memmove (&xf86_config->crtc[c],
+		     &xf86_config->crtc[c+1],
+		     ((xf86_config->num_crtc - (c + 1)) * sizeof(void*)));
+	    xf86_config->num_crtc--;
+	    break;
+	}
+    free(crtc->params);
+    free(crtc->gamma_red);
+    free(crtc);
+}
+
+
+/**
+ * Return whether any outputs are connected to the specified pipe
+ */
+
+Bool
+xf86CrtcInUse (xf86CrtcPtr crtc)
+{
+    ScrnInfoPtr		pScrn = crtc->scrn;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int			o;
+    
+    for (o = 0; o < xf86_config->num_output; o++)
+	if (xf86_config->output[o]->crtc == crtc)
+	    return TRUE;
+    return FALSE;
+}
+
+void
+xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
+{
+    int			subpixel_order = SubPixelUnknown;
+    Bool		has_none = FALSE;
+    ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			c, o;
+
+    for (c = 0; c < xf86_config->num_crtc; c++)
+    {
+	xf86CrtcPtr crtc = xf86_config->crtc[c];
+	
+	for (o = 0; o < xf86_config->num_output; o++)
+	{
+	    xf86OutputPtr   output = xf86_config->output[o];
+
+	    if (output->crtc == crtc)
+	    {
+		switch (output->subpixel_order) {
+		case SubPixelNone:
+		    has_none = TRUE;
+		    break;
+		case SubPixelUnknown:
+		    break;
+		default:
+		    subpixel_order = output->subpixel_order;
+		    break;
+		}
+	    }
+	    if (subpixel_order != SubPixelUnknown)
+		break;
+	}
+	if (subpixel_order != SubPixelUnknown)
+	{
+	    static const int circle[4] = {
+		SubPixelHorizontalRGB,
+		SubPixelVerticalRGB,
+		SubPixelHorizontalBGR,
+		SubPixelVerticalBGR,
+	    };
+	    int	rotate;
+	    int c;
+	    for (rotate = 0; rotate < 4; rotate++)
+		if (crtc->rotation & (1 << rotate))
+		    break;
+	    for (c = 0; c < 4; c++)
+		if (circle[c] == subpixel_order)
+		    break;
+	    c = (c + rotate) & 0x3;
+	    if ((crtc->rotation & RR_Reflect_X) && !(c & 1))
+		c ^= 2;
+	    if ((crtc->rotation & RR_Reflect_Y) && (c & 1))
+		c ^= 2;
+	    subpixel_order = circle[c];
+	    break;
+	}
+    }
+    if (subpixel_order == SubPixelUnknown && has_none)
+	subpixel_order = SubPixelNone;
+    PictureSetSubpixelOrder (pScreen, subpixel_order);
+}
+
+/**
+ * Sets the given video mode on the given crtc
+ */
+Bool
+xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
+			  RRTransformPtr transform, int x, int y)
+{
+    ScrnInfoPtr		scrn = crtc->scrn;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			i;
+    Bool		ret = FALSE;
+    Bool		didLock = FALSE;
+    DisplayModePtr	adjusted_mode;
+    DisplayModeRec	saved_mode;
+    int			saved_x, saved_y;
+    Rotation		saved_rotation;
+    RRTransformRec	saved_transform;
+    Bool		saved_transform_present;
+
+    crtc->enabled = xf86CrtcInUse (crtc);
+
+    /* We only hit this if someone explicitly sends a "disabled" modeset. */
+    if (!crtc->enabled)
+    {
+	/* Check everything for stuff that should be off. */
+	xf86DisableUnusedFunctions(scrn);
+	return TRUE;
+    }
+
+    adjusted_mode = xf86DuplicateMode(mode);
+
+
+    saved_mode = crtc->mode;
+    saved_x = crtc->x;
+    saved_y = crtc->y;
+    saved_rotation = crtc->rotation;
+    if (crtc->transformPresent) {
+	RRTransformInit (&saved_transform);
+	RRTransformCopy (&saved_transform, &crtc->transform);
+    }
+    saved_transform_present = crtc->transformPresent;
+
+    /* Update crtc values up front so the driver can rely on them for mode
+     * setting.
+     */
+    crtc->mode = *mode;
+    crtc->x = x;
+    crtc->y = y;
+    crtc->rotation = rotation;
+    if (transform) {
+	RRTransformCopy (&crtc->transform, transform);
+	crtc->transformPresent = TRUE;
+    } else
+	crtc->transformPresent = FALSE;
+
+    if (crtc->funcs->set_mode_major) {
+	ret = crtc->funcs->set_mode_major(crtc, mode, rotation, x, y);
+	goto done;
+    }
+
+    didLock = crtc->funcs->lock (crtc);
+    /* Pass our mode to the outputs and the CRTC to give them a chance to
+     * adjust it according to limitations or output properties, and also
+     * a chance to reject the mode entirely.
+     */
+    for (i = 0; i < xf86_config->num_output; i++) {
+	xf86OutputPtr output = xf86_config->output[i];
+
+	if (output->crtc != crtc)
+	    continue;
+
+	if (!output->funcs->mode_fixup(output, mode, adjusted_mode)) {
+	    goto done;
+	}
+    }
+
+    if (!crtc->funcs->mode_fixup(crtc, mode, adjusted_mode)) {
+	goto done;
+    }
+
+    if (!xf86CrtcRotate (crtc))
+	goto done;
+
+    /* Prepare the outputs and CRTCs before setting the mode. */
+    for (i = 0; i < xf86_config->num_output; i++) {
+	xf86OutputPtr output = xf86_config->output[i];
+
+	if (output->crtc != crtc)
+	    continue;
+
+	/* Disable the output as the first thing we do. */
+	output->funcs->prepare(output);
+    }
+
+    crtc->funcs->prepare(crtc);
+
+    /* Set up the DPLL and any output state that needs to adjust or depend
+     * on the DPLL.
+     */
+    crtc->funcs->mode_set(crtc, mode, adjusted_mode, crtc->x, crtc->y);
+    for (i = 0; i < xf86_config->num_output; i++) 
+    {
+	xf86OutputPtr output = xf86_config->output[i];
+	if (output->crtc == crtc)
+	    output->funcs->mode_set(output, mode, adjusted_mode);
+    }
+
+    /* Only upload when needed, to avoid unneeded delays. */
+    if (!crtc->active && crtc->funcs->gamma_set)
+	crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
+                                            crtc->gamma_blue, crtc->gamma_size);
+
+    /* Now, enable the clocks, plane, pipe, and outputs that we set up. */
+    crtc->funcs->commit(crtc);
+    for (i = 0; i < xf86_config->num_output; i++) 
+    {
+	xf86OutputPtr output = xf86_config->output[i];
+	if (output->crtc == crtc)
+	    output->funcs->commit(output);
+    }
+
+    ret = TRUE;
+
+done:
+    if (ret) {
+	crtc->active = TRUE;
+	if (scrn->pScreen)
+	    xf86CrtcSetScreenSubpixelOrder (scrn->pScreen);
+	if (scrn->ModeSet)
+	    scrn->ModeSet(scrn);
+    } else {
+	crtc->x = saved_x;
+	crtc->y = saved_y;
+	crtc->rotation = saved_rotation;
+	crtc->mode = saved_mode;
+	if (saved_transform_present)
+	    RRTransformCopy (&crtc->transform, &saved_transform);
+	crtc->transformPresent = saved_transform_present;
+    }
+
+    free(adjusted_mode->name);
+    free(adjusted_mode);
+
+    if (didLock)
+	crtc->funcs->unlock (crtc);
+
+    return ret;
+}
+
+/**
+ * Sets the given video mode on the given crtc, but without providing
+ * a transform
+ */
+Bool
+xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
+		 int x, int y)
+{
+    return xf86CrtcSetModeTransform (crtc, mode, rotation, NULL, x, y);
+}
+
+/**
+ * Pans the screen, does not change the mode
+ */
+void
+xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y)
+{
+    ScrnInfoPtr scrn = crtc->scrn;
+
+    crtc->x = x;
+    crtc->y = y;
+    if (crtc->funcs->set_origin) {
+	if (!xf86CrtcRotate (crtc))
+	    return;
+	crtc->funcs->set_origin (crtc, x, y);
+	if (scrn->ModeSet)
+	    scrn->ModeSet(scrn);
+    }
+    else
+	xf86CrtcSetMode (crtc, &crtc->mode, crtc->rotation, x, y);
+}
+
+/*
+ * Output functions
+ */
+
+extern XF86ConfigPtr xf86configptr;
+
+typedef enum {
+    OPTION_PREFERRED_MODE,
+    OPTION_POSITION,
+    OPTION_BELOW,
+    OPTION_RIGHT_OF,
+    OPTION_ABOVE,
+    OPTION_LEFT_OF,
+    OPTION_ENABLE,
+    OPTION_DISABLE,
+    OPTION_MIN_CLOCK,
+    OPTION_MAX_CLOCK,
+    OPTION_IGNORE,
+    OPTION_ROTATE,
+    OPTION_PANNING,
+    OPTION_PRIMARY,
+    OPTION_DEFAULT_MODES,
+} OutputOpts;
+
+static OptionInfoRec xf86OutputOptions[] = {
+    {OPTION_PREFERRED_MODE, "PreferredMode",	OPTV_STRING,  {0}, FALSE },
+    {OPTION_POSITION,	    "Position",		OPTV_STRING,  {0}, FALSE },
+    {OPTION_BELOW,	    "Below",		OPTV_STRING,  {0}, FALSE },
+    {OPTION_RIGHT_OF,	    "RightOf",		OPTV_STRING,  {0}, FALSE },
+    {OPTION_ABOVE,	    "Above",		OPTV_STRING,  {0}, FALSE },
+    {OPTION_LEFT_OF,	    "LeftOf",		OPTV_STRING,  {0}, FALSE },
+    {OPTION_ENABLE,	    "Enable",		OPTV_BOOLEAN, {0}, FALSE },
+    {OPTION_DISABLE,	    "Disable",		OPTV_BOOLEAN, {0}, FALSE },
+    {OPTION_MIN_CLOCK,	    "MinClock",		OPTV_FREQ,    {0}, FALSE },
+    {OPTION_MAX_CLOCK,	    "MaxClock",		OPTV_FREQ,    {0}, FALSE },
+    {OPTION_IGNORE,	    "Ignore",		OPTV_BOOLEAN, {0}, FALSE },
+    {OPTION_ROTATE,	    "Rotate",		OPTV_STRING,  {0}, FALSE },
+    {OPTION_PANNING,	    "Panning",		OPTV_STRING,  {0}, FALSE },
+    {OPTION_PRIMARY,	    "Primary",		OPTV_BOOLEAN, {0}, FALSE },
+    {OPTION_DEFAULT_MODES,  "DefaultModes",	OPTV_BOOLEAN, {0}, FALSE },
+    {-1,		    NULL,		OPTV_NONE,    {0}, FALSE },
+};
+
+enum {
+    OPTION_MODEDEBUG,
+};
+
+static OptionInfoRec xf86DeviceOptions[] = {
+    {OPTION_MODEDEBUG,	    "ModeDebug",	OPTV_BOOLEAN,  {0}, FALSE },
+    {-1,		    NULL,		OPTV_NONE,    {0}, FALSE },
+};
+
+static void
+xf86OutputSetMonitor (xf86OutputPtr output)
+{
+    char    *option_name;
+    char    *monitor;
+
+    if (!output->name)
+	return;
+
+    free(output->options);
+
+    output->options = xnfalloc (sizeof (xf86OutputOptions));
+    memcpy (output->options, xf86OutputOptions, sizeof (xf86OutputOptions));
+
+    XNFasprintf(&option_name, "monitor-%s", output->name);
+    monitor = xf86findOptionValue (output->scrn->options, option_name);
+    if (!monitor)
+	monitor = output->name;
+    else
+	xf86MarkOptionUsedByName (output->scrn->options, option_name);
+    free(option_name);
+    output->conf_monitor = xf86findMonitor (monitor,
+					    xf86configptr->conf_monitor_lst);
+    /*
+     * Find the monitor section of the screen and use that
+     */
+    if (!output->conf_monitor && output->use_screen_monitor)
+	output->conf_monitor = xf86findMonitor (output->scrn->monitor->id,
+						xf86configptr->conf_monitor_lst);
+    if (output->conf_monitor)
+    {
+	xf86DrvMsg (output->scrn->scrnIndex, X_INFO,
+		    "Output %s using monitor section %s\n",
+		    output->name, output->conf_monitor->mon_identifier);
+	xf86ProcessOptions (output->scrn->scrnIndex,
+			    output->conf_monitor->mon_option_lst,
+			    output->options);
+    }
+    else
+	xf86DrvMsg (output->scrn->scrnIndex, X_INFO,
+		    "Output %s has no monitor section\n",
+		    output->name);
+}
+
+static Bool
+xf86OutputEnabled (xf86OutputPtr output, Bool strict)
+{
+    Bool    enable, disable;
+
+    /* check to see if this output was enabled in the config file */
+    if (xf86GetOptValBool (output->options, OPTION_ENABLE, &enable) && enable)
+    {
+	xf86DrvMsg (output->scrn->scrnIndex, X_INFO,
+		    "Output %s enabled by config file\n", output->name);
+	return TRUE;
+    }
+    /* or if this output was disabled in the config file */
+    if (xf86GetOptValBool (output->options, OPTION_DISABLE, &disable) && disable)
+    {
+	xf86DrvMsg (output->scrn->scrnIndex, X_INFO,
+		    "Output %s disabled by config file\n", output->name);
+	return FALSE;
+    }
+
+    /* If not, try to only light up the ones we know are connected */
+    if (strict) {
+	enable = output->status == XF86OutputStatusConnected;
+    }
+    /* But if that fails, try to light up even outputs we're unsure of */
+    else {
+	enable = output->status != XF86OutputStatusDisconnected;
+    }
+
+    xf86DrvMsg (output->scrn->scrnIndex, X_INFO,
+    	    "Output %s %sconnected\n", output->name, enable ? "" : "dis");
+    return enable;
+}
+
+static Bool
+xf86OutputIgnored (xf86OutputPtr    output)
+{
+    return xf86ReturnOptValBool (output->options, OPTION_IGNORE, FALSE);
+}
+
+static char *direction[4] = {
+    "normal", 
+    "left", 
+    "inverted", 
+    "right"
+};
+
+static Rotation
+xf86OutputInitialRotation (xf86OutputPtr output)
+{
+    char    *rotate_name = xf86GetOptValString (output->options, 
+						OPTION_ROTATE);
+    int	    i;
+
+    if (!rotate_name) {
+	if (output->initial_rotation)
+	    return output->initial_rotation;
+	return RR_Rotate_0;
+    }
+    
+    for (i = 0; i < 4; i++)
+	if (xf86nameCompare (direction[i], rotate_name) == 0)
+	    return 1 << i;
+    return RR_Rotate_0;
+}
+
+xf86OutputPtr
+xf86OutputCreate (ScrnInfoPtr		    scrn,
+		  const xf86OutputFuncsRec  *funcs,
+		  const char		    *name)
+{
+    xf86OutputPtr	output, *outputs;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			len;
+    Bool		primary;
+
+    if (name)
+	len = strlen (name) + 1;
+    else
+	len = 0;
+
+    output = calloc(sizeof (xf86OutputRec) + len, 1);
+    if (!output)
+	return NULL;
+    output->scrn = scrn;
+    output->funcs = funcs;
+    if (name)
+    {
+	output->name = (char *) (output + 1);
+	strcpy (output->name, name);
+    }
+    output->subpixel_order = SubPixelUnknown;
+    /*
+     * Use the old per-screen monitor section for the first output
+     */
+    output->use_screen_monitor = (xf86_config->num_output == 0);
+#ifdef RANDR_12_INTERFACE
+    output->randr_output = NULL;
+#endif
+    if (name)
+    {
+	xf86OutputSetMonitor (output);
+	if (xf86OutputIgnored (output))
+	{
+	    free(output);
+	    return FALSE;
+	}
+    }
+    
+    
+    if (xf86_config->output)
+	outputs = realloc(xf86_config->output,
+			  (xf86_config->num_output + 1) * sizeof (xf86OutputPtr));
+    else
+	outputs = malloc((xf86_config->num_output + 1) * sizeof (xf86OutputPtr));
+    if (!outputs)
+    {
+	free(output);
+	return NULL;
+    }
+
+    xf86_config->output = outputs;
+
+    if (xf86GetOptValBool (output->options, OPTION_PRIMARY, &primary) && primary)
+    {
+	memmove(xf86_config->output + 1, xf86_config->output,
+		xf86_config->num_output * sizeof (xf86OutputPtr));
+	xf86_config->output[0] = output;
+    }
+    else
+    {
+	xf86_config->output[xf86_config->num_output] = output;
+    }
+
+    xf86_config->num_output++;
+
+    return output;
+}
+
+Bool
+xf86OutputRename (xf86OutputPtr output, const char *name)
+{
+    char    *newname = strdup(name);
+    
+    if (!newname)
+	return FALSE;	/* so sorry... */
+    
+    if (output->name && output->name != (char *) (output + 1))
+	free(output->name);
+    output->name = newname;
+    xf86OutputSetMonitor (output);
+    if (xf86OutputIgnored (output))
+	return FALSE;
+    return TRUE;
+}
+
+void
+xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor)
+{
+    if (use_screen_monitor != output->use_screen_monitor)
+    {
+	output->use_screen_monitor = use_screen_monitor;
+	xf86OutputSetMonitor (output);
+    }
+}
+
+void
+xf86OutputDestroy (xf86OutputPtr output)
+{
+    ScrnInfoPtr		scrn = output->scrn;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			o;
+    
+    (*output->funcs->destroy) (output);
+    while (output->probed_modes)
+	xf86DeleteMode (&output->probed_modes, output->probed_modes);
+    for (o = 0; o < xf86_config->num_output; o++)
+	if (xf86_config->output[o] == output)
+	{
+	    memmove (&xf86_config->output[o],
+		     &xf86_config->output[o+1],
+		     ((xf86_config->num_output - (o + 1)) * sizeof(void*)));
+	    xf86_config->num_output--;
+	    break;
+	}
+    if (output->name && output->name != (char *) (output + 1))
+	free(output->name);
+    free(output);
+}
+
+/*
+ * Called during CreateScreenResources to hook up RandR
+ */
+static Bool
+xf86CrtcCreateScreenResources (ScreenPtr screen)
+{
+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+
+    screen->CreateScreenResources = config->CreateScreenResources;
+    
+    if (!(*screen->CreateScreenResources)(screen))
+	return FALSE;
+
+    if (!xf86RandR12CreateScreenResources (screen))
+	return FALSE;
+
+    return TRUE;
+}
+
+/*
+ * Clean up config on server reset
+ */
+static Bool
+xf86CrtcCloseScreen (int index, ScreenPtr screen)
+{
+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			o, c;
+    
+    screen->CloseScreen = config->CloseScreen;
+
+    xf86RotateCloseScreen (screen);
+
+    for (o = 0; o < config->num_output; o++)
+    {
+	xf86OutputPtr	output = config->output[o];
+
+	output->randr_output = NULL;
+    }
+    for (c = 0; c < config->num_crtc; c++)
+    {
+	xf86CrtcPtr	crtc = config->crtc[c];
+
+	crtc->randr_crtc = NULL;
+    }
+    xf86RandR12CloseScreen (screen);
+
+    return screen->CloseScreen (index, screen);
+}
+
+/*
+ * Called at ScreenInit time to set up
+ */
+#ifdef RANDR_13_INTERFACE
+int
+#else
+Bool
+#endif
+xf86CrtcScreenInit (ScreenPtr screen)
+{
+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			c;
+
+    /* Rotation */
+    xf86DrvMsg(scrn->scrnIndex, X_INFO, "RandR 1.2 enabled, ignore the following RandR disabled message.\n");
+    xf86DisableRandR(); /* Disable old RandR extension support */
+    xf86RandR12Init (screen);
+
+    /* support all rotations if every crtc has the shadow alloc funcs */
+    for (c = 0; c < config->num_crtc; c++)
+    {
+	xf86CrtcPtr crtc = config->crtc[c];
+	if (!crtc->funcs->shadow_allocate || !crtc->funcs->shadow_create)
+	    break;
+    }
+    if (c == config->num_crtc)
+    {
+	xf86RandR12SetRotations (screen, RR_Rotate_0 | RR_Rotate_90 |
+				 RR_Rotate_180 | RR_Rotate_270 |
+				 RR_Reflect_X | RR_Reflect_Y);
+	xf86RandR12SetTransformSupport (screen, TRUE);
+    }
+    else
+    {
+	xf86RandR12SetRotations (screen, RR_Rotate_0);
+	xf86RandR12SetTransformSupport (screen, FALSE);
+    }
+    
+    /* Wrap CreateScreenResources so we can initialize the RandR code */
+    config->CreateScreenResources = screen->CreateScreenResources;
+    screen->CreateScreenResources = xf86CrtcCreateScreenResources;
+
+    config->CloseScreen = screen->CloseScreen;
+    screen->CloseScreen = xf86CrtcCloseScreen;
+    
+#ifdef XFreeXDGA
+    _xf86_di_dga_init_internal(screen);
+#endif
+#ifdef RANDR_13_INTERFACE
+    return RANDR_INTERFACE_VERSION;
+#else
+    return TRUE;
+#endif
+}
+
+static DisplayModePtr
+xf86DefaultMode (xf86OutputPtr output, int width, int height)
+{
+    DisplayModePtr  target_mode = NULL;
+    DisplayModePtr  mode;
+    int		    target_diff = 0;
+    int		    target_preferred = 0;
+    int		    mm_height;
+    
+    mm_height = output->mm_height;
+    if (!mm_height)
+	mm_height = (768 * 25.4) / DEFAULT_DPI;
+    /*
+     * Pick a mode closest to DEFAULT_DPI
+     */
+    for (mode = output->probed_modes; mode; mode = mode->next)
+    {
+	int	    dpi;
+	int	    preferred = (((mode->type & M_T_PREFERRED) != 0) +
+				 ((mode->type & M_T_USERPREF) != 0));
+	int	    diff;
+
+	if (xf86ModeWidth (mode, output->initial_rotation) > width ||
+	    xf86ModeHeight (mode, output->initial_rotation) > height)
+	    continue;
+	
+	/* yes, use VDisplay here, not xf86ModeHeight */
+	dpi = (mode->VDisplay * 254) / (mm_height * 10);
+	diff = dpi - DEFAULT_DPI;
+	diff = diff < 0 ? -diff : diff;
+	if (target_mode == NULL || (preferred > target_preferred) ||
+	    (preferred == target_preferred && diff < target_diff))
+	{
+	    target_mode = mode;
+	    target_diff = diff;
+	    target_preferred = preferred;
+	}
+    }
+    return target_mode;
+}
+
+static DisplayModePtr
+xf86ClosestMode (xf86OutputPtr output, 
+		 DisplayModePtr match, Rotation match_rotation,
+		 int width, int height)
+{
+    DisplayModePtr  target_mode = NULL;
+    DisplayModePtr  mode;
+    int		    target_diff = 0;
+    
+    /*
+     * Pick a mode closest to the specified mode
+     */
+    for (mode = output->probed_modes; mode; mode = mode->next)
+    {
+	int	    dx, dy;
+	int	    diff;
+
+	if (xf86ModeWidth (mode, output->initial_rotation) > width ||
+	    xf86ModeHeight (mode, output->initial_rotation) > height)
+	    continue;
+	
+	/* exact matches are preferred */
+	if (output->initial_rotation == match_rotation &&
+	    xf86ModesEqual (mode, match))
+	    return mode;
+	
+	dx = xf86ModeWidth (match, match_rotation) - xf86ModeWidth (mode, output->initial_rotation);
+	dy = xf86ModeHeight (match, match_rotation) - xf86ModeHeight (mode, output->initial_rotation);
+	diff = dx * dx + dy * dy;
+	if (target_mode == NULL || diff < target_diff)
+	{
+	    target_mode = mode;
+	    target_diff = diff;
+	}
+    }
+    return target_mode;
+}
+
+static DisplayModePtr
+xf86OutputHasPreferredMode (xf86OutputPtr output, int width, int height)
+{
+    DisplayModePtr  mode;
+
+    for (mode = output->probed_modes; mode; mode = mode->next)
+    {
+	if (xf86ModeWidth (mode, output->initial_rotation) > width ||
+	    xf86ModeHeight (mode, output->initial_rotation) > height)
+	    continue;
+
+	if (mode->type & M_T_PREFERRED)
+	    return mode;
+    }
+    return NULL;
+}
+
+static DisplayModePtr
+xf86OutputHasUserPreferredMode (xf86OutputPtr output)
+{
+    DisplayModePtr mode, first = output->probed_modes;
+
+    for (mode = first; mode && mode->next != first; mode = mode->next)
+	if (mode->type & M_T_USERPREF)
+	    return mode;
+
+    return NULL;
+}
+
+static int
+xf86PickCrtcs (ScrnInfoPtr	scrn,
+	       xf86CrtcPtr	*best_crtcs,
+	       DisplayModePtr	*modes,
+	       int		n,
+	       int		width,
+	       int		height)
+{
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    int		    c, o;
+    xf86OutputPtr   output;
+    xf86CrtcPtr	    crtc;
+    xf86CrtcPtr	    *crtcs;
+    xf86CrtcPtr	    best_crtc;
+    int		    best_score;
+    int		    score;
+    int		    my_score;
+    
+    if (n == config->num_output)
+	return 0;
+    output = config->output[n];
+    
+    /*
+     * Compute score with this output disabled
+     */
+    best_crtcs[n] = NULL;
+    best_crtc = NULL;
+    best_score = xf86PickCrtcs (scrn, best_crtcs, modes, n+1, width, height);
+    if (modes[n] == NULL)
+	return best_score;
+    
+    crtcs = malloc(config->num_output * sizeof (xf86CrtcPtr));
+    if (!crtcs)
+	return best_score;
+
+    my_score = 1;
+    /* Score outputs that are known to be connected higher */
+    if (output->status == XF86OutputStatusConnected)
+	my_score++;
+    /* Score outputs with preferred modes higher */
+    if (xf86OutputHasPreferredMode (output, width, height))
+	my_score++;
+    /*
+     * Select a crtc for this output and
+     * then attempt to configure the remaining
+     * outputs
+     */
+    for (c = 0; c < config->num_crtc; c++)
+    {
+	if ((output->possible_crtcs & (1 << c)) == 0)
+	    continue;
+	
+	crtc = config->crtc[c];
+	/*
+	 * Check to see if some other output is
+	 * using this crtc
+	 */
+	for (o = 0; o < n; o++)
+	    if (best_crtcs[o] == crtc)
+		break;
+	if (o < n)
+	{
+	    /*
+	     * If the two outputs desire the same mode,
+	     * see if they can be cloned
+	     */
+	    if (xf86ModesEqual (modes[o], modes[n]) &&
+		config->output[o]->initial_rotation == config->output[n]->initial_rotation &&
+		config->output[o]->initial_x == config->output[n]->initial_x &&
+		config->output[o]->initial_y == config->output[n]->initial_y)
+	    {
+		if ((output->possible_clones & (1 << o)) == 0)
+		    continue;		/* nope, try next CRTC */
+	    }
+	    else
+		continue;		/* different modes, can't clone */
+	}
+	crtcs[n] = crtc;
+	memcpy (crtcs, best_crtcs, n * sizeof (xf86CrtcPtr));
+	score = my_score + xf86PickCrtcs (scrn, crtcs, modes, n+1, width, height);
+	if (score > best_score)
+	{
+	    best_crtc = crtc;
+	    best_score = score;
+	    memcpy (best_crtcs, crtcs, config->num_output * sizeof (xf86CrtcPtr));
+	}
+    }
+    free(crtcs);
+    return best_score;
+}
+
+
+/*
+ * Compute the virtual size necessary to place all of the available
+ * crtcs in the specified configuration.
+ *
+ * canGrow indicates that the driver can make the screen larger than its initial
+ * configuration.  If FALSE, this function will enlarge the screen to include
+ * the largest available mode.
+ */
+
+static void
+xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
+			 Bool canGrow)
+{
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    int	    width = 0, height = 0;
+    int	    o;
+    int	    c;
+    int	    s;
+
+    for (c = 0; c < config->num_crtc; c++)
+    {
+	int	    crtc_width = 0, crtc_height = 0;
+	xf86CrtcPtr crtc = config->crtc[c];
+
+	if (crtc->enabled)
+	{
+	    crtc_width = crtc->desiredX + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation);
+	    crtc_height = crtc->desiredY + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation);
+	}
+	if (!canGrow) {
+	    for (o = 0; o < config->num_output; o++)
+	    {
+		xf86OutputPtr   output = config->output[o];
+
+		for (s = 0; s < config->num_crtc; s++)
+		    if (output->possible_crtcs & (1 << s))
+		    {
+			DisplayModePtr  mode;
+			for (mode = output->probed_modes; mode; mode = mode->next)
+			{
+			    if (mode->HDisplay > crtc_width)
+				crtc_width = mode->HDisplay;
+			    if (mode->VDisplay > crtc_width)
+				crtc_width = mode->VDisplay;
+			    if (mode->VDisplay > crtc_height)
+				crtc_height = mode->VDisplay;
+			    if (mode->HDisplay > crtc_height)
+				crtc_height = mode->HDisplay;
+			}
+		    }
+	    }
+	}
+	if (crtc_width > width)
+	    width = crtc_width;
+	if (crtc_height > height)
+	    height = crtc_height;
+    }
+    if (config->maxWidth && width > config->maxWidth) width = config->maxWidth;
+    if (config->maxHeight && height > config->maxHeight) height = config->maxHeight;
+    if (config->minWidth && width < config->minWidth) width = config->minWidth;
+    if (config->minHeight && height < config->minHeight) height = config->minHeight;
+    *widthp = width;
+    *heightp = height;
+}
+
+#define POSITION_UNSET	-100000
+
+/*
+ * check if the user configured any outputs at all 
+ * with either a position or a relative setting or a mode.
+ */
+static Bool
+xf86UserConfiguredOutputs(ScrnInfoPtr scrn, DisplayModePtr *modes)
+{
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    int o;
+    Bool user_conf = FALSE;
+
+    for (o = 0; o < config->num_output; o++)
+    {
+	xf86OutputPtr output = config->output[o];
+	char	    *position;
+	char	    *relative_name;
+	OutputOpts	    relation;
+	int r;
+	static const OutputOpts	relations[] = {
+	    OPTION_BELOW, OPTION_RIGHT_OF, OPTION_ABOVE, OPTION_LEFT_OF
+	};
+
+	position = xf86GetOptValString (output->options,
+					OPTION_POSITION);
+	if (position)
+	    user_conf = TRUE;
+
+	relation = 0;
+	relative_name = NULL;
+	for (r = 0; r < 4; r++)
+	{
+	    relation = relations[r];
+	    relative_name = xf86GetOptValString (output->options,
+						     relation);
+	    if (relative_name)
+		break;
+	}
+	if (relative_name)
+	    user_conf = TRUE;
+
+	modes[o] = xf86OutputHasUserPreferredMode(output);
+	if (modes[o])
+	    user_conf = TRUE;
+    }
+
+    return user_conf;
+}
+
+static Bool
+xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)
+{
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			o;
+    int			min_x, min_y;
+    
+    for (o = 0; o < config->num_output; o++)
+    {
+	xf86OutputPtr	output = config->output[o];
+
+	output->initial_x = output->initial_y = POSITION_UNSET;
+    }
+    
+    /*
+     * Loop until all outputs are set
+     */
+    for (;;)
+    {
+	Bool	any_set = FALSE;
+	Bool	keep_going = FALSE;
+
+	for (o = 0; o < config->num_output; o++)	
+	{
+	    static const OutputOpts	relations[] = {
+		OPTION_BELOW, OPTION_RIGHT_OF, OPTION_ABOVE, OPTION_LEFT_OF
+	    };
+	    xf86OutputPtr   output = config->output[o];
+	    xf86OutputPtr   relative;
+	    char	    *relative_name;
+	    char	    *position;
+	    OutputOpts	    relation;
+	    int		    r;
+
+	    if (output->initial_x != POSITION_UNSET)
+		continue;
+	    position = xf86GetOptValString (output->options,
+					    OPTION_POSITION);
+	    /*
+	     * Absolute position wins
+	     */
+	    if (position)
+	    {
+		int		    x, y;
+		if (sscanf (position, "%d %d", &x, &y) == 2)
+		{
+		    output->initial_x = x;
+		    output->initial_y = y;
+		}
+		else
+		{
+		    xf86DrvMsg (scrn->scrnIndex, X_ERROR,
+				"Output %s position not of form \"x y\"\n",
+				output->name);
+		    output->initial_x = output->initial_y = 0;
+		}
+		any_set = TRUE;
+		continue;
+	    }
+	    /*
+	     * Next comes relative positions
+	     */
+	    relation = 0;
+	    relative_name = NULL;
+	    for (r = 0; r < 4; r++)
+	    {
+		relation = relations[r];
+		relative_name = xf86GetOptValString (output->options,
+						     relation);
+		if (relative_name)
+		    break;
+	    }
+	    if (relative_name)
+	    {
+		int or;
+		relative = NULL;
+		for (or = 0; or < config->num_output; or++)
+		{
+		    xf86OutputPtr	out_rel = config->output[or];
+		    XF86ConfMonitorPtr	rel_mon = out_rel->conf_monitor;
+
+		    if (rel_mon)
+		    {
+			if (xf86nameCompare (rel_mon->mon_identifier,
+					      relative_name) == 0)
+			{
+			    relative = config->output[or];
+			    break;
+			}
+		    }
+		    if (strcmp (out_rel->name, relative_name) == 0)
+		    {
+			relative = config->output[or];
+			break;
+		    }
+		}
+		if (!relative)
+		{
+		    xf86DrvMsg (scrn->scrnIndex, X_ERROR,
+				"Cannot position output %s relative to unknown output %s\n",
+				output->name, relative_name);
+		    output->initial_x = 0;
+		    output->initial_y = 0;
+		    any_set = TRUE;
+		    continue;
+		}
+		if (!modes[or])
+		{
+		    xf86DrvMsg (scrn->scrnIndex, X_ERROR,
+				"Cannot position output %s relative to output %s without modes\n",
+				output->name, relative_name);
+		    output->initial_x = 0;
+		    output->initial_y = 0;
+		    any_set = TRUE;
+		    continue;
+		}
+		if (relative->initial_x == POSITION_UNSET)
+		{
+		    keep_going = TRUE;
+		    continue;
+		}
+		output->initial_x = relative->initial_x;
+		output->initial_y = relative->initial_y;
+		switch (relation) {
+		case OPTION_BELOW:
+		    output->initial_y += xf86ModeHeight (modes[or], relative->initial_rotation);
+		    break;
+		case OPTION_RIGHT_OF:
+		    output->initial_x += xf86ModeWidth (modes[or], relative->initial_rotation);
+		    break;
+		case OPTION_ABOVE:
+		    if (modes[o])
+			output->initial_y -= xf86ModeHeight (modes[o], output->initial_rotation);
+		    break;
+		case OPTION_LEFT_OF:
+		    if (modes[o])
+			output->initial_x -= xf86ModeWidth (modes[o], output->initial_rotation);
+		    break;
+		default:
+		    break;
+		}
+		any_set = TRUE;
+		continue;
+	    }
+	    
+	    /* Nothing set, just stick them at 0,0 */
+	    output->initial_x = 0;
+	    output->initial_y = 0;
+	    any_set = TRUE;
+	}
+	if (!keep_going)
+	    break;
+	if (!any_set) 
+	{
+	    for (o = 0; o < config->num_output; o++)
+	    {
+		xf86OutputPtr   output = config->output[o];
+		if (output->initial_x == POSITION_UNSET)
+		{
+		    xf86DrvMsg (scrn->scrnIndex, X_ERROR,
+				"Output position loop. Moving %s to 0,0\n",
+				output->name);
+		    output->initial_x = output->initial_y = 0;
+		    break;
+		}
+	    }
+	}
+    }
+
+    /*
+     * normalize positions
+     */
+    min_x = 1000000;
+    min_y = 1000000;
+    for (o = 0; o < config->num_output; o++)
+    {
+	xf86OutputPtr	output = config->output[o];
+
+	if (output->initial_x < min_x)
+	    min_x = output->initial_x;
+	if (output->initial_y < min_y)
+	    min_y = output->initial_y;
+    }
+    
+    for (o = 0; o < config->num_output; o++)
+    {
+	xf86OutputPtr	output = config->output[o];
+
+	output->initial_x -= min_x;
+	output->initial_y -= min_y;
+    }
+    return TRUE;
+}
+
+static void
+xf86InitialPanning (ScrnInfoPtr scrn)
+{
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			o;
+    
+    for (o = 0; o < config->num_output; o++)
+    {
+	xf86OutputPtr	output = config->output[o];
+	char	       *panning = xf86GetOptValString (output->options, OPTION_PANNING);
+	int		width, height, left, top;
+	int		track_width, track_height, track_left, track_top;
+	int		brdr[4];
+
+	memset (&output->initialTotalArea,    0, sizeof(BoxRec));
+	memset (&output->initialTrackingArea, 0, sizeof(BoxRec));
+	memset (output->initialBorder,        0, 4*sizeof(INT16));
+
+	if (! panning)
+	    continue;
+
+	switch (sscanf (panning, "%dx%d+%d+%d/%dx%d+%d+%d/%d/%d/%d/%d",
+			&width, &height, &left, &top,
+			&track_width, &track_height, &track_left, &track_top,
+			&brdr[0], &brdr[1], &brdr[2], &brdr[3])) {
+	case 12:
+	    output->initialBorder[0] = brdr[0];
+	    output->initialBorder[1] = brdr[1];
+	    output->initialBorder[2] = brdr[2];
+	    output->initialBorder[3] = brdr[3];
+	    /* fall through */
+	case 8:
+	    output->initialTrackingArea.x1 = track_left;
+	    output->initialTrackingArea.y1 = track_top;
+	    output->initialTrackingArea.x2 = track_left + track_width;
+	    output->initialTrackingArea.y2 = track_top  + track_height;
+	    /* fall through */
+	case 4:
+	    output->initialTotalArea.x1 = left;
+	    output->initialTotalArea.y1 = top;
+	    /* fall through */
+	case 2:
+	    output->initialTotalArea.x2 = output->initialTotalArea.x1 + width;
+	    output->initialTotalArea.y2 = output->initialTotalArea.y1 + height;
+	    break;
+	default:
+	    xf86DrvMsg (scrn->scrnIndex, X_ERROR,
+			"Broken panning specification '%s' for output %s in config file\n",
+			panning, output->name);
+	}
+    }
+}
+
+/** Return - 0 + if a should be earlier, same or later than b in list
+ */
+static int
+xf86ModeCompare (DisplayModePtr a, DisplayModePtr b)
+{
+    int	diff;
+
+    diff = ((b->type & M_T_PREFERRED) != 0) - ((a->type & M_T_PREFERRED) != 0);
+    if (diff)
+	return diff;
+    diff = b->HDisplay * b->VDisplay - a->HDisplay * a->VDisplay;
+    if (diff)
+	return diff;
+    diff = b->Clock - a->Clock;
+    return diff;
+}
+
+/**
+ * Insertion sort input in-place and return the resulting head
+ */
+static DisplayModePtr
+xf86SortModes (DisplayModePtr input)
+{
+    DisplayModePtr  output = NULL, i, o, n, *op, prev;
+
+    /* sort by preferred status and pixel area */
+    while (input)
+    {
+	i = input;
+	input = input->next;
+	for (op = &output; (o = *op); op = &o->next)
+	    if (xf86ModeCompare (o, i) > 0)
+		break;
+	i->next = *op;
+	*op = i;
+    }
+    /* prune identical modes */
+    for (o = output; o && (n = o->next); o = n)
+    {
+	if (!strcmp (o->name, n->name) && xf86ModesEqual (o, n))
+	{
+	    o->next = n->next;
+	    free(n->name);
+	    free(n);
+	    n = o;
+	}
+    }
+    /* hook up backward links */
+    prev = NULL;
+    for (o = output; o; o = o->next)
+    {
+	o->prev = prev;
+	prev = o;
+    }
+    return output;
+}
+
+static char *
+preferredMode(ScrnInfoPtr pScrn, xf86OutputPtr output)
+{
+    char *preferred_mode = NULL;
+
+    /* Check for a configured preference for a particular mode */
+    preferred_mode = xf86GetOptValString (output->options,
+					  OPTION_PREFERRED_MODE);
+    if (preferred_mode)
+	return preferred_mode;
+
+    if (pScrn->display->modes && *pScrn->display->modes)
+	preferred_mode = *pScrn->display->modes;
+
+    return preferred_mode;
+}
+
+static void
+GuessRangeFromModes(MonPtr mon, DisplayModePtr mode)
+{
+    if (!mon || !mode)
+       return;
+
+    mon->nHsync = 1;
+    mon->hsync[0].lo = 1024.0;
+    mon->hsync[0].hi = 0.0;
+
+    mon->nVrefresh = 1;
+    mon->vrefresh[0].lo = 1024.0;
+    mon->vrefresh[0].hi = 0.0;
+
+    while (mode) {
+	if (!mode->HSync)
+	    mode->HSync = ((float) mode->Clock ) / ((float) mode->HTotal);
+
+	if (!mode->VRefresh)
+	    mode->VRefresh = (1000.0 * ((float) mode->Clock)) / 
+		((float) (mode->HTotal * mode->VTotal));
+
+	if (mode->HSync < mon->hsync[0].lo)
+	    mon->hsync[0].lo = mode->HSync;
+
+	if (mode->HSync > mon->hsync[0].hi)
+	    mon->hsync[0].hi = mode->HSync;
+
+	if (mode->VRefresh < mon->vrefresh[0].lo)
+	    mon->vrefresh[0].lo = mode->VRefresh;
+
+	if (mode->VRefresh > mon->vrefresh[0].hi)
+	    mon->vrefresh[0].hi = mode->VRefresh;
+
+	mode = mode->next;
+    }
+
+    /* stretch out the bottom to fit 640x480@60 */
+    if (mon->hsync[0].lo > 31.0)
+       mon->hsync[0].lo = 31.0;
+    if (mon->vrefresh[0].lo > 58.0)
+       mon->vrefresh[0].lo = 58.0;
+}
+
+enum det_monrec_source {
+    sync_config, sync_edid, sync_default
+};
+
+struct det_monrec_parameter {
+    MonRec *mon_rec;
+    int *max_clock;
+    Bool set_hsync;
+    Bool set_vrefresh;
+    enum det_monrec_source *sync_source;
+};
+
+static void handle_detailed_monrec(struct detailed_monitor_section *det_mon,
+                                   void *data)
+{
+    struct det_monrec_parameter *p;
+    p = (struct det_monrec_parameter *)data;
+
+    if (det_mon->type == DS_RANGES) {
+        struct monitor_ranges *ranges = &det_mon->section.ranges;
+        if (p->set_hsync && ranges->max_h) {
+            p->mon_rec->hsync[p->mon_rec->nHsync].lo = ranges->min_h;
+            p->mon_rec->hsync[p->mon_rec->nHsync].hi = ranges->max_h;
+            p->mon_rec->nHsync++;
+            if (*p->sync_source == sync_default)
+                *p->sync_source = sync_edid;
+        }
+        if (p->set_vrefresh && ranges->max_v) {
+            p->mon_rec->vrefresh[p->mon_rec->nVrefresh].lo = ranges->min_v;
+            p->mon_rec->vrefresh[p->mon_rec->nVrefresh].hi = ranges->max_v;
+            p->mon_rec->nVrefresh++;
+            if (*p->sync_source == sync_default)
+                *p->sync_source = sync_edid;
+        }
+        if (ranges->max_clock * 1000 > *p->max_clock)
+            *p->max_clock = ranges->max_clock * 1000;
+    }
+}
+
+void
+xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+{
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			o;
+
+    /* When canGrow was TRUE in the initial configuration we have to
+     * compare against the maximum values so that we don't drop modes.
+     * When canGrow was FALSE, the maximum values would have been clamped
+     * anyway.
+     */
+    if (maxX == 0 || maxY == 0) {
+	maxX = config->maxWidth;
+	maxY = config->maxHeight;
+    }
+
+    /* Probe the list of modes for each output. */
+    for (o = 0; o < config->num_output; o++) 
+    {
+	xf86OutputPtr	    output = config->output[o];
+	DisplayModePtr	    mode;
+	DisplayModePtr	    config_modes = NULL, output_modes, default_modes = NULL;
+	char		    *preferred_mode;
+	xf86MonPtr	    edid_monitor;
+	XF86ConfMonitorPtr  conf_monitor;
+	MonRec		    mon_rec;
+	int		    min_clock = 0;
+	int		    max_clock = 0;
+	double		    clock;
+	Bool		    add_default_modes;
+	Bool		    debug_modes = config->debug_modes ||
+					  xf86Initialising;
+	enum det_monrec_source sync_source = sync_default;
+	
+	while (output->probed_modes != NULL)
+	    xf86DeleteMode(&output->probed_modes, output->probed_modes);
+
+	/*
+	 * Check connection status
+	 */
+	output->status = (*output->funcs->detect)(output);
+
+	if (output->status == XF86OutputStatusDisconnected &&
+		!xf86ReturnOptValBool(output->options, OPTION_ENABLE, FALSE))
+	{
+	    xf86OutputSetEDID (output, NULL);
+	    continue;
+	}
+
+	memset (&mon_rec, '\0', sizeof (mon_rec));
+	
+	conf_monitor = output->conf_monitor;
+	
+	if (conf_monitor)
+	{
+	    int	i;
+	    
+	    for (i = 0; i < conf_monitor->mon_n_hsync; i++)
+	    {
+		mon_rec.hsync[mon_rec.nHsync].lo = conf_monitor->mon_hsync[i].lo;
+		mon_rec.hsync[mon_rec.nHsync].hi = conf_monitor->mon_hsync[i].hi;
+		mon_rec.nHsync++;
+		sync_source = sync_config;
+	    }
+	    for (i = 0; i < conf_monitor->mon_n_vrefresh; i++)
+	    {
+		mon_rec.vrefresh[mon_rec.nVrefresh].lo = conf_monitor->mon_vrefresh[i].lo;
+		mon_rec.vrefresh[mon_rec.nVrefresh].hi = conf_monitor->mon_vrefresh[i].hi;
+		mon_rec.nVrefresh++;
+		sync_source = sync_config;
+	    }
+	    config_modes = xf86GetMonitorModes (scrn, conf_monitor);
+	}
+	
+	output_modes = (*output->funcs->get_modes) (output);
+
+	/*
+	 * If the user has a preference, respect it.
+	 * Otherwise, don't second-guess the driver.
+	 */
+	if (!xf86GetOptValBool(output->options, OPTION_DEFAULT_MODES,
+			       &add_default_modes))
+	    add_default_modes = (output_modes == NULL);
+	
+	edid_monitor = output->MonInfo;
+	
+        if (edid_monitor)
+        {
+            struct det_monrec_parameter p;
+            struct disp_features    *features = &edid_monitor->features;
+
+	    /* if display is not continuous-frequency, don't add default modes */
+	    if (!GTF_SUPPORTED(features->msc))
+		add_default_modes = FALSE;
+
+	    p.mon_rec = &mon_rec;
+	    p.max_clock = &max_clock;
+	    p.set_hsync = mon_rec.nHsync == 0;
+	    p.set_vrefresh = mon_rec.nVrefresh == 0;
+	    p.sync_source = &sync_source;
+
+	    xf86ForEachDetailedBlock(edid_monitor,
+			             handle_detailed_monrec,
+			             &p);
+	}
+
+	if (xf86GetOptValFreq (output->options, OPTION_MIN_CLOCK,
+			       OPTUNITS_KHZ, &clock))
+	    min_clock = (int) clock;
+	if (xf86GetOptValFreq (output->options, OPTION_MAX_CLOCK,
+			       OPTUNITS_KHZ, &clock))
+	    max_clock = (int) clock;
+
+	/* If we still don't have a sync range, guess wildly */
+	if (!mon_rec.nHsync || !mon_rec.nVrefresh)
+	    GuessRangeFromModes(&mon_rec, output_modes);
+
+	/*
+	 * These limits will end up setting a 1024x768@60Hz mode by default,
+	 * which seems like a fairly good mode to use when nothing else is
+	 * specified
+	 */
+	if (mon_rec.nHsync == 0)
+	{
+	    mon_rec.hsync[0].lo = 31.0;
+	    mon_rec.hsync[0].hi = 55.0;
+	    mon_rec.nHsync = 1;
+	}
+	if (mon_rec.nVrefresh == 0)
+	{
+	    mon_rec.vrefresh[0].lo = 58.0;
+	    mon_rec.vrefresh[0].hi = 62.0;
+	    mon_rec.nVrefresh = 1;
+	}
+
+	if (add_default_modes)
+	    default_modes = xf86GetDefaultModes ();
+
+	/*
+	 * If this is not an RB monitor, remove RB modes from the default
+	 * pool.  RB modes from the config or the monitor itself are fine.
+	 */
+	if (!mon_rec.reducedblanking)
+	    xf86ValidateModesReducedBlanking (scrn, default_modes);
+
+	if (sync_source == sync_config)
+	{
+	    /* 
+	     * Check output and config modes against sync range from config file
+	     */
+	    xf86ValidateModesSync (scrn, output_modes, &mon_rec);
+	    xf86ValidateModesSync (scrn, config_modes, &mon_rec);
+	}
+	/*
+	 * Check default modes against sync range
+	 */
+        xf86ValidateModesSync (scrn, default_modes, &mon_rec);
+	/*
+	 * Check default modes against monitor max clock
+	 */
+	if (max_clock) {
+	    xf86ValidateModesClocks(scrn, default_modes,
+				    &min_clock, &max_clock, 1);
+	    xf86ValidateModesClocks(scrn, output_modes,
+				    &min_clock, &max_clock, 1);
+	}
+	
+	output->probed_modes = NULL;
+	output->probed_modes = xf86ModesAdd (output->probed_modes, config_modes);
+	output->probed_modes = xf86ModesAdd (output->probed_modes, output_modes);
+	output->probed_modes = xf86ModesAdd (output->probed_modes, default_modes);
+	
+	/*
+	 * Check all modes against max size, interlace, and doublescan
+	 */
+	if (maxX && maxY)
+	    xf86ValidateModesSize (scrn, output->probed_modes,
+				       maxX, maxY, 0);
+
+	{
+	    int flags = (output->interlaceAllowed ? V_INTERLACE : 0) |
+			(output->doubleScanAllowed ? V_DBLSCAN : 0);
+	    xf86ValidateModesFlags (scrn, output->probed_modes, flags);
+	}
+	 
+	/*
+	 * Check all modes against output
+	 */
+	for (mode = output->probed_modes; mode != NULL; mode = mode->next) 
+	    if (mode->status == MODE_OK)
+		mode->status = (*output->funcs->mode_valid)(output, mode);
+	
+	xf86PruneInvalidModes(scrn, &output->probed_modes, debug_modes);
+	
+	output->probed_modes = xf86SortModes (output->probed_modes);
+	
+	/* Check for a configured preference for a particular mode */
+	preferred_mode = preferredMode(scrn, output);
+
+	if (preferred_mode)
+	{
+	    for (mode = output->probed_modes; mode; mode = mode->next)
+	    {
+		if (!strcmp (preferred_mode, mode->name))
+		{
+		    if (mode != output->probed_modes)
+		    {
+			if (mode->prev)
+			    mode->prev->next = mode->next;
+			if (mode->next)
+			    mode->next->prev = mode->prev;
+			mode->next = output->probed_modes;
+			output->probed_modes->prev = mode;
+			mode->prev = NULL;
+			output->probed_modes = mode;
+		    }
+		    mode->type |= (M_T_PREFERRED|M_T_USERPREF);
+		    break;
+		}
+	    }
+	}
+	
+	output->initial_rotation = xf86OutputInitialRotation (output);
+
+	if (debug_modes) {
+	    if (output->probed_modes != NULL) {
+		xf86DrvMsg(scrn->scrnIndex, X_INFO,
+			   "Printing probed modes for output %s\n",
+			   output->name);
+	    } else {
+		xf86DrvMsg(scrn->scrnIndex, X_INFO,
+			   "No remaining probed modes for output %s\n",
+			   output->name);
+	    }
+	}
+	for (mode = output->probed_modes; mode != NULL; mode = mode->next)
+	{
+	    /* The code to choose the best mode per pipe later on will require
+	     * VRefresh to be set.
+	     */
+	    mode->VRefresh = xf86ModeVRefresh(mode);
+	    xf86SetModeCrtc(mode, INTERLACE_HALVE_V);
+
+	    if (debug_modes)
+		xf86PrintModeline(scrn->scrnIndex, mode);
+	}
+    }
+}
+
+
+/**
+ * Copy one of the output mode lists to the ScrnInfo record
+ */
+
+/* XXX where does this function belong? Here? */
+void
+xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr scrn, int *x, int *y);
+
+static DisplayModePtr
+biggestMode(DisplayModePtr a, DisplayModePtr b)
+{
+    int A, B;
+
+    if (!a)
+	return b;
+    if (!b)
+	return a;
+
+    A = a->HDisplay * a->VDisplay;
+    B = b->HDisplay * b->VDisplay;
+
+    if (A > B)
+	return a;
+
+    return b;
+}
+
+static xf86OutputPtr
+SetCompatOutput(xf86CrtcConfigPtr config)
+{
+    xf86OutputPtr output = NULL, test = NULL;
+    DisplayModePtr maxmode = NULL, testmode, mode;
+    int o, compat = -1, count, mincount = 0;
+
+    /* Look for one that's definitely connected */
+    for (o = 0; o < config->num_output; o++)
+    {
+	test = config->output[o];
+	if (!test->crtc)
+	    continue;
+	if (test->status != XF86OutputStatusConnected)
+	    continue;
+	if (!test->probed_modes)
+	    continue;
+
+	testmode = mode = test->probed_modes;
+	for (count = 0; mode; mode = mode->next, count++)
+	    testmode = biggestMode(testmode, mode);
+
+	if (!output) {
+	    output = test;
+	    compat = o;
+	    maxmode = testmode;
+	    mincount = count;
+	} else if (maxmode == biggestMode(maxmode, testmode)) {
+	    output = test;
+	    compat = o;
+	    maxmode = testmode;
+	    mincount = count;
+	} else if ((maxmode->HDisplay == testmode->HDisplay) && 
+		(maxmode->VDisplay == testmode->VDisplay) &&
+		count <= mincount) {
+	    output = test;
+	    compat = o;
+	    maxmode = testmode;
+	    mincount = count;
+	}
+    }
+
+    /* If we didn't find one, take anything we can get */
+    if (!output)
+    {
+	for (o = 0; o < config->num_output; o++)
+	{
+	    test = config->output[o];
+	    if (!test->crtc)
+		continue;
+	    if (!test->probed_modes)
+		continue;
+
+	    if (!output) {
+		output = test;
+		compat = o;
+	    } else if (test->probed_modes->HDisplay < output->probed_modes->HDisplay) {
+		output = test;
+		compat = o;
+	    }
+	}
+    }
+
+    if (compat >= 0) {
+	config->compat_output = compat;
+    } else {
+	/* Don't change the compat output when no valid outputs found */
+	output = config->output[config->compat_output];
+    }
+
+    return output;
+}
+
+void
+xf86SetScrnInfoModes (ScrnInfoPtr scrn)
+{
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86OutputPtr	output;
+    xf86CrtcPtr		crtc;
+    DisplayModePtr	last, mode = NULL;
+
+    output = SetCompatOutput(config);
+
+    if (!output)
+	return; /* punt */
+
+    crtc = output->crtc;
+
+    /* Clear any existing modes from scrn->modes */
+    while (scrn->modes != NULL)
+	xf86DeleteMode(&scrn->modes, scrn->modes);
+
+    /* Set scrn->modes to the mode list for the 'compat' output */
+    scrn->modes = xf86DuplicateModes(scrn, output->probed_modes);
+
+    if (crtc) {
+	for (mode = scrn->modes; mode; mode = mode->next)
+	    if (xf86ModesEqual (mode, &crtc->desiredMode))
+		break;
+    }
+
+    if (scrn->modes != NULL) {
+	/* For some reason, scrn->modes is circular, unlike the other mode
+	 * lists.  How great is that?
+	 */
+	for (last = scrn->modes; last && last->next; last = last->next)
+	    ;
+	last->next = scrn->modes;
+	scrn->modes->prev = last;
+	if (mode) {
+	    while (scrn->modes != mode)
+		scrn->modes = scrn->modes->next;
+	}
+    }
+    scrn->currentMode = scrn->modes;
+#ifdef XFreeXDGA
+    if (scrn->pScreen)
+	    _xf86_di_dga_reinit_internal(scrn->pScreen);
+#endif
+}
+
+static Bool
+xf86CollectEnabledOutputs(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+			  Bool *enabled)
+{
+    Bool any_enabled = FALSE;
+    int o;
+
+    for (o = 0; o < config->num_output; o++)
+	any_enabled |= enabled[o] = xf86OutputEnabled(config->output[o], TRUE);
+    
+    if (!any_enabled) {
+	xf86DrvMsg(scrn->scrnIndex, X_WARNING,
+		   "No outputs definitely connected, trying again...\n");
+
+	for (o = 0; o < config->num_output; o++)
+	    any_enabled |= enabled[o] = xf86OutputEnabled(config->output[o], FALSE);
+    }
+
+    return any_enabled;
+}
+
+static Bool
+nextEnabledOutput(xf86CrtcConfigPtr config, Bool *enabled, int *index)
+{
+    int o = *index;
+
+    for (o++; o < config->num_output; o++) {
+	if (enabled[o]) {
+	    *index = o;
+	    return TRUE;
+	}
+    }
+    
+    return FALSE;
+}
+
+static Bool
+aspectMatch(float a, float b)
+{
+    return fabs(1 - (a / b)) < 0.05;
+}
+
+static DisplayModePtr
+nextAspectMode(xf86OutputPtr o, DisplayModePtr last, float aspect)
+{
+    DisplayModePtr m = NULL;
+
+    if (!o)
+	return NULL;
+
+    if (!last)
+	m = o->probed_modes;
+    else
+	m = last->next;
+
+    for (; m; m = m->next)
+	if (aspectMatch(aspect, (float)m->HDisplay / (float)m->VDisplay))
+	    return m;
+
+    return NULL;
+}
+
+static DisplayModePtr
+bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
+{
+    int o = -1, p;
+    DisplayModePtr mode = NULL, test = NULL, match = NULL;
+
+    if (!nextEnabledOutput(config, enabled, &o))
+	return NULL;
+    while ((mode = nextAspectMode(config->output[o], mode, aspect))) {
+	test = mode;
+	for (p = o; nextEnabledOutput(config, enabled, &p); ) {
+	    test = xf86OutputFindClosestMode(config->output[p], mode);
+	    if (!test)
+		break;
+	    if (test->HDisplay != mode->HDisplay ||
+		    test->VDisplay != mode->VDisplay) {
+		test = NULL;
+		break;
+	    }
+	}
+
+	/* if we didn't match it on all outputs, try the next one */
+	if (!test)
+	    continue;
+
+	/* if it's bigger than the last one, save it */
+	if (!match || (test->HDisplay > match->HDisplay))
+	    match = test;
+    }
+
+    /* return the biggest one found */
+    return match;
+}
+
+static Bool
+xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+		    DisplayModePtr *modes, Bool *enabled,
+		    int width, int height)
+{
+    int o, p;
+    int max_pref_width = 0, max_pref_height = 0;
+    DisplayModePtr *preferred, *preferred_match;
+    Bool ret = FALSE;
+
+    preferred = xnfcalloc(config->num_output, sizeof(DisplayModePtr));
+    preferred_match = xnfcalloc(config->num_output, sizeof(DisplayModePtr));
+
+    /* Check if the preferred mode is available on all outputs */
+    for (p = -1; nextEnabledOutput(config, enabled, &p); ) {
+	Rotation r = config->output[p]->initial_rotation;
+	DisplayModePtr mode;
+	if ((preferred[p] = xf86OutputHasPreferredMode(config->output[p],
+			width, height))) {
+	    int pref_width = xf86ModeWidth(preferred[p], r);
+	    int pref_height = xf86ModeHeight(preferred[p], r);
+	    Bool all_match = TRUE;
+
+	    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
+		Bool match = FALSE;
+		xf86OutputPtr output = config->output[o];
+		if (o == p)
+		    continue;
+
+		for (mode = output->probed_modes; mode; mode = mode->next) {
+		    Rotation r = output->initial_rotation;
+		    if (xf86ModeWidth(mode, r) == pref_width &&
+			    xf86ModeHeight(mode, r) == pref_height) {
+			preferred[o] = mode;
+			match = TRUE;
+		    }
+		}
+
+		all_match &= match;
+	    }
+
+	    if (all_match &&
+		    (pref_width*pref_height > max_pref_width*max_pref_height)) {
+		for (o = -1; nextEnabledOutput(config, enabled, &o); )
+		    preferred_match[o] = preferred[o];
+		max_pref_width = pref_width;
+		max_pref_height = pref_height;
+		ret = TRUE;
+	    }
+	}
+    }
+
+    /*
+     * If there's no preferred mode, but only one monitor, pick the
+     * biggest mode for its aspect ratio, assuming one exists.
+     */
+    if (!ret) do {
+	int i = 0;
+	float aspect = 0.0;
+
+	/* count the number of enabled outputs */
+	for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ;
+
+	if (i != 1)
+	    break;
+
+	p = -1;
+	nextEnabledOutput(config, enabled, &p);
+	if (config->output[p]->mm_height)
+	    aspect = (float)config->output[p]->mm_width /
+		     (float)config->output[p]->mm_height;
+
+	if (aspect)
+	    preferred_match[p] = bestModeForAspect(config, enabled, aspect);
+
+	if (preferred_match[p])
+	    ret = TRUE;
+
+    } while (0);
+
+    if (ret) {
+	/* oh good, there is a match.  stash the selected modes and return. */
+	memcpy(modes, preferred_match,
+		config->num_output * sizeof(DisplayModePtr));
+    }
+
+    free(preferred);
+    free(preferred_match);
+    return ret;
+}
+
+static Bool
+xf86TargetAspect(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+		 DisplayModePtr *modes, Bool *enabled,
+		 int width, int height)
+{
+    int o;
+    float aspect = 0.0, *aspects;
+    xf86OutputPtr output;
+    Bool ret = FALSE;
+    DisplayModePtr guess = NULL, aspect_guess = NULL, base_guess = NULL;
+
+    aspects = xnfcalloc(config->num_output, sizeof(float));
+
+    /* collect the aspect ratios */
+    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
+	output = config->output[o];
+	if (output->mm_height)
+	    aspects[o] = (float)output->mm_width / (float)output->mm_height;
+	else
+	    aspects[o] = 4.0 / 3.0;
+    }
+
+    /* check that they're all the same */
+    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
+	output = config->output[o];
+	if (!aspect) {
+	    aspect = aspects[o];
+	} else if (!aspectMatch(aspect, aspects[o])) {
+	    goto no_aspect_match;
+	}
+    }
+
+    /* if they're all 4:3, just skip ahead and save effort */
+    if (!aspectMatch(aspect, 4.0/3.0))
+	aspect_guess = bestModeForAspect(config, enabled, aspect);
+
+no_aspect_match:
+    base_guess = bestModeForAspect(config, enabled, 4.0/3.0);
+
+    guess = biggestMode(base_guess, aspect_guess);
+
+    if (!guess)
+	goto out;
+
+    /* found a mode that works everywhere, now apply it */
+    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
+	modes[o] = xf86OutputFindClosestMode(config->output[o], guess);
+    }
+    ret = TRUE;
+
+out:
+    free(aspects);
+    return ret;
+}
+
+static Bool
+xf86TargetFallback(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+		   DisplayModePtr *modes, Bool *enabled,
+		   int width, int height)
+{
+    DisplayModePtr target_mode = NULL;
+    Rotation target_rotation = RR_Rotate_0;
+    DisplayModePtr default_mode;
+    int default_preferred, target_preferred = 0, o;
+
+    /* User preferred > preferred > other modes */
+    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
+	default_mode = xf86DefaultMode (config->output[o], width, height);
+	if (!default_mode)
+	    continue;
+
+	default_preferred = (((default_mode->type & M_T_PREFERRED) != 0) +
+		((default_mode->type & M_T_USERPREF) != 0));
+
+	if (default_preferred > target_preferred || !target_mode) {
+	    target_mode = default_mode;
+	    target_preferred = default_preferred;
+	    target_rotation = config->output[o]->initial_rotation;
+	    config->compat_output = o;
+	}
+    }
+
+    if (target_mode)
+	modes[config->compat_output] = target_mode;
+
+    /* Fill in other output modes */
+    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
+	if (!modes[o])
+	    modes[o] = xf86ClosestMode(config->output[o], target_mode,
+				       target_rotation, width, height);
+    }
+
+    return target_mode != NULL;
+}
+
+static Bool
+xf86TargetUserpref(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+		   DisplayModePtr *modes, Bool *enabled,
+		   int width, int height)
+{
+    int o;
+
+    if (xf86UserConfiguredOutputs(scrn, modes))
+	return xf86TargetFallback(scrn, config, modes, enabled, width, height);
+    
+    for (o = -1; nextEnabledOutput(config, enabled, &o); )
+	if (xf86OutputHasUserPreferredMode(config->output[o]))
+	    return 
+		xf86TargetFallback(scrn, config, modes, enabled, width, height);
+
+    return FALSE;
+}
+
+static Bool
+xf86CrtcSetInitialGamma(xf86CrtcPtr crtc, float gamma_red, float gamma_green,
+        float gamma_blue)
+{
+    int i, size = 256;
+    CARD16 *red, *green, *blue;
+
+    red = malloc(3 * size * sizeof(CARD16));
+    green = red + size;
+    blue = green + size;
+
+     /* Only cause warning if user wanted gamma to be set. */
+    if (!crtc->funcs->gamma_set && (gamma_red != 1.0 || gamma_green != 1.0 || gamma_blue != 1.0)) {
+        free(red);
+        return FALSE;
+    } else if (!crtc->funcs->gamma_set) {
+        free(red);
+        return TRUE;
+      }
+
+    /* At this early stage none of the randr-interface stuff is up.
+     * So take the default gamma size for lack of something better.
+     */
+    for (i = 0; i < size; i++) {
+        if (gamma_red == 1.0)
+            red[i] = i << 8;
+        else
+            red[i] = (CARD16)(pow((double)i/(double)(size - 1),
+			1. / (double)gamma_red) * (double)(size - 1) * 256);
+
+        if (gamma_green == 1.0)
+            green[i] = i << 8;
+        else
+            green[i] = (CARD16)(pow((double)i/(double)(size - 1),
+			1. / (double)gamma_green) * (double)(size - 1) * 256);
+
+        if (gamma_blue == 1.0)
+            blue[i] = i << 8;
+        else
+            blue[i] = (CARD16)(pow((double)i/(double)(size - 1),
+			1. / (double)gamma_blue) * (double)(size - 1) * 256);
+    }
+
+    /* Default size is 256, so anything else is failure. */
+    if (size != crtc->gamma_size) {
+        free(red);
+        return FALSE;
+      }
+
+    crtc->gamma_size = size;
+    memcpy (crtc->gamma_red, red, crtc->gamma_size * sizeof (CARD16));
+    memcpy (crtc->gamma_green, green, crtc->gamma_size * sizeof (CARD16));
+    memcpy (crtc->gamma_blue, blue, crtc->gamma_size * sizeof (CARD16));
+
+    /* Do not set gamma now, delay until the crtc is activated. */
+
+    free(red);
+
+    return TRUE;
+}
+
+static Bool
+xf86OutputSetInitialGamma(xf86OutputPtr output)
+{
+    XF86ConfMonitorPtr mon = output->conf_monitor;
+    float gamma_red = 1.0, gamma_green = 1.0, gamma_blue = 1.0;
+    
+    if (!mon)
+        return TRUE;
+
+    if (!output->crtc)
+        return FALSE;
+
+    /* Get configured values, where they exist. */
+    if (mon->mon_gamma_red >= GAMMA_MIN &&
+        mon->mon_gamma_red <= GAMMA_MAX)
+            gamma_red = mon->mon_gamma_red;
+
+    if (mon->mon_gamma_green >= GAMMA_MIN &&
+        mon->mon_gamma_green <= GAMMA_MAX)
+            gamma_green = mon->mon_gamma_green;
+
+    if (mon->mon_gamma_blue >= GAMMA_MIN &&
+        mon->mon_gamma_blue <= GAMMA_MAX)
+            gamma_blue = mon->mon_gamma_blue;
+
+    /* This avoids setting gamma 1.0 in case another cloned output on this crtc has a specific gamma. */
+    if (gamma_red != 1.0 || gamma_green != 1.0 || gamma_blue != 1.0) {
+	xf86DrvMsg(output->scrn->scrnIndex, X_INFO, "Output %s wants gamma correction (%.1f, %.1f, %.1f)\n", output->name, gamma_red, gamma_green, gamma_blue);
+	return xf86CrtcSetInitialGamma(output->crtc, gamma_red, gamma_green, gamma_blue);
+    }else
+	return TRUE;
+}
+
+/**
+ * Construct default screen configuration
+ *
+ * Given auto-detected (and, eventually, configured) values,
+ * construct a usable configuration for the system
+ *
+ * canGrow indicates that the driver can resize the screen to larger than its
+ * initially configured size via the config->funcs->resize hook.  If TRUE, this
+ * function will set virtualX and virtualY to match the initial configuration
+ * and leave config->max{Width,Height} alone.  If FALSE, it will bloat
+ * virtual[XY] to include the largest modes and set config->max{Width,Height}
+ * accordingly.
+ */
+
+Bool
+xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
+{
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			o, c;
+    xf86CrtcPtr		*crtcs;
+    DisplayModePtr	*modes;
+    Bool		*enabled;
+    int			width, height;
+    int			i = scrn->scrnIndex;
+    Bool have_outputs = TRUE;
+    Bool ret;
+
+    /* Set up the device options */
+    config->options = xnfalloc (sizeof (xf86DeviceOptions));
+    memcpy (config->options, xf86DeviceOptions, sizeof (xf86DeviceOptions));
+    xf86ProcessOptions (scrn->scrnIndex,
+			scrn->options,
+			config->options);
+    config->debug_modes = xf86ReturnOptValBool (config->options,
+						OPTION_MODEDEBUG, FALSE);
+
+    if (scrn->display->virtualX)
+	width = scrn->display->virtualX;
+    else
+	width = config->maxWidth;
+    if (scrn->display->virtualY)
+	height = scrn->display->virtualY;
+    else
+	height = config->maxHeight;
+
+    xf86ProbeOutputModes (scrn, width, height);
+
+    crtcs = xnfcalloc (config->num_output, sizeof (xf86CrtcPtr));
+    modes = xnfcalloc (config->num_output, sizeof (DisplayModePtr));
+    enabled = xnfcalloc (config->num_output, sizeof (Bool));
+    
+    ret = xf86CollectEnabledOutputs(scrn, config, enabled);
+    if (ret == FALSE && canGrow) {
+	xf86DrvMsg(i, X_WARNING, "Unable to find connected outputs - setting %dx%d initial framebuffer\n",
+		   NO_OUTPUT_DEFAULT_WIDTH, NO_OUTPUT_DEFAULT_HEIGHT);
+	have_outputs = FALSE;
+    } else {
+	if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
+	    xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
+	else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height))
+	    xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
+	else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
+	    xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n");
+	else if (xf86TargetFallback(scrn, config, modes, enabled, width, height))
+	    xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n");
+	else
+	    xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n");
+    }
+
+    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
+	if (!modes[o])
+	    xf86DrvMsg (scrn->scrnIndex, X_ERROR,
+			"Output %s enabled but has no modes\n",
+			config->output[o]->name);
+	else
+	    xf86DrvMsg (scrn->scrnIndex, X_INFO,
+			"Output %s using initial mode %s\n",
+			config->output[o]->name, modes[o]->name);
+    }
+
+    /*
+     * Set the position of each output
+     */
+    if (!xf86InitialOutputPositions (scrn, modes))
+    {
+	free(crtcs);
+	free(modes);
+	return FALSE;
+    }
+
+    /*
+     * Set initial panning of each output
+     */
+    xf86InitialPanning (scrn);
+	
+    /*
+     * Assign CRTCs to fit output configuration
+     */
+    if (have_outputs && !xf86PickCrtcs (scrn, crtcs, modes, 0, width, height))
+    {
+	free(crtcs);
+	free(modes);
+	return FALSE;
+    }
+    
+    /* XXX override xf86 common frame computation code */
+    
+    scrn->display->frameX0 = 0;
+    scrn->display->frameY0 = 0;
+    
+    for (c = 0; c < config->num_crtc; c++)
+    {
+	xf86CrtcPtr	crtc = config->crtc[c];
+
+	crtc->enabled = FALSE;
+	memset (&crtc->desiredMode, '\0', sizeof (crtc->desiredMode));
+	/* Set default gamma for all crtc's. */
+	/* This is done to avoid problems later on with cloned outputs. */
+	xf86CrtcSetInitialGamma(crtc, 1.0, 1.0, 1.0);
+    }
+
+    if (xf86_crtc_supports_gamma(scrn))
+	xf86DrvMsg(scrn->scrnIndex, X_INFO, "Using default gamma of (1.0, 1.0, 1.0) unless otherwise stated.\n");
+
+    /*
+     * Set initial configuration
+     */
+    for (o = 0; o < config->num_output; o++)
+    {
+	xf86OutputPtr	output = config->output[o];
+	DisplayModePtr	mode = modes[o];
+        xf86CrtcPtr	crtc = crtcs[o];
+
+	if (mode && crtc)
+	{
+	    crtc->desiredMode = *mode;
+	    crtc->desiredRotation = output->initial_rotation;
+	    crtc->desiredX = output->initial_x;
+	    crtc->desiredY = output->initial_y;
+	    crtc->desiredTransformPresent = FALSE;
+	    crtc->enabled = TRUE;
+	    memcpy (&crtc->panningTotalArea,    &output->initialTotalArea,    sizeof(BoxRec));
+	    memcpy (&crtc->panningTrackingArea, &output->initialTrackingArea, sizeof(BoxRec));
+	    memcpy (crtc->panningBorder,        output->initialBorder,        4*sizeof(INT16));
+	    output->crtc = crtc;
+	    if (!xf86OutputSetInitialGamma(output))
+		xf86DrvMsg (scrn->scrnIndex, X_WARNING, "Initial gamma correction for output %s: failed.\n", output->name);
+	} else {
+	    output->crtc = NULL;
+	}
+    }
+
+    if (scrn->display->virtualX == 0)
+    {
+	/*
+	 * Expand virtual size to cover the current config and potential mode
+	 * switches, if the driver can't enlarge the screen later.
+	 */
+	xf86DefaultScreenLimits (scrn, &width, &height, canGrow);
+    
+	if (have_outputs == FALSE) {
+	    if (width < NO_OUTPUT_DEFAULT_WIDTH && height < NO_OUTPUT_DEFAULT_HEIGHT) {
+		width = NO_OUTPUT_DEFAULT_WIDTH;
+		height = NO_OUTPUT_DEFAULT_HEIGHT;
+	    }
+	}
+
+	scrn->display->virtualX = width;
+	scrn->display->virtualY = height;
+    }
+
+    if (width > scrn->virtualX)
+	scrn->virtualX = width;
+    if (height > scrn->virtualY)
+	scrn->virtualY = height;
+
+    /*
+     * Make sure the configuration isn't too small.
+     */
+    if (width < config->minWidth || height < config->minHeight)
+	return FALSE;
+
+    /*
+     * Limit the crtc config to virtual[XY] if the driver can't grow the
+     * desktop.
+     */
+    if (!canGrow)
+    {
+	xf86CrtcSetSizeRange (scrn, config->minWidth, config->minHeight,
+			      width, height);
+    }
+
+    if (have_outputs) {
+	/* Mirror output modes to scrn mode list */
+	xf86SetScrnInfoModes (scrn);
+    } else {
+	/* Clear any existing modes from scrn->modes */
+	while (scrn->modes != NULL)
+	    xf86DeleteMode(&scrn->modes, scrn->modes);
+	scrn->modes = xf86ModesAdd(scrn->modes,
+				   xf86CVTMode(width, height, 60, 0, 0));
+    }
+
+    
+    free(crtcs);
+    free(modes);
+    return TRUE;
+}
+
+/*
+ * Check the CRTC we're going to map each output to vs. it's current
+ * CRTC.  If they don't match, we have to disable the output and the CRTC
+ * since the driver will have to re-route things.
+ */
+static void
+xf86PrepareOutputs (ScrnInfoPtr scrn)
+{
+    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			o;
+
+    for (o = 0; o < config->num_output; o++) {
+	xf86OutputPtr output = config->output[o];
+#if RANDR_GET_CRTC_INTERFACE
+	/* Disable outputs that are unused or will be re-routed */
+	if (!output->funcs->get_crtc ||
+	    output->crtc != (*output->funcs->get_crtc)(output) ||
+	    output->crtc == NULL)
+#endif
+	    (*output->funcs->dpms)(output, DPMSModeOff);
+    }
+}
+
+static void
+xf86PrepareCrtcs (ScrnInfoPtr scrn)
+{
+    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			c;
+
+    for (c = 0; c < config->num_crtc; c++) {
+#if RANDR_GET_CRTC_INTERFACE
+	xf86CrtcPtr	crtc = config->crtc[c];
+	xf86OutputPtr	output = NULL;
+	uint32_t	desired_outputs = 0, current_outputs = 0;
+	int		o;
+
+	for (o = 0; o < config->num_output; o++) {
+	    output = config->output[o];
+	    if (output->crtc == crtc)
+		desired_outputs |= (1<<o);
+	    /* If we can't tell where it's mapped, force it off */
+	    if (!output->funcs->get_crtc) {
+		desired_outputs = 0;
+		break;
+	    }
+	    if ((*output->funcs->get_crtc)(output) == crtc)
+		current_outputs |= (1<<o);
+	}
+
+	/*
+	 * If mappings are different or the CRTC is unused,
+	 * we need to disable it
+	 */
+	if (desired_outputs != current_outputs ||
+	    !desired_outputs)
+	    (*crtc->funcs->dpms)(crtc, DPMSModeOff);
+#else
+	(*crtc->funcs->dpms)(crtc, DPMSModeOff);
+#endif
+    }
+}
+
+/*
+ * Using the desired mode information in each crtc, set
+ * modes (used in EnterVT functions, or at server startup)
+ */
+
+Bool
+xf86SetDesiredModes (ScrnInfoPtr scrn)
+{
+    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CrtcPtr         crtc = config->crtc[0];
+    int			c;
+
+    /* A driver with this hook will take care of this */
+    if (!crtc->funcs->set_mode_major) {
+	xf86PrepareOutputs(scrn);
+	xf86PrepareCrtcs(scrn);
+    }
+
+    for (c = 0; c < config->num_crtc; c++)
+    {
+	xf86OutputPtr	output = NULL;
+	int		o;
+	RRTransformPtr	transform;
+
+	crtc = config->crtc[c];
+
+	/* Skip disabled CRTCs */
+	if (!crtc->enabled)
+	    continue;
+
+	if (xf86CompatOutput(scrn) && xf86CompatCrtc(scrn) == crtc)
+	    output = xf86CompatOutput(scrn);
+	else
+	{
+	    for (o = 0; o < config->num_output; o++)
+		if (config->output[o]->crtc == crtc)
+		{
+		    output = config->output[o];
+		    break;
+		}
+	}
+	/* paranoia */
+	if (!output)
+	    continue;
+
+	/* Mark that we'll need to re-set the mode for sure */
+	memset(&crtc->mode, 0, sizeof(crtc->mode));
+	if (!crtc->desiredMode.CrtcHDisplay)
+	{
+	    DisplayModePtr  mode = xf86OutputFindClosestMode (output, scrn->currentMode);
+
+	    if (!mode)
+		return FALSE;
+	    crtc->desiredMode = *mode;
+	    crtc->desiredRotation = RR_Rotate_0;
+	    crtc->desiredTransformPresent = FALSE;
+	    crtc->desiredX = 0;
+	    crtc->desiredY = 0;
+	}
+
+	if (crtc->desiredTransformPresent)
+	    transform = &crtc->desiredTransform;
+	else
+	    transform = NULL;
+	if (!xf86CrtcSetModeTransform (crtc, &crtc->desiredMode, crtc->desiredRotation,
+				       transform, crtc->desiredX, crtc->desiredY))
+	    return FALSE;
+    }
+
+    xf86DisableUnusedFunctions(scrn);
+    return TRUE;
+}
+
+/**
+ * In the current world order, there are lists of modes per output, which may
+ * or may not include the mode that was asked to be set by XFree86's mode
+ * selection.  Find the closest one, in the following preference order:
+ *
+ * - Equality
+ * - Closer in size to the requested mode, but no larger
+ * - Closer in refresh rate to the requested mode.
+ */
+
+DisplayModePtr
+xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired)
+{
+    DisplayModePtr	best = NULL, scan = NULL;
+
+    for (scan = output->probed_modes; scan != NULL; scan = scan->next) 
+    {
+	/* If there's an exact match, we're done. */
+	if (xf86ModesEqual(scan, desired)) {
+	    best = desired;
+	    break;
+	}
+
+	/* Reject if it's larger than the desired mode. */
+	if (scan->HDisplay > desired->HDisplay || 
+	    scan->VDisplay > desired->VDisplay)
+	{
+	    continue;
+	}
+
+	/*
+	 * If we haven't picked a best mode yet, use the first
+	 * one in the size range
+	 */
+	if (best == NULL) 
+	{
+	    best = scan;
+	    continue;
+	}
+
+	/* Find if it's closer to the right size than the current best
+	 * option.
+	 */
+	if ((scan->HDisplay > best->HDisplay &&
+	     scan->VDisplay >= best->VDisplay) ||
+	    (scan->HDisplay >= best->HDisplay &&
+	     scan->VDisplay > best->VDisplay))
+	{
+	    best = scan;
+	    continue;
+	}
+
+	/* Find if it's still closer to the right refresh than the current
+	 * best resolution.
+	 */
+	if (scan->HDisplay == best->HDisplay &&
+	    scan->VDisplay == best->VDisplay &&
+	    (fabs(scan->VRefresh - desired->VRefresh) <
+	     fabs(best->VRefresh - desired->VRefresh))) {
+	    best = scan;
+	}
+    }
+    return best;
+}
+
+/**
+ * When setting a mode through XFree86-VidModeExtension or XFree86-DGA,
+ * take the specified mode and apply it to the crtc connected to the compat
+ * output. Then, find similar modes for the other outputs, as with the
+ * InitialConfiguration code above. The goal is to clone the desired
+ * mode across all outputs that are currently active.
+ */
+
+Bool
+xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
+{
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(pScrn);
+    Bool		ok = TRUE;
+    xf86OutputPtr	compat_output;
+    DisplayModePtr	compat_mode = NULL;
+    int			c;
+
+    /*
+     * Let the compat output drive the final mode selection
+     */
+    compat_output = xf86CompatOutput(pScrn);
+    if (compat_output)
+	compat_mode = xf86OutputFindClosestMode (compat_output, desired);
+    if (compat_mode)
+	desired = compat_mode;
+    
+    for (c = 0; c < config->num_crtc; c++)
+    {
+	xf86CrtcPtr	crtc = config->crtc[c];
+	DisplayModePtr	crtc_mode = NULL;
+	int		o;
+
+	if (!crtc->enabled)
+	    continue;
+	
+	for (o = 0; o < config->num_output; o++)
+	{
+	    xf86OutputPtr   output = config->output[o];
+	    DisplayModePtr  output_mode;
+
+	    /* skip outputs not on this crtc */
+	    if (output->crtc != crtc)
+		continue;
+	    
+	    if (crtc_mode)
+	    {
+		output_mode = xf86OutputFindClosestMode (output, crtc_mode);
+		if (output_mode != crtc_mode)
+		    output->crtc = NULL;
+	    }
+	    else
+		crtc_mode = xf86OutputFindClosestMode (output, desired);
+	}
+	if (!crtc_mode)
+	{
+	    crtc->enabled = FALSE;
+	    continue;
+	}
+	if (!xf86CrtcSetModeTransform (crtc, crtc_mode, rotation, NULL, 0, 0))
+	    ok = FALSE;
+	else
+	{
+	    crtc->desiredMode = *crtc_mode;
+	    crtc->desiredRotation = rotation;
+	    crtc->desiredTransformPresent = FALSE;
+	    crtc->desiredX = 0;
+	    crtc->desiredY = 0;
+	}
+    }
+    xf86DisableUnusedFunctions(pScrn);
+#ifdef RANDR_12_INTERFACE
+    xf86RandR12TellChanged (pScrn->pScreen);
+#endif
+    return ok;
+}
+
+
+/**
+ * Set the DPMS power mode of all outputs and CRTCs.
+ *
+ * If the new mode is off, it will turn off outputs and then CRTCs.
+ * Otherwise, it will affect CRTCs before outputs.
+ */
+void
+xf86DPMSSet(ScrnInfoPtr scrn, int mode, int flags)
+{
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			i;
+
+    if (!scrn->vtSema)
+	return;
+
+    if (mode == DPMSModeOff) {
+	for (i = 0; i < config->num_output; i++) {
+	    xf86OutputPtr output = config->output[i];
+	    if (output->crtc != NULL)
+		(*output->funcs->dpms) (output, mode);
+	}
+    }
+
+    for (i = 0; i < config->num_crtc; i++) {
+	xf86CrtcPtr crtc = config->crtc[i];
+	if (crtc->enabled)
+	    (*crtc->funcs->dpms) (crtc, mode);
+    }
+
+    if (mode != DPMSModeOff) {
+	for (i = 0; i < config->num_output; i++) {
+	    xf86OutputPtr output = config->output[i];
+	    if (output->crtc != NULL)
+		(*output->funcs->dpms) (output, mode);
+	}
+    }
+}
+
+/**
+ * Implement the screensaver by just calling down into the driver DPMS hooks.
+ *
+ * Even for monitors with no DPMS support, by the definition of our DPMS hooks,
+ * the outputs will still get disabled (blanked).
+ */
+Bool
+xf86SaveScreen(ScreenPtr pScreen, int mode)
+{
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+
+    if (xf86IsUnblank(mode))
+	xf86DPMSSet(pScrn, DPMSModeOn, 0);
+    else
+	xf86DPMSSet(pScrn, DPMSModeOff, 0);
+
+    return TRUE;
+}
+
+/**
+ * Disable all inactive crtcs and outputs
+ */
+void
+xf86DisableUnusedFunctions(ScrnInfoPtr pScrn)
+{
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int			o, c;
+
+    for (o = 0; o < xf86_config->num_output; o++) 
+    {
+	xf86OutputPtr  output = xf86_config->output[o];
+	if (!output->crtc) 
+	    (*output->funcs->dpms)(output, DPMSModeOff);
+    }
+
+    for (c = 0; c < xf86_config->num_crtc; c++) 
+    {
+	xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+	if (!crtc->enabled) 
+	{
+	    crtc->funcs->dpms(crtc, DPMSModeOff);
+	    memset(&crtc->mode, 0, sizeof(crtc->mode));
+	    xf86RotateDestroy(crtc);
+	    crtc->active = FALSE;
+	}
+    }
+    if (pScrn->pScreen)
+	xf86_crtc_notify(pScrn->pScreen);
+    if (pScrn->ModeSet)
+	pScrn->ModeSet(pScrn);
+}
+
+#ifdef RANDR_12_INTERFACE
+
+#define EDID_ATOM_NAME		"EDID"
+
+/**
+ * Set the RandR EDID property
+ */
+static void
+xf86OutputSetEDIDProperty (xf86OutputPtr output, void *data, int data_len)
+{
+    Atom edid_atom = MakeAtom(EDID_ATOM_NAME, sizeof(EDID_ATOM_NAME) - 1, TRUE);
+
+    /* This may get called before the RandR resources have been created */
+    if (output->randr_output == NULL)
+	return;
+
+    if (data_len != 0) {
+	RRChangeOutputProperty(output->randr_output, edid_atom, XA_INTEGER, 8,
+			       PropModeReplace, data_len, data, FALSE, TRUE);
+    } else {
+	RRDeleteOutputProperty(output->randr_output, edid_atom);
+    }
+}
+
+#endif
+
+/* Pull out a phyiscal size from a detailed timing if available. */
+struct det_phySize_parameter {
+    xf86OutputPtr output;
+    ddc_quirk_t quirks;
+    Bool ret;
+};
+
+static void  handle_detailed_physical_size(struct detailed_monitor_section
+		                          *det_mon, void *data)
+{
+    struct det_phySize_parameter *p;
+    p = (struct det_phySize_parameter *)data;
+
+    if (p->ret == TRUE )
+        return ;
+
+    xf86DetTimingApplyQuirks(det_mon, p->quirks,
+                             p->output->MonInfo->features.hsize,
+                             p->output->MonInfo->features.vsize);
+    if (det_mon->type == DT &&
+        det_mon->section.d_timings.h_size != 0 &&
+        det_mon->section.d_timings.v_size != 0) {
+
+        p->output->mm_width = det_mon->section.d_timings.h_size;
+        p->output->mm_height = det_mon->section.d_timings.v_size;
+        p->ret = TRUE;
+    }
+}
+
+/**
+ * Set the EDID information for the specified output
+ */
+void
+xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon)
+{
+    ScrnInfoPtr		scrn = output->scrn;
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    Bool		debug_modes = config->debug_modes || xf86Initialising;
+#ifdef RANDR_12_INTERFACE
+    int			size;
+#endif
+    
+    free(output->MonInfo);
+    
+    output->MonInfo = edid_mon;
+    output->mm_width = 0;
+    output->mm_height = 0;
+
+    if (debug_modes) {
+	xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n",
+		   output->name);
+	xf86PrintEDID(edid_mon);
+    }
+
+    /* Set the DDC properties for the 'compat' output */
+    if (output == xf86CompatOutput(scrn))
+        xf86SetDDCproperties(scrn, edid_mon);
+
+#ifdef RANDR_12_INTERFACE
+    /* Set the RandR output properties */
+    size = 0;
+    if (edid_mon)
+    {
+	if (edid_mon->ver.version == 1) {
+	    size = 128;
+	    if (edid_mon->flags & EDID_COMPLETE_RAWDATA)
+		size += edid_mon->no_sections * 128;
+	} else if (edid_mon->ver.version == 2)
+	    size = 256;
+    }
+    xf86OutputSetEDIDProperty (output, edid_mon ? edid_mon->rawData : NULL, size);
+#endif
+
+    if (edid_mon) {
+
+        struct det_phySize_parameter p;
+        p.output = output;
+        p.quirks = xf86DDCDetectQuirks(scrn->scrnIndex,edid_mon, FALSE);
+        p.ret = FALSE;
+        xf86ForEachDetailedBlock(edid_mon,
+                                 handle_detailed_physical_size, &p);
+
+	/* if no mm size is available from a detailed timing, check the max size field */
+	if ((!output->mm_width || !output->mm_height) &&
+	    (edid_mon->features.hsize && edid_mon->features.vsize))
+	{
+	    output->mm_width = edid_mon->features.hsize * 10;
+	    output->mm_height = edid_mon->features.vsize * 10;
+	}
+    }
+}
+
+/**
+ * Return the list of modes supported by the EDID information
+ * stored in 'output'
+ */
+DisplayModePtr
+xf86OutputGetEDIDModes (xf86OutputPtr output)
+{
+    ScrnInfoPtr	scrn = output->scrn;
+    xf86MonPtr	edid_mon = output->MonInfo;
+
+    if (!edid_mon)
+	return NULL;
+    return xf86DDCGetModes(scrn->scrnIndex, edid_mon);
+}
+
+/* maybe we should care about DDC1?  meh. */
+xf86MonPtr
+xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
+{
+    ScrnInfoPtr	scrn = output->scrn;
+    xf86MonPtr mon;
+
+    mon = xf86DoEEDID(scrn->scrnIndex, pDDCBus, TRUE);
+    if (mon)
+        xf86DDCApplyQuirks(scrn->scrnIndex, mon);
+
+    return mon;
+}
+
+static char *_xf86ConnectorNames[] = {
+					"None", "VGA", "DVI-I", "DVI-D",
+					"DVI-A", "Composite", "S-Video",
+					"Component", "LFP", "Proprietary",
+					"HDMI", "DisplayPort",
+				     };
+char *
+xf86ConnectorGetName(xf86ConnectorType connector)
+{
+    return _xf86ConnectorNames[connector];
+}
+
+static void
+x86_crtc_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b)
+{
+    dest->x1 = a->x1 > b->x1 ? a->x1 : b->x1;
+    dest->x2 = a->x2 < b->x2 ? a->x2 : b->x2;
+    dest->y1 = a->y1 > b->y1 ? a->y1 : b->y1;
+    dest->y2 = a->y2 < b->y2 ? a->y2 : b->y2;
+
+    if (dest->x1 >= dest->x2 || dest->y1 >= dest->y2)
+	dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0;
+}
+
+static void
+x86_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box)
+{
+    if (crtc->enabled) {
+	crtc_box->x1 = crtc->x;
+	crtc_box->x2 = crtc->x + xf86ModeWidth(&crtc->mode, crtc->rotation);
+	crtc_box->y1 = crtc->y;
+	crtc_box->y2 = crtc->y + xf86ModeHeight(&crtc->mode, crtc->rotation);
+    } else
+	crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0;
+}
+
+static int
+xf86_crtc_box_area(BoxPtr box)
+{
+    return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
+}
+
+/*
+ * Return the crtc covering 'box'. If two crtcs cover a portion of
+ * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
+ * with greater coverage
+ */
+
+static xf86CrtcPtr
+xf86_covering_crtc(ScrnInfoPtr pScrn,
+		   BoxPtr      box,
+		   xf86CrtcPtr desired,
+		   BoxPtr      crtc_box_ret)
+{
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    xf86CrtcPtr		crtc, best_crtc;
+    int			coverage, best_coverage;
+    int			c;
+    BoxRec		crtc_box, cover_box;
+
+    best_crtc = NULL;
+    best_coverage = 0;
+    crtc_box_ret->x1 = 0;
+    crtc_box_ret->x2 = 0;
+    crtc_box_ret->y1 = 0;
+    crtc_box_ret->y2 = 0;
+    for (c = 0; c < xf86_config->num_crtc; c++) {
+	crtc = xf86_config->crtc[c];
+	x86_crtc_box(crtc, &crtc_box);
+	x86_crtc_box_intersect(&cover_box, &crtc_box, box);
+	coverage = xf86_crtc_box_area(&cover_box);
+	if (coverage && crtc == desired) {
+	    *crtc_box_ret = crtc_box;
+	    return crtc;
+	} else if (coverage > best_coverage) {
+	    *crtc_box_ret = crtc_box;
+	    best_crtc = crtc;
+	    best_coverage = coverage;
+	}
+    }
+    return best_crtc;
+}
+
+/*
+ * For overlay video, compute the relevant CRTC and
+ * clip video to that.
+ *
+ * returning FALSE means there was a memory failure of some kind,
+ * not that the video shouldn't be displayed
+ */
+
+Bool
+xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
+			    xf86CrtcPtr *crtc_ret,
+			    xf86CrtcPtr desired_crtc,
+			    BoxPtr      dst,
+			    INT32	*xa,
+			    INT32	*xb,
+			    INT32	*ya,
+			    INT32	*yb,
+			    RegionPtr   reg,
+			    INT32	width,
+			    INT32	height)
+{
+    Bool	ret;
+    RegionRec	crtc_region_local;
+    RegionPtr	crtc_region = reg;
+    
+    if (crtc_ret) {
+	BoxRec		crtc_box;
+	xf86CrtcPtr	crtc = xf86_covering_crtc(pScrn, dst,
+						  desired_crtc,
+						  &crtc_box);
+
+	if (crtc) {
+	    RegionInit(&crtc_region_local, &crtc_box, 1);
+	    crtc_region = &crtc_region_local;
+	    RegionIntersect(crtc_region, crtc_region, reg);
+	}
+	*crtc_ret = crtc;
+    }
+
+    ret = xf86XVClipVideoHelper(dst, xa, xb, ya, yb, 
+				crtc_region, width, height);
+
+    if (crtc_region != reg)
+	RegionUninit(&crtc_region_local);
+
+    return ret;
+}
+
+xf86_crtc_notify_proc_ptr
+xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
+{
+    if (xf86CrtcConfigPrivateIndex != -1)
+    {
+	ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
+	xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+	xf86_crtc_notify_proc_ptr	old;
+	
+	old = config->xf86_crtc_notify;
+	config->xf86_crtc_notify = new;
+	return old;
+    }
+    return NULL;
+}
+
+void
+xf86_unwrap_crtc_notify(ScreenPtr screen, xf86_crtc_notify_proc_ptr old)
+{
+    if (xf86CrtcConfigPrivateIndex != -1)
+    {
+	ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
+	xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    
+	config->xf86_crtc_notify = old;
+    }
+}
+
+void
+xf86_crtc_notify(ScreenPtr screen)
+{
+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);
+    
+    if (config->xf86_crtc_notify)
+	config->xf86_crtc_notify(screen);
+}
+
+Bool
+xf86_crtc_supports_gamma(ScrnInfoPtr pScrn)
+{
+    if (xf86CrtcConfigPrivateIndex != -1) {
+	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+	xf86CrtcPtr crtc;
+
+	/* for multiple drivers loaded we need this */
+	if (!xf86_config)
+		return FALSE;
+	if (xf86_config->num_crtc == 0)
+	    return FALSE;
+	crtc = xf86_config->crtc[0];
+
+	return crtc->funcs->gamma_set != NULL;
+    }
+
+    return FALSE;
+}
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.h b/xorg-server/hw/xfree86/modes/xf86Crtc.h
index e4037142f..68a968cc2 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.h
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.h
@@ -1,1075 +1,972 @@
-/*

- * Copyright © 2006 Keith Packard

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that copyright

- * notice and this permission notice appear in supporting documentation, and

- * that the name of the copyright holders not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  The copyright holders make no representations

- * about the suitability of this software for any purpose.  It is provided "as

- * is" without express or implied warranty.

- *

- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

- * OF THIS SOFTWARE.

- */

-#ifndef _XF86CRTC_H_

-#define _XF86CRTC_H_

-

-#include <edid.h>

-#include "randrstr.h"

-#if XF86_MODES_RENAME

-#include "xf86Rename.h"

-#endif

-#include "xf86Modes.h"

-#include "xf86Cursor.h"

-#include "xf86i2c.h"

-#include "damage.h"

-#include "picturestr.h"

-

-/* Compat definitions for older X Servers. */

-#ifndef M_T_PREFERRED

-#define M_T_PREFERRED	0x08

-#endif

-#ifndef M_T_DRIVER

-#define M_T_DRIVER	0x40

-#endif

-#ifndef M_T_USERPREF

-#define M_T_USERPREF	0x80

-#endif

-#ifndef HARDWARE_CURSOR_ARGB

-#define HARDWARE_CURSOR_ARGB				0x00004000

-#endif

-

-typedef struct _xf86Crtc xf86CrtcRec, *xf86CrtcPtr;

-typedef struct _xf86Output xf86OutputRec, *xf86OutputPtr;

-

-/* define a standard for connector types */

-typedef enum _xf86ConnectorType {

-   XF86ConnectorNone,

-   XF86ConnectorVGA,

-   XF86ConnectorDVI_I,

-   XF86ConnectorDVI_D,

-   XF86ConnectorDVI_A,

-   XF86ConnectorComposite,

-   XF86ConnectorSvideo,

-   XF86ConnectorComponent,

-   XF86ConnectorLFP,

-   XF86ConnectorProprietary,

-   XF86ConnectorHDMI,

-   XF86ConnectorDisplayPort,

-} xf86ConnectorType;

-

-typedef enum _xf86OutputStatus {

-   XF86OutputStatusConnected,

-   XF86OutputStatusDisconnected,

-   XF86OutputStatusUnknown

-} xf86OutputStatus;

-

-typedef enum _xf86CrtcSetFlags {

-    XF86CrtcSetMode = 1,		/* mode */

-    XF86CrtcSetOutput = 2,		/* outputs */

-    XF86CrtcSetOrigin = 4,		/* x/y */

-    XF86CrtcSetTransform = 8,		/* transform */

-    XF86CrtcSetRotation = 16,		/* rotation */

-    XF86CrtcSetProperty = 32,		/* output property */

-    XF86CrtcSetScanoutPixmap = 64,	/* scanout pixmap */

-} xf86CrtcSetFlags;

-

-typedef struct _xf86CrtcSet {

-    xf86CrtcSetFlags	flags;

-    DisplayModePtr	mode;

-    Rotation		rotation;

-    RRTransformPtr	transform;

-    int			x, y;

-    PixmapPtr		scanout_pixmap;

-} xf86CrtcSetRec;

-

-typedef struct _xf86CrtcFuncs {

-   /**

-    * Turns the crtc on/off, or sets intermediate power levels if available.

-    *

-    * Unsupported intermediate modes drop to the lower power setting.  If the

-    * mode is DPMSModeOff, the crtc must be disabled sufficiently for it to

-    * be safe to call mode_set.

-    */

-   void

-    (*dpms)(xf86CrtcPtr		crtc,

-	    int		    	mode);

-

-   /**

-    * Saves the crtc's state for restoration on VT switch.

-    */

-   void

-    (*save)(xf86CrtcPtr		crtc);

-

-   /**

-    * Restore's the crtc's state at VT switch.

-    */

-   void

-    (*restore)(xf86CrtcPtr	crtc);

-

-    /**

-     * Lock CRTC prior to mode setting, mostly for DRI.

-     * Returns whether unlock is needed

-     */

-    Bool

-    (*lock) (xf86CrtcPtr crtc);

-    

-    /**

-     * Unlock CRTC after mode setting, mostly for DRI

-     */

-    void

-    (*unlock) (xf86CrtcPtr crtc);

-    

-    /**

-     * Callback to adjust the mode to be set in the CRTC.

-     *

-     * This allows a CRTC to adjust the clock or even the entire set of

-     * timings, which is used for panels with fixed timings or for

-     * buses with clock limitations.

-     */

-    Bool

-    (*mode_fixup)(xf86CrtcPtr crtc,

-		  DisplayModePtr mode,

-		  DisplayModePtr adjusted_mode);

-

-    /**

-     * Prepare CRTC for an upcoming mode set.

-     */

-    void

-    (*prepare)(xf86CrtcPtr crtc);

-

-    /**

-     * Callback for setting up a video mode after fixups have been made.

-     */

-    void

-    (*mode_set)(xf86CrtcPtr crtc,

-		DisplayModePtr mode,

-		DisplayModePtr adjusted_mode,

-		int x, int y);

-

-    /**

-     * Commit mode changes to a CRTC

-     */

-    void

-    (*commit)(xf86CrtcPtr crtc);

-

-    /* Set the color ramps for the CRTC to the given values. */

-    void

-    (*gamma_set)(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,

-		 int size);

-

-    /**

-     * Allocate the shadow area, delay the pixmap creation until needed

-     */

-    void *

-    (*shadow_allocate) (xf86CrtcPtr crtc, int width, int height);

-    

-    /**

-     * Create shadow pixmap for rotation support

-     */

-    PixmapPtr

-    (*shadow_create) (xf86CrtcPtr crtc, void *data, int width, int height);

-    

-    /**

-     * Destroy shadow pixmap

-     */

-    void

-    (*shadow_destroy) (xf86CrtcPtr crtc, PixmapPtr pPixmap, void *data);

-

-    /**

-     * Set cursor colors

-     */

-    void

-    (*set_cursor_colors) (xf86CrtcPtr crtc, int bg, int fg);

-

-    /**

-     * Set cursor position

-     */

-    void

-    (*set_cursor_position) (xf86CrtcPtr crtc, int x, int y);

-

-    /**

-     * Show cursor

-     */

-    void

-    (*show_cursor) (xf86CrtcPtr crtc);

-

-    /**

-     * Hide cursor

-     */

-    void

-    (*hide_cursor) (xf86CrtcPtr crtc);

-

-    /**

-     * Load monochrome image

-     */

-    void

-    (*load_cursor_image) (xf86CrtcPtr crtc, CARD8 *image);

-

-    /**

-     * Load ARGB image

-     */

-     void

-     (*load_cursor_argb) (xf86CrtcPtr crtc, CARD32 *image);

-     

-    /**

-     * Clean up driver-specific bits of the crtc

-     */

-    void

-    (*destroy) (xf86CrtcPtr	crtc);

-

-    /**

-     * Less fine-grained mode setting entry point for kernel modesetting

-     */

-    Bool

-    (*set_mode_major)(xf86CrtcPtr crtc, DisplayModePtr mode,

-		      Rotation rotation, int x, int y);

-

-    /**

-     * Callback for panning. Doesn't change the mode.

-     * Added in ABI version 2

-     */

-    void

-    (*set_origin)(xf86CrtcPtr crtc, int x, int y);

-

-    /**

-     * General mode setting entry point that does everything

-     */

-    Bool

-    (*set)(xf86CrtcPtr crtc, xf86CrtcSetFlags flags);

-

-} xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;

-

-#define XF86_CRTC_VERSION 3

-

-struct _xf86Crtc {

-    /**

-     * ABI versioning

-     */

-    int version;

-

-    /**

-     * Associated ScrnInfo

-     */

-    ScrnInfoPtr	    scrn;

-    

-    /**

-     * Desired state of this CRTC

-     *

-     * Set when this CRTC should be driving one or more outputs 

-     */

-    Bool	    enabled;

-    

-    /**

-     * Active mode

-     *

-     * This reflects the mode as set in the CRTC currently

-     * It will be cleared when the VT is not active or

-     * during server startup

-     */

-    DisplayModeRec  mode;

-    Rotation	    rotation;

-    PixmapPtr	    rotatedPixmap;

-    void	    *rotatedData;

-    PixmapPtr	    scanoutPixmap;

-    

-    /**

-     * Position on screen

-     *

-     * Locates this CRTC within the frame buffer

-     */

-    int		    x, y;

-    

-    /**

-     * Desired mode

-     *

-     * This is set to the requested mode, independent of

-     * whether the VT is active. In particular, it receives

-     * the startup configured mode and saves the active mode

-     * on VT switch.

-     */

-    DisplayModeRec  desiredMode;

-    Rotation	    desiredRotation;

-    int		    desiredX, desiredY;

-    

-    /** crtc-specific functions */

-    const xf86CrtcFuncsRec *funcs;

-

-    /**

-     * Driver private

-     *

-     * Holds driver-private information

-     */

-    void	    *driver_private;

-

-#ifdef RANDR_12_INTERFACE

-    /**

-     * RandR crtc

-     *

-     * When RandR 1.2 is available, this

-     * points at the associated crtc object

-     */

-    RRCrtcPtr	    randr_crtc;

-#else

-    void	    *randr_crtc;

-#endif

-

-    /**

-     * Current cursor is ARGB

-     */

-    Bool	    cursor_argb;

-    /**

-     * Track whether cursor is within CRTC range 

-     */

-    Bool	    cursor_in_range;

-    /**

-     * Track state of cursor associated with this CRTC

-     */

-    Bool	    cursor_shown;

-

-    /**

-     * Current transformation matrix

-     */

-    PictTransform   crtc_to_framebuffer;

-    /* framebuffer_to_crtc was removed in ABI 2 */

-    struct pict_f_transform f_crtc_to_framebuffer; /* ABI 2 */

-    struct pict_f_transform f_framebuffer_to_crtc; /* ABI 2 */

-    PictFilterPtr   filter; /* ABI 2 */

-    xFixed	    *params; /* ABI 2 */

-    int		    nparams; /* ABI 2 */

-    int		    filter_width; /* ABI 2 */

-    int		    filter_height; /* ABI 2 */

-    Bool	    transform_in_use;

-    Bool	    sprite_transform_in_use;

-    RRTransformRec  transform; /* ABI 2 */

-    Bool	    transformPresent; /* ABI 2 */

-    RRTransformRec  desiredTransform; /* ABI 2 */

-    Bool	    desiredTransformPresent; /* ABI 2 */

-    /**

-     * Bounding box in screen space

-     */

-    BoxRec	    bounds;

-    /**

-     * Panning:

-     * TotalArea: total panning area, larger than CRTC's size

-     * TrackingArea: Area of the pointer for which the CRTC is panned

-     * border: Borders of the displayed CRTC area which induces panning if the pointer reaches them

-     * Added in ABI version 2

-     */

-    BoxRec          panningTotalArea;

-    BoxRec          panningTrackingArea;

-    INT16           panningBorder[4];

-

-    /**

-     * Current gamma, especially useful after initial config.

-     * Added in ABI version 3

-     */

-    CARD16 *gamma_red;

-    CARD16 *gamma_green;

-    CARD16 *gamma_blue;

-    int gamma_size;

-

-    /**

-     * Actual state of this CRTC

-     *

-     * Set to TRUE after modesetting, set to FALSE if no outputs are connected

-     * Added in ABI version 3

-     */

-    Bool	    active;

-    /**

-     * Clear the shadow

-     */

-    Bool	    shadowClear;

-

-    /**

-     * Sprite position transforms

-     */

-

-    /* Transform a screen coordinate to a crtc coordinate */

-    struct pixman_f_transform f_screen_to_crtc;

-

-    /* The user-specified portion of the screen to crtc conversion */

-    struct pixman_f_transform user_sprite_position_transform;

-

-    /* Transform a hardware cursor coordinate to a cursor coordinate */

-    struct pixman_f_transform f_crtc_to_cursor;

-

-    /* The user-specified portion of the cursor to hardware transform */

-    struct pixman_f_transform user_sprite_image_transform;

-};

-

-typedef struct _xf86OutputFuncs {

-    /**

-     * Called to allow the output a chance to create properties after the

-     * RandR objects have been created.

-     */

-    void

-    (*create_resources)(xf86OutputPtr output);

-

-    /**

-     * Turns the output on/off, or sets intermediate power levels if available.

-     *

-     * Unsupported intermediate modes drop to the lower power setting.  If the

-     * mode is DPMSModeOff, the output must be disabled, as the DPLL may be

-     * disabled afterwards.

-     */

-    void

-    (*dpms)(xf86OutputPtr	output,

-	    int			mode);

-

-    /**

-     * Saves the output's state for restoration on VT switch.

-     */

-    void

-    (*save)(xf86OutputPtr	output);

-

-    /**

-     * Restore's the output's state at VT switch.

-     */

-    void

-    (*restore)(xf86OutputPtr	output);

-

-    /**

-     * Callback for testing a video mode for a given output.

-     *

-     * This function should only check for cases where a mode can't be supported

-     * on the output specifically, and not represent generic CRTC limitations.

-     *

-     * \return MODE_OK if the mode is valid, or another MODE_* otherwise.

-     */

-    int

-    (*mode_valid)(xf86OutputPtr	    output,

-		  DisplayModePtr    pMode);

-

-    /**

-     * Callback to adjust the mode to be set in the CRTC.

-     *

-     * This allows an output to adjust the clock or even the entire set of

-     * timings, which is used for panels with fixed timings or for

-     * buses with clock limitations.

-     */

-    Bool

-    (*mode_fixup)(xf86OutputPtr output,

-		  DisplayModePtr mode,

-		  DisplayModePtr adjusted_mode);

-

-    /**

-     * Callback for preparing mode changes on an output

-     */

-    void

-    (*prepare)(xf86OutputPtr output);

-

-    /**

-     * Callback for committing mode changes on an output

-     */

-    void

-    (*commit)(xf86OutputPtr output);

-

-    /**

-     * Callback for setting up a video mode after fixups have been made.

-     *

-     * This is only called while the output is disabled.  The dpms callback

-     * must be all that's necessary for the output, to turn the output on

-     * after this function is called.

-     */

-    void

-    (*mode_set)(xf86OutputPtr  output,

-		DisplayModePtr mode,

-		DisplayModePtr adjusted_mode);

-

-    /**

-     * Probe for a connected output, and return detect_status.

-     */

-    xf86OutputStatus

-    (*detect)(xf86OutputPtr	    output);

-

-    /**

-     * Query the device for the modes it provides.

-     *

-     * This function may also update MonInfo, mm_width, and mm_height.

-     *

-     * \return singly-linked list of modes or NULL if no modes found.

-     */

-    DisplayModePtr

-    (*get_modes)(xf86OutputPtr	    output);

-

-#ifdef RANDR_12_INTERFACE

-    /**

-     * Callback when an output's property has changed.

-     */

-    Bool

-    (*set_property)(xf86OutputPtr output,

-		    Atom property,

-		    RRPropertyValuePtr value);

-#endif

-#ifdef RANDR_13_INTERFACE

-    /**

-     * Callback to get an updated property value

-     */

-    Bool

-    (*get_property)(xf86OutputPtr output,

-		    Atom property);

-#endif

-#ifdef RANDR_GET_CRTC_INTERFACE

-    /**

-     * Callback to get current CRTC for a given output

-     */

-    xf86CrtcPtr

-    (*get_crtc)(xf86OutputPtr output);

-#endif

-    /**

-     * Clean up driver-specific bits of the output

-     */

-    void

-    (*destroy) (xf86OutputPtr	    output);

-} xf86OutputFuncsRec, *xf86OutputFuncsPtr;

-

-

-#define XF86_OUTPUT_VERSION 2

-

-struct _xf86Output {

-    /**

-     * ABI versioning

-     */

-    int version;

-

-    /**

-     * Associated ScrnInfo

-     */

-    ScrnInfoPtr		scrn;

-

-    /**

-     * Currently connected crtc (if any)

-     *

-     * If this output is not in use, this field will be NULL.

-     */

-    xf86CrtcPtr		crtc;

-

-    /**

-     * Possible CRTCs for this output as a mask of crtc indices

-     */

-    CARD32		possible_crtcs;

-

-    /**

-     * Possible outputs to share the same CRTC as a mask of output indices

-     */

-    CARD32		possible_clones;

-    

-    /**

-     * Whether this output can support interlaced modes

-     */

-    Bool		interlaceAllowed;

-

-    /**

-     * Whether this output can support double scan modes

-     */

-    Bool		doubleScanAllowed;

-

-    /**

-     * List of available modes on this output.

-     *

-     * This should be the list from get_modes(), plus perhaps additional

-     * compatible modes added later.

-     */

-    DisplayModePtr	probed_modes;

-

-    /**

-     * Options parsed from the related monitor section

-     */

-    OptionInfoPtr	options;

-    

-    /**

-     * Configured monitor section

-     */

-    XF86ConfMonitorPtr  conf_monitor;

-    

-    /**

-     * Desired initial position

-     */

-    int			initial_x, initial_y;

-

-    /**

-     * Desired initial rotation

-     */

-    Rotation		initial_rotation;

-

-    /**

-     * Current connection status

-     *

-     * This indicates whether a monitor is known to be connected

-     * to this output or not, or whether there is no way to tell

-     */

-    xf86OutputStatus	status;

-

-    /** EDID monitor information */

-    xf86MonPtr		MonInfo;

-

-    /** subpixel order */

-    int			subpixel_order;

-

-    /** Physical size of the currently attached output device. */

-    int			mm_width, mm_height;

-

-    /** Output name */

-    char		*name;

-

-    /** output-specific functions */

-    const xf86OutputFuncsRec *funcs;

-

-    /** driver private information */

-    void		*driver_private;

-    

-    /** Whether to use the old per-screen Monitor config section */

-    Bool		use_screen_monitor;

-

-#ifdef RANDR_12_INTERFACE

-    /**

-     * RandR 1.2 output structure.

-     *

-     * When RandR 1.2 is available, this points at the associated

-     * RandR output structure and is created when this output is created

-     */

-    RROutputPtr		randr_output;

-#else

-    void		*randr_output;

-#endif

-    /** 

-     * Desired initial panning

-     * Added in ABI version 2

-     */

-    BoxRec          initialTotalArea;

-    BoxRec          initialTrackingArea;

-    INT16           initialBorder[4];

-};

-

-typedef enum _xf86SetConfigResponse {

-    xf86SetConfigFailed,		/* set_config failed */

-    xf86SetConfigChecked,		/* set_config validated the configuration */

-    xf86SetConfigDone,			/* set_config finished the work */

-} xf86SetConfigResponse;

-

-typedef struct _xf86CrtcSetConfig {

-    xf86CrtcPtr			crtc;

-    int				x, y;

-    DisplayModeRec		mode;

-    Rotation			rotation;

-    int				numOutputs;

-    xf86OutputPtr		*outputs;

-    struct pict_f_transform	sprite_position_transform;

-    struct pict_f_transform	sprite_image_transform;

-

-    /* Probably want some internal structure for the pixmap so that

-     * this can be set before the server is running

-     */

-    PixmapPtr			pixmap;

-    int				pixmap_x, pixmap_y;

-} xf86CrtcSetConfigRec, *xf86CrtcSetConfigPtr;

-

-typedef struct _xf86CrtcScanoutFormat {

-    int		    depth;

-    int		    bitsPerPixel;

-    int		    maxWidth, maxHeight;

-    Rotation	    rotations;

-    PictFormatShort format;

-} xf86CrtcScanoutFormat;

-

-typedef struct _xf86CrtcConfigFuncs {

-    /**

-     * Requests that the driver resize the screen.

-     *

-     * The driver is responsible for updating scrn->virtualX and scrn->virtualY.

-     * If the requested size cannot be set, the driver should leave those values

-     * alone and return FALSE.

-     *

-     * A naive driver that cannot reallocate the screen may simply change

-     * virtual[XY].  A more advanced driver will want to also change the

-     * devPrivate.ptr and devKind of the screen pixmap, update any offscreen

-     * pixmaps it may have moved, and change pScrn->displayWidth.

-     */

-    Bool

-    (*resize)(ScrnInfoPtr	scrn,

-	      int		width,

-	      int		height);

-

-    xf86SetConfigResponse

-    (*set_config) (ScrnInfoPtr		scrn,

-		   RRScreenConfigPtr	screen_config,

-		   xf86CrtcSetConfigPtr	crtc_configs,

-		   int			num_configs);

-

-    /**

-     * Create a scanout pixmap

-     */

-    PixmapPtr

-    (*create_scanout_pixmap)(ScrnInfoPtr		scrn,

-			     int			width,

-			     int			height,

-			     Rotation			rotations,

-			     xf86CrtcScanoutFormat	*format);

-

-} xf86CrtcConfigFuncsRec, *xf86CrtcConfigFuncsPtr;

-

-typedef void (*xf86_crtc_notify_proc_ptr) (ScreenPtr pScreen);

-

-typedef struct _xf86CrtcConfig {

-    int			num_output;

-    xf86OutputPtr	*output;

-    /**

-     * compat_output is used whenever we deal

-     * with legacy code that only understands a single

-     * output. pScrn->modes will be loaded from this output,

-     * adjust frame will whack this output, etc.

-     */

-    int			compat_output;

-

-    int			num_crtc;

-    xf86CrtcPtr		*crtc;

-

-    int			minWidth, minHeight;

-    int			maxWidth, maxHeight;

-    

-    /* For crtc-based rotation */

-    DamagePtr		rotation_damage;

-    Bool		rotation_damage_registered;

-

-    /* DGA */

-    unsigned int	dga_flags;

-    unsigned long	dga_address;

-    DGAModePtr		dga_modes;

-    int			dga_nmode;

-    int			dga_width, dga_height, dga_stride;

-    DisplayModePtr	dga_save_mode;

-

-    const xf86CrtcConfigFuncsRec *funcs;

-

-    CreateScreenResourcesProcPtr    CreateScreenResources;

-

-    CloseScreenProcPtr		    CloseScreen;

-

-    /* Cursor information */

-    xf86CursorInfoPtr	cursor_info;

-    CursorPtr		cursor;

-    CARD8		*cursor_image;

-    Bool		cursor_on;

-    CARD32		cursor_fg, cursor_bg;

-

-    /**

-     * Options parsed from the related device section

-     */

-    OptionInfoPtr	options;

-

-    Bool		debug_modes;

-

-    /* wrap screen BlockHandler for rotation */

-    ScreenBlockHandlerProcPtr	BlockHandler;

-

-    /* callback when crtc configuration changes */

-    xf86_crtc_notify_proc_ptr  xf86_crtc_notify;

-

-    /*

-     * Supported scanout pixmap formats

-     */

-    int			num_scanout_formats;

-    xf86CrtcScanoutFormat	*scanout_formats;

-} xf86CrtcConfigRec, *xf86CrtcConfigPtr;

-

-extern _X_EXPORT int xf86CrtcConfigPrivateIndex;

-

-#define XF86_CRTC_CONFIG_PTR(p)	((xf86CrtcConfigPtr) ((p)->privates[xf86CrtcConfigPrivateIndex].ptr))

-

-static _X_INLINE xf86OutputPtr

-xf86CompatOutput(ScrnInfoPtr pScrn)

-{

-    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);

-    return config->output[config->compat_output];

-}

-

-static _X_INLINE xf86CrtcPtr

-xf86CompatCrtc(ScrnInfoPtr pScrn)

-{

-    xf86OutputPtr compat_output = xf86CompatOutput(pScrn);

-    if (!compat_output)

-	return NULL;

-    return compat_output->crtc;

-}

-

-static _X_INLINE RRCrtcPtr

-xf86CompatRRCrtc(ScrnInfoPtr pScrn)

-{

-    xf86CrtcPtr	compat_crtc = xf86CompatCrtc(pScrn);

-    if (!compat_crtc)

-	return NULL;

-    return compat_crtc->randr_crtc;

-}

-

-

-/*

- * Initialize xf86CrtcConfig structure

- */

-

-extern _X_EXPORT void

-xf86CrtcConfigInit (ScrnInfoPtr				scrn,

-		    const xf86CrtcConfigFuncsRec	*funcs);

-

-extern _X_EXPORT void

-xf86CrtcSetSizeRange (ScrnInfoPtr scrn,

-		      int minWidth, int minHeight,

-		      int maxWidth, int maxHeight);

-

-extern _X_EXPORT void

-xf86CrtcSetScanoutFormats (ScrnInfoPtr			scrn,

-			   int				num_formats,

-			   xf86CrtcScanoutFormat	*formats);

-

-/*

- * Crtc functions

- */

-extern _X_EXPORT xf86CrtcPtr

-xf86CrtcCreate (ScrnInfoPtr		scrn,

-		const xf86CrtcFuncsRec	*funcs);

-

-extern _X_EXPORT void

-xf86CrtcDestroy (xf86CrtcPtr		crtc);

-

-/**

- * Change a crtc configuration (modes, outputs, etc)

- */

-

-extern _X_EXPORT Bool

-xf86CrtcSet (xf86CrtcPtr crtc, xf86CrtcSetRec *set);

-

-extern _X_EXPORT void

-xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);

-

-/*

- * Assign crtc rotation during mode set

- */

-extern _X_EXPORT Bool

-xf86CrtcRotate (xf86CrtcPtr crtc);

-

-

-/*

- * Update cursor transform matrices after user changes

- * This is just the cursor subset of xf86CrtcRotate

- */

-extern _X_EXPORT void

-xf86CrtcRotateCursor (xf86CrtcPtr crtc);

-

-/*

- * Clean up any rotation data, used when a crtc is turned off

- * as well as when rotation is disabled.

- */

-extern _X_EXPORT void

-xf86RotateDestroy (xf86CrtcPtr crtc);

-

-/*

- * free shadow memory allocated for all crtcs

- */

-extern _X_EXPORT void

-xf86RotateFreeShadow(ScrnInfoPtr pScrn);

-

-/*

- * Clean up rotation during CloseScreen

- */

-extern _X_EXPORT void

-xf86RotateCloseScreen (ScreenPtr pScreen);

-

-/**

- * Return whether any output is assigned to the crtc

- */

-extern _X_EXPORT Bool

-xf86CrtcInUse (xf86CrtcPtr crtc);

-

-/*

- * Output functions

- */

-extern _X_EXPORT xf86OutputPtr

-xf86OutputCreate (ScrnInfoPtr		    scrn,

-		  const xf86OutputFuncsRec  *funcs,

-		  const char		    *name);

-

-extern _X_EXPORT void

-xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor);

-

-extern _X_EXPORT Bool

-xf86OutputRename (xf86OutputPtr output, const char *name);

-

-extern _X_EXPORT void

-xf86OutputDestroy (xf86OutputPtr	output);

-

-extern _X_EXPORT void

-xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY);

-

-extern _X_EXPORT void

-xf86SetScrnInfoModes (ScrnInfoPtr pScrn);

-

-#ifdef RANDR_13_INTERFACE

-# define ScreenInitRetType	int

-#else

-# define ScreenInitRetType	Bool

-#endif

-

-extern _X_EXPORT ScreenInitRetType

-xf86CrtcScreenInit (ScreenPtr pScreen);

-

-extern _X_EXPORT Bool

-xf86InitialConfiguration (ScrnInfoPtr pScrn, Bool canGrow);

-

-extern _X_EXPORT void

-xf86DPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);

-    

-extern _X_EXPORT Bool

-xf86SaveScreen(ScreenPtr pScreen, int mode);

-

-extern _X_EXPORT void

-xf86DisableUnusedFunctions(ScrnInfoPtr pScrn);

-

-extern _X_EXPORT DisplayModePtr

-xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired);

-    

-extern _X_EXPORT Bool

-xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation);

-

-/**

- * Set the EDID information for the specified output

- */

-extern _X_EXPORT void

-xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon);

-

-/**

- * Return the list of modes supported by the EDID information

- * stored in 'output'

- */

-extern _X_EXPORT DisplayModePtr

-xf86OutputGetEDIDModes (xf86OutputPtr output);

-

-extern _X_EXPORT xf86MonPtr

-xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);

-

-/**

- * Initialize dga for this screen

- */

-

-#ifdef XFreeXDGA

-extern _X_EXPORT Bool

-xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);

-

-/* this is the real function, used only internally */

-_X_INTERNAL Bool

-_xf86_di_dga_init_internal (ScreenPtr pScreen);

-

-/**

- * Re-initialize dga for this screen (as when the set of modes changes)

- */

-

-extern _X_EXPORT Bool

-xf86DiDGAReInit (ScreenPtr pScreen);

-#endif

-

-/* This is the real function, used only internally */

-_X_INTERNAL Bool

-_xf86_di_dga_reinit_internal (ScreenPtr pScreen);

-

-/*

- * Set the subpixel order reported for the screen using

- * the information from the outputs

- */

-

-extern _X_EXPORT void

-xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen);

-

-/*

- * Get a standard string name for a connector type 

- */

-extern _X_EXPORT char *

-xf86ConnectorGetName(xf86ConnectorType connector);

-

-/*

- * Using the desired mode information in each crtc, set

- * modes (used in EnterVT functions, or at server startup)

- */

-

-extern _X_EXPORT Bool

-xf86SetDesiredModes (ScrnInfoPtr pScrn);

-

-/**

- * Initialize the CRTC-based cursor code. CRTC function vectors must

- * contain relevant cursor setting functions.

- *

- * Driver should call this from ScreenInit function

- */

-extern _X_EXPORT Bool

-xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags);

-

-/**

- * Called when anything on the screen is reconfigured.

- *

- * Reloads cursor images as needed, then adjusts cursor positions.

- * 

- * Driver should call this from crtc commit function.

- */

-extern _X_EXPORT void

-xf86_reload_cursors (ScreenPtr screen);

-

-/**

- * Called from EnterVT to turn the cursors back on

- */

-extern _X_EXPORT void

-xf86_show_cursors (ScrnInfoPtr scrn);

-

-/**

- * Called by the driver to turn cursors off

- */

-extern _X_EXPORT void

-xf86_hide_cursors (ScrnInfoPtr scrn);

-

-/**

- * Clean up CRTC-based cursor code. Driver must call this at CloseScreen time.

- */

-extern _X_EXPORT void

-xf86_cursors_fini (ScreenPtr screen);

-

-/*

- * For overlay video, compute the relevant CRTC and

- * clip video to that.

- * wraps xf86XVClipVideoHelper()

- */

-

-extern _X_EXPORT Bool

-xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,

-			    xf86CrtcPtr *crtc_ret,

-			    xf86CrtcPtr desired_crtc,

-			    BoxPtr      dst,

-			    INT32	*xa,

-			    INT32	*xb,

-			    INT32	*ya,

-			    INT32	*yb,

-			    RegionPtr   reg,

-			    INT32	width,

-			    INT32	height);

-    

-extern _X_EXPORT xf86_crtc_notify_proc_ptr

-xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);

-

-extern _X_EXPORT void

-xf86_unwrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr old);

-

-extern _X_EXPORT void

-xf86_crtc_notify(ScreenPtr pScreen);

-

-/**

- * Gamma

- */

-

-extern _X_EXPORT Bool

-xf86_crtc_supports_gamma(ScrnInfoPtr pScrn);

-

-#endif /* _XF86CRTC_H_ */

+/*
+ * Copyright © 2006 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+#ifndef _XF86CRTC_H_
+#define _XF86CRTC_H_
+
+#include <edid.h>
+#include "randrstr.h"
+#if XF86_MODES_RENAME
+#include "xf86Rename.h"
+#endif
+#include "xf86Modes.h"
+#include "xf86Cursor.h"
+#include "xf86i2c.h"
+#include "damage.h"
+#include "picturestr.h"
+
+/* Compat definitions for older X Servers. */
+#ifndef M_T_PREFERRED
+#define M_T_PREFERRED	0x08
+#endif
+#ifndef M_T_DRIVER
+#define M_T_DRIVER	0x40
+#endif
+#ifndef M_T_USERPREF
+#define M_T_USERPREF	0x80
+#endif
+#ifndef HARDWARE_CURSOR_ARGB
+#define HARDWARE_CURSOR_ARGB				0x00004000
+#endif
+
+typedef struct _xf86Crtc xf86CrtcRec, *xf86CrtcPtr;
+typedef struct _xf86Output xf86OutputRec, *xf86OutputPtr;
+
+/* define a standard for connector types */
+typedef enum _xf86ConnectorType {
+   XF86ConnectorNone,
+   XF86ConnectorVGA,
+   XF86ConnectorDVI_I,
+   XF86ConnectorDVI_D,
+   XF86ConnectorDVI_A,
+   XF86ConnectorComposite,
+   XF86ConnectorSvideo,
+   XF86ConnectorComponent,
+   XF86ConnectorLFP,
+   XF86ConnectorProprietary,
+   XF86ConnectorHDMI,
+   XF86ConnectorDisplayPort,
+} xf86ConnectorType;
+
+typedef enum _xf86OutputStatus {
+   XF86OutputStatusConnected,
+   XF86OutputStatusDisconnected,
+   XF86OutputStatusUnknown
+} xf86OutputStatus;
+
+typedef struct _xf86CrtcFuncs {
+   /**
+    * Turns the crtc on/off, or sets intermediate power levels if available.
+    *
+    * Unsupported intermediate modes drop to the lower power setting.  If the
+    * mode is DPMSModeOff, the crtc must be disabled sufficiently for it to
+    * be safe to call mode_set.
+    */
+   void
+    (*dpms)(xf86CrtcPtr		crtc,
+	    int		    	mode);
+
+   /**
+    * Saves the crtc's state for restoration on VT switch.
+    */
+   void
+    (*save)(xf86CrtcPtr		crtc);
+
+   /**
+    * Restore's the crtc's state at VT switch.
+    */
+   void
+    (*restore)(xf86CrtcPtr	crtc);
+
+    /**
+     * Lock CRTC prior to mode setting, mostly for DRI.
+     * Returns whether unlock is needed
+     */
+    Bool
+    (*lock) (xf86CrtcPtr crtc);
+    
+    /**
+     * Unlock CRTC after mode setting, mostly for DRI
+     */
+    void
+    (*unlock) (xf86CrtcPtr crtc);
+    
+    /**
+     * Callback to adjust the mode to be set in the CRTC.
+     *
+     * This allows a CRTC to adjust the clock or even the entire set of
+     * timings, which is used for panels with fixed timings or for
+     * buses with clock limitations.
+     */
+    Bool
+    (*mode_fixup)(xf86CrtcPtr crtc,
+		  DisplayModePtr mode,
+		  DisplayModePtr adjusted_mode);
+
+    /**
+     * Prepare CRTC for an upcoming mode set.
+     */
+    void
+    (*prepare)(xf86CrtcPtr crtc);
+
+    /**
+     * Callback for setting up a video mode after fixups have been made.
+     */
+    void
+    (*mode_set)(xf86CrtcPtr crtc,
+		DisplayModePtr mode,
+		DisplayModePtr adjusted_mode,
+		int x, int y);
+
+    /**
+     * Commit mode changes to a CRTC
+     */
+    void
+    (*commit)(xf86CrtcPtr crtc);
+
+    /* Set the color ramps for the CRTC to the given values. */
+    void
+    (*gamma_set)(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
+		 int size);
+
+    /**
+     * Allocate the shadow area, delay the pixmap creation until needed
+     */
+    void *
+    (*shadow_allocate) (xf86CrtcPtr crtc, int width, int height);
+    
+    /**
+     * Create shadow pixmap for rotation support
+     */
+    PixmapPtr
+    (*shadow_create) (xf86CrtcPtr crtc, void *data, int width, int height);
+    
+    /**
+     * Destroy shadow pixmap
+     */
+    void
+    (*shadow_destroy) (xf86CrtcPtr crtc, PixmapPtr pPixmap, void *data);
+
+    /**
+     * Set cursor colors
+     */
+    void
+    (*set_cursor_colors) (xf86CrtcPtr crtc, int bg, int fg);
+
+    /**
+     * Set cursor position
+     */
+    void
+    (*set_cursor_position) (xf86CrtcPtr crtc, int x, int y);
+
+    /**
+     * Show cursor
+     */
+    void
+    (*show_cursor) (xf86CrtcPtr crtc);
+
+    /**
+     * Hide cursor
+     */
+    void
+    (*hide_cursor) (xf86CrtcPtr crtc);
+
+    /**
+     * Load monochrome image
+     */
+    void
+    (*load_cursor_image) (xf86CrtcPtr crtc, CARD8 *image);
+
+    /**
+     * Load ARGB image
+     */
+     void
+     (*load_cursor_argb) (xf86CrtcPtr crtc, CARD32 *image);
+     
+    /**
+     * Clean up driver-specific bits of the crtc
+     */
+    void
+    (*destroy) (xf86CrtcPtr	crtc);
+
+    /**
+     * Less fine-grained mode setting entry point for kernel modesetting
+     */
+    Bool
+    (*set_mode_major)(xf86CrtcPtr crtc, DisplayModePtr mode,
+		      Rotation rotation, int x, int y);
+
+    /**
+     * Callback for panning. Doesn't change the mode.
+     * Added in ABI version 2
+     */
+    void
+    (*set_origin)(xf86CrtcPtr crtc, int x, int y);
+
+} xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;
+
+#define XF86_CRTC_VERSION 3
+
+struct _xf86Crtc {
+    /**
+     * ABI versioning
+     */
+    int version;
+
+    /**
+     * Associated ScrnInfo
+     */
+    ScrnInfoPtr	    scrn;
+    
+    /**
+     * Desired state of this CRTC
+     *
+     * Set when this CRTC should be driving one or more outputs 
+     */
+    Bool	    enabled;
+    
+    /**
+     * Active mode
+     *
+     * This reflects the mode as set in the CRTC currently
+     * It will be cleared when the VT is not active or
+     * during server startup
+     */
+    DisplayModeRec  mode;
+    Rotation	    rotation;
+    PixmapPtr	    rotatedPixmap;
+    void	    *rotatedData;
+    
+    /**
+     * Position on screen
+     *
+     * Locates this CRTC within the frame buffer
+     */
+    int		    x, y;
+    
+    /**
+     * Desired mode
+     *
+     * This is set to the requested mode, independent of
+     * whether the VT is active. In particular, it receives
+     * the startup configured mode and saves the active mode
+     * on VT switch.
+     */
+    DisplayModeRec  desiredMode;
+    Rotation	    desiredRotation;
+    int		    desiredX, desiredY;
+    
+    /** crtc-specific functions */
+    const xf86CrtcFuncsRec *funcs;
+
+    /**
+     * Driver private
+     *
+     * Holds driver-private information
+     */
+    void	    *driver_private;
+
+#ifdef RANDR_12_INTERFACE
+    /**
+     * RandR crtc
+     *
+     * When RandR 1.2 is available, this
+     * points at the associated crtc object
+     */
+    RRCrtcPtr	    randr_crtc;
+#else
+    void	    *randr_crtc;
+#endif
+
+    /**
+     * Current cursor is ARGB
+     */
+    Bool	    cursor_argb;
+    /**
+     * Track whether cursor is within CRTC range 
+     */
+    Bool	    cursor_in_range;
+    /**
+     * Track state of cursor associated with this CRTC
+     */
+    Bool	    cursor_shown;
+
+    /**
+     * Current transformation matrix
+     */
+    PictTransform   crtc_to_framebuffer;
+    /* framebuffer_to_crtc was removed in ABI 2 */
+    struct pict_f_transform f_crtc_to_framebuffer; /* ABI 2 */
+    struct pict_f_transform f_framebuffer_to_crtc; /* ABI 2 */
+    PictFilterPtr   filter; /* ABI 2 */
+    xFixed	    *params; /* ABI 2 */
+    int		    nparams; /* ABI 2 */
+    int		    filter_width; /* ABI 2 */
+    int		    filter_height; /* ABI 2 */
+    Bool	    transform_in_use;
+    RRTransformRec  transform; /* ABI 2 */
+    Bool	    transformPresent; /* ABI 2 */
+    RRTransformRec  desiredTransform; /* ABI 2 */
+    Bool	    desiredTransformPresent; /* ABI 2 */
+    /**
+     * Bounding box in screen space
+     */
+    BoxRec	    bounds;
+    /**
+     * Panning:
+     * TotalArea: total panning area, larger than CRTC's size
+     * TrackingArea: Area of the pointer for which the CRTC is panned
+     * border: Borders of the displayed CRTC area which induces panning if the pointer reaches them
+     * Added in ABI version 2
+     */
+    BoxRec          panningTotalArea;
+    BoxRec          panningTrackingArea;
+    INT16           panningBorder[4];
+
+    /**
+     * Current gamma, especially useful after initial config.
+     * Added in ABI version 3
+     */
+    CARD16 *gamma_red;
+    CARD16 *gamma_green;
+    CARD16 *gamma_blue;
+    int gamma_size;
+
+    /**
+     * Actual state of this CRTC
+     *
+     * Set to TRUE after modesetting, set to FALSE if no outputs are connected
+     * Added in ABI version 3
+     */
+    Bool	    active;
+    /**
+     * Clear the shadow
+     */
+    Bool	    shadowClear;
+};
+
+typedef struct _xf86OutputFuncs {
+    /**
+     * Called to allow the output a chance to create properties after the
+     * RandR objects have been created.
+     */
+    void
+    (*create_resources)(xf86OutputPtr output);
+
+    /**
+     * Turns the output on/off, or sets intermediate power levels if available.
+     *
+     * Unsupported intermediate modes drop to the lower power setting.  If the
+     * mode is DPMSModeOff, the output must be disabled, as the DPLL may be
+     * disabled afterwards.
+     */
+    void
+    (*dpms)(xf86OutputPtr	output,
+	    int			mode);
+
+    /**
+     * Saves the output's state for restoration on VT switch.
+     */
+    void
+    (*save)(xf86OutputPtr	output);
+
+    /**
+     * Restore's the output's state at VT switch.
+     */
+    void
+    (*restore)(xf86OutputPtr	output);
+
+    /**
+     * Callback for testing a video mode for a given output.
+     *
+     * This function should only check for cases where a mode can't be supported
+     * on the output specifically, and not represent generic CRTC limitations.
+     *
+     * \return MODE_OK if the mode is valid, or another MODE_* otherwise.
+     */
+    int
+    (*mode_valid)(xf86OutputPtr	    output,
+		  DisplayModePtr    pMode);
+
+    /**
+     * Callback to adjust the mode to be set in the CRTC.
+     *
+     * This allows an output to adjust the clock or even the entire set of
+     * timings, which is used for panels with fixed timings or for
+     * buses with clock limitations.
+     */
+    Bool
+    (*mode_fixup)(xf86OutputPtr output,
+		  DisplayModePtr mode,
+		  DisplayModePtr adjusted_mode);
+
+    /**
+     * Callback for preparing mode changes on an output
+     */
+    void
+    (*prepare)(xf86OutputPtr output);
+
+    /**
+     * Callback for committing mode changes on an output
+     */
+    void
+    (*commit)(xf86OutputPtr output);
+
+    /**
+     * Callback for setting up a video mode after fixups have been made.
+     *
+     * This is only called while the output is disabled.  The dpms callback
+     * must be all that's necessary for the output, to turn the output on
+     * after this function is called.
+     */
+    void
+    (*mode_set)(xf86OutputPtr  output,
+		DisplayModePtr mode,
+		DisplayModePtr adjusted_mode);
+
+    /**
+     * Probe for a connected output, and return detect_status.
+     */
+    xf86OutputStatus
+    (*detect)(xf86OutputPtr	    output);
+
+    /**
+     * Query the device for the modes it provides.
+     *
+     * This function may also update MonInfo, mm_width, and mm_height.
+     *
+     * \return singly-linked list of modes or NULL if no modes found.
+     */
+    DisplayModePtr
+    (*get_modes)(xf86OutputPtr	    output);
+
+#ifdef RANDR_12_INTERFACE
+    /**
+     * Callback when an output's property has changed.
+     */
+    Bool
+    (*set_property)(xf86OutputPtr output,
+		    Atom property,
+		    RRPropertyValuePtr value);
+#endif
+#ifdef RANDR_13_INTERFACE
+    /**
+     * Callback to get an updated property value
+     */
+    Bool
+    (*get_property)(xf86OutputPtr output,
+		    Atom property);
+#endif
+#ifdef RANDR_GET_CRTC_INTERFACE
+    /**
+     * Callback to get current CRTC for a given output
+     */
+    xf86CrtcPtr
+    (*get_crtc)(xf86OutputPtr output);
+#endif
+    /**
+     * Clean up driver-specific bits of the output
+     */
+    void
+    (*destroy) (xf86OutputPtr	    output);
+} xf86OutputFuncsRec, *xf86OutputFuncsPtr;
+
+
+#define XF86_OUTPUT_VERSION 2
+
+struct _xf86Output {
+    /**
+     * ABI versioning
+     */
+    int version;
+
+    /**
+     * Associated ScrnInfo
+     */
+    ScrnInfoPtr		scrn;
+
+    /**
+     * Currently connected crtc (if any)
+     *
+     * If this output is not in use, this field will be NULL.
+     */
+    xf86CrtcPtr		crtc;
+
+    /**
+     * Possible CRTCs for this output as a mask of crtc indices
+     */
+    CARD32		possible_crtcs;
+
+    /**
+     * Possible outputs to share the same CRTC as a mask of output indices
+     */
+    CARD32		possible_clones;
+    
+    /**
+     * Whether this output can support interlaced modes
+     */
+    Bool		interlaceAllowed;
+
+    /**
+     * Whether this output can support double scan modes
+     */
+    Bool		doubleScanAllowed;
+
+    /**
+     * List of available modes on this output.
+     *
+     * This should be the list from get_modes(), plus perhaps additional
+     * compatible modes added later.
+     */
+    DisplayModePtr	probed_modes;
+
+    /**
+     * Options parsed from the related monitor section
+     */
+    OptionInfoPtr	options;
+    
+    /**
+     * Configured monitor section
+     */
+    XF86ConfMonitorPtr  conf_monitor;
+    
+    /**
+     * Desired initial position
+     */
+    int			initial_x, initial_y;
+
+    /**
+     * Desired initial rotation
+     */
+    Rotation		initial_rotation;
+
+    /**
+     * Current connection status
+     *
+     * This indicates whether a monitor is known to be connected
+     * to this output or not, or whether there is no way to tell
+     */
+    xf86OutputStatus	status;
+
+    /** EDID monitor information */
+    xf86MonPtr		MonInfo;
+
+    /** subpixel order */
+    int			subpixel_order;
+
+    /** Physical size of the currently attached output device. */
+    int			mm_width, mm_height;
+
+    /** Output name */
+    char		*name;
+
+    /** output-specific functions */
+    const xf86OutputFuncsRec *funcs;
+
+    /** driver private information */
+    void		*driver_private;
+    
+    /** Whether to use the old per-screen Monitor config section */
+    Bool		use_screen_monitor;
+
+#ifdef RANDR_12_INTERFACE
+    /**
+     * RandR 1.2 output structure.
+     *
+     * When RandR 1.2 is available, this points at the associated
+     * RandR output structure and is created when this output is created
+     */
+    RROutputPtr		randr_output;
+#else
+    void		*randr_output;
+#endif
+    /** 
+     * Desired initial panning
+     * Added in ABI version 2
+     */
+    BoxRec          initialTotalArea;
+    BoxRec          initialTrackingArea;
+    INT16           initialBorder[4];
+};
+
+typedef struct _xf86CrtcConfigFuncs {
+    /**
+     * Requests that the driver resize the screen.
+     *
+     * The driver is responsible for updating scrn->virtualX and scrn->virtualY.
+     * If the requested size cannot be set, the driver should leave those values
+     * alone and return FALSE.
+     *
+     * A naive driver that cannot reallocate the screen may simply change
+     * virtual[XY].  A more advanced driver will want to also change the
+     * devPrivate.ptr and devKind of the screen pixmap, update any offscreen
+     * pixmaps it may have moved, and change pScrn->displayWidth.
+     */
+    Bool
+    (*resize)(ScrnInfoPtr	scrn,
+	      int		width,
+	      int		height);
+} xf86CrtcConfigFuncsRec, *xf86CrtcConfigFuncsPtr;
+
+typedef void (*xf86_crtc_notify_proc_ptr) (ScreenPtr pScreen);
+
+typedef struct _xf86CrtcConfig {
+    int			num_output;
+    xf86OutputPtr	*output;
+    /**
+     * compat_output is used whenever we deal
+     * with legacy code that only understands a single
+     * output. pScrn->modes will be loaded from this output,
+     * adjust frame will whack this output, etc.
+     */
+    int			compat_output;
+
+    int			num_crtc;
+    xf86CrtcPtr		*crtc;
+
+    int			minWidth, minHeight;
+    int			maxWidth, maxHeight;
+    
+    /* For crtc-based rotation */
+    DamagePtr		rotation_damage;
+    Bool		rotation_damage_registered;
+
+    /* DGA */
+    unsigned int	dga_flags;
+    unsigned long	dga_address;
+    DGAModePtr		dga_modes;
+    int			dga_nmode;
+    int			dga_width, dga_height, dga_stride;
+    DisplayModePtr	dga_save_mode;
+
+    const xf86CrtcConfigFuncsRec *funcs;
+
+    CreateScreenResourcesProcPtr    CreateScreenResources;
+
+    CloseScreenProcPtr		    CloseScreen;
+
+    /* Cursor information */
+    xf86CursorInfoPtr	cursor_info;
+    CursorPtr		cursor;
+    CARD8		*cursor_image;
+    Bool		cursor_on;
+    CARD32		cursor_fg, cursor_bg;
+
+    /**
+     * Options parsed from the related device section
+     */
+    OptionInfoPtr	options;
+
+    Bool		debug_modes;
+
+    /* wrap screen BlockHandler for rotation */
+    ScreenBlockHandlerProcPtr	BlockHandler;
+
+    /* callback when crtc configuration changes */
+    xf86_crtc_notify_proc_ptr  xf86_crtc_notify;
+
+} xf86CrtcConfigRec, *xf86CrtcConfigPtr;
+
+extern _X_EXPORT int xf86CrtcConfigPrivateIndex;
+
+#define XF86_CRTC_CONFIG_PTR(p)	((xf86CrtcConfigPtr) ((p)->privates[xf86CrtcConfigPrivateIndex].ptr))
+
+static _X_INLINE xf86OutputPtr
+xf86CompatOutput(ScrnInfoPtr pScrn)
+{
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    return config->output[config->compat_output];
+}
+
+static _X_INLINE xf86CrtcPtr
+xf86CompatCrtc(ScrnInfoPtr pScrn)
+{
+    xf86OutputPtr compat_output = xf86CompatOutput(pScrn);
+    if (!compat_output)
+	return NULL;
+    return compat_output->crtc;
+}
+
+static _X_INLINE RRCrtcPtr
+xf86CompatRRCrtc(ScrnInfoPtr pScrn)
+{
+    xf86CrtcPtr	compat_crtc = xf86CompatCrtc(pScrn);
+    if (!compat_crtc)
+	return NULL;
+    return compat_crtc->randr_crtc;
+}
+
+
+/*
+ * Initialize xf86CrtcConfig structure
+ */
+
+extern _X_EXPORT void
+xf86CrtcConfigInit (ScrnInfoPtr				scrn,
+		    const xf86CrtcConfigFuncsRec	*funcs);
+
+extern _X_EXPORT void
+xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
+		      int minWidth, int minHeight,
+		      int maxWidth, int maxHeight);
+
+/*
+ * Crtc functions
+ */
+extern _X_EXPORT xf86CrtcPtr
+xf86CrtcCreate (ScrnInfoPtr		scrn,
+		const xf86CrtcFuncsRec	*funcs);
+
+extern _X_EXPORT void
+xf86CrtcDestroy (xf86CrtcPtr		crtc);
+
+
+/**
+ * Sets the given video mode on the given crtc
+ */
+
+extern _X_EXPORT Bool
+xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
+			  RRTransformPtr transform, int x, int y);
+
+extern _X_EXPORT Bool
+xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
+		 int x, int y);
+
+extern _X_EXPORT void
+xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);
+
+/*
+ * Assign crtc rotation during mode set
+ */
+extern _X_EXPORT Bool
+xf86CrtcRotate (xf86CrtcPtr crtc);
+
+/*
+ * Clean up any rotation data, used when a crtc is turned off
+ * as well as when rotation is disabled.
+ */
+extern _X_EXPORT void
+xf86RotateDestroy (xf86CrtcPtr crtc);
+
+/*
+ * free shadow memory allocated for all crtcs
+ */
+extern _X_EXPORT void
+xf86RotateFreeShadow(ScrnInfoPtr pScrn);
+
+/*
+ * Clean up rotation during CloseScreen
+ */
+extern _X_EXPORT void
+xf86RotateCloseScreen (ScreenPtr pScreen);
+
+/**
+ * Return whether any output is assigned to the crtc
+ */
+extern _X_EXPORT Bool
+xf86CrtcInUse (xf86CrtcPtr crtc);
+
+/*
+ * Output functions
+ */
+extern _X_EXPORT xf86OutputPtr
+xf86OutputCreate (ScrnInfoPtr		    scrn,
+		  const xf86OutputFuncsRec  *funcs,
+		  const char		    *name);
+
+extern _X_EXPORT void
+xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor);
+
+extern _X_EXPORT Bool
+xf86OutputRename (xf86OutputPtr output, const char *name);
+
+extern _X_EXPORT void
+xf86OutputDestroy (xf86OutputPtr	output);
+
+extern _X_EXPORT void
+xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY);
+
+extern _X_EXPORT void
+xf86SetScrnInfoModes (ScrnInfoPtr pScrn);
+
+#ifdef RANDR_13_INTERFACE
+# define ScreenInitRetType	int
+#else
+# define ScreenInitRetType	Bool
+#endif
+
+extern _X_EXPORT ScreenInitRetType
+xf86CrtcScreenInit (ScreenPtr pScreen);
+
+extern _X_EXPORT Bool
+xf86InitialConfiguration (ScrnInfoPtr pScrn, Bool canGrow);
+
+extern _X_EXPORT void
+xf86DPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);
+    
+extern _X_EXPORT Bool
+xf86SaveScreen(ScreenPtr pScreen, int mode);
+
+extern _X_EXPORT void
+xf86DisableUnusedFunctions(ScrnInfoPtr pScrn);
+
+extern _X_EXPORT DisplayModePtr
+xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired);
+    
+extern _X_EXPORT Bool
+xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation);
+
+/**
+ * Set the EDID information for the specified output
+ */
+extern _X_EXPORT void
+xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon);
+
+/**
+ * Return the list of modes supported by the EDID information
+ * stored in 'output'
+ */
+extern _X_EXPORT DisplayModePtr
+xf86OutputGetEDIDModes (xf86OutputPtr output);
+
+extern _X_EXPORT xf86MonPtr
+xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);
+
+/**
+ * Initialize dga for this screen
+ */
+
+#ifdef XFreeXDGA
+extern _X_EXPORT Bool
+xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);
+
+/* this is the real function, used only internally */
+_X_INTERNAL Bool
+_xf86_di_dga_init_internal (ScreenPtr pScreen);
+
+/**
+ * Re-initialize dga for this screen (as when the set of modes changes)
+ */
+
+extern _X_EXPORT Bool
+xf86DiDGAReInit (ScreenPtr pScreen);
+#endif
+
+/* This is the real function, used only internally */
+_X_INTERNAL Bool
+_xf86_di_dga_reinit_internal (ScreenPtr pScreen);
+
+/*
+ * Set the subpixel order reported for the screen using
+ * the information from the outputs
+ */
+
+extern _X_EXPORT void
+xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen);
+
+/*
+ * Get a standard string name for a connector type 
+ */
+extern _X_EXPORT char *
+xf86ConnectorGetName(xf86ConnectorType connector);
+
+/*
+ * Using the desired mode information in each crtc, set
+ * modes (used in EnterVT functions, or at server startup)
+ */
+
+extern _X_EXPORT Bool
+xf86SetDesiredModes (ScrnInfoPtr pScrn);
+
+/**
+ * Initialize the CRTC-based cursor code. CRTC function vectors must
+ * contain relevant cursor setting functions.
+ *
+ * Driver should call this from ScreenInit function
+ */
+extern _X_EXPORT Bool
+xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags);
+
+/**
+ * Called when anything on the screen is reconfigured.
+ *
+ * Reloads cursor images as needed, then adjusts cursor positions.
+ * 
+ * Driver should call this from crtc commit function.
+ */
+extern _X_EXPORT void
+xf86_reload_cursors (ScreenPtr screen);
+
+/**
+ * Called from EnterVT to turn the cursors back on
+ */
+extern _X_EXPORT void
+xf86_show_cursors (ScrnInfoPtr scrn);
+
+/**
+ * Called by the driver to turn cursors off
+ */
+extern _X_EXPORT void
+xf86_hide_cursors (ScrnInfoPtr scrn);
+
+/**
+ * Clean up CRTC-based cursor code. Driver must call this at CloseScreen time.
+ */
+extern _X_EXPORT void
+xf86_cursors_fini (ScreenPtr screen);
+
+/*
+ * For overlay video, compute the relevant CRTC and
+ * clip video to that.
+ * wraps xf86XVClipVideoHelper()
+ */
+
+extern _X_EXPORT Bool
+xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
+			    xf86CrtcPtr *crtc_ret,
+			    xf86CrtcPtr desired_crtc,
+			    BoxPtr      dst,
+			    INT32	*xa,
+			    INT32	*xb,
+			    INT32	*ya,
+			    INT32	*yb,
+			    RegionPtr   reg,
+			    INT32	width,
+			    INT32	height);
+    
+extern _X_EXPORT xf86_crtc_notify_proc_ptr
+xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);
+
+extern _X_EXPORT void
+xf86_unwrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr old);
+
+extern _X_EXPORT void
+xf86_crtc_notify(ScreenPtr pScreen);
+
+/**
+ * Gamma
+ */
+
+extern _X_EXPORT Bool
+xf86_crtc_supports_gamma(ScrnInfoPtr pScrn);
+
+#endif /* _XF86CRTC_H_ */
diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index 3c2958743..066744744 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -1,688 +1,688 @@
-/*

- * Copyright © 2007 Keith Packard

- * Copyright © 2010 Aaron Plattner

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that copyright

- * notice and this permission notice appear in supporting documentation, and

- * that the name of the copyright holders not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  The copyright holders make no representations

- * about the suitability of this software for any purpose.  It is provided "as

- * is" without express or implied warranty.

- *

- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

- * OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#else

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#endif

-

-#include <stddef.h>

-#include <string.h>

-#include <stdio.h>

-

-#include "xf86.h"

-#include "xf86DDC.h"

-#include "xf86Crtc.h"

-#include "xf86Modes.h"

-#include "xf86RandR12.h"

-#include "xf86CursorPriv.h"

-#include "X11/extensions/render.h"

-#include "X11/extensions/dpmsconst.h"

-#include "X11/Xatom.h"

-#include "picturestr.h"

-#include "cursorstr.h"

-#include "inputstr.h"

-

-/*

- * Given a screen coordinate, rotate back to a cursor source coordinate

- */

-static void

-xf86_crtc_rotate_coord (Rotation    rotation,

-			int	    width,

-			int	    height,

-			int	    x_dst,

-			int	    y_dst,

-			int	    *x_src,

-			int	    *y_src)

-{

-    int t;

-    

-    switch (rotation & 0xf) {

-    case RR_Rotate_0:

-	break;

-    case RR_Rotate_90:

-	t = x_dst;

-	x_dst = height - y_dst - 1;

-	y_dst = t;

-	break;

-    case RR_Rotate_180:

-	x_dst = width - x_dst - 1;

-	y_dst = height - y_dst - 1;

-	break;

-    case RR_Rotate_270:

-	t = x_dst;

-	x_dst = y_dst;

-	y_dst = width - t - 1;

-	break;

-    }

-    if (rotation & RR_Reflect_X)

-	x_dst = width - x_dst - 1;

-    if (rotation & RR_Reflect_Y)

-	y_dst = height - y_dst - 1;

-    *x_src = x_dst;

-    *y_src = y_dst;

-}

-

-/*

- * Given a cursor source  coordinate, rotate to a screen coordinate

- */

-static void

-xf86_crtc_rotate_coord_back (Rotation    rotation,

-			     int	    width,

-			     int	    height,

-			     int	    x_dst,

-			     int	    y_dst,

-			     int	    *x_src,

-			     int	    *y_src)

-{

-    int t;

-    

-    if (rotation & RR_Reflect_X)

-	x_dst = width - x_dst - 1;

-    if (rotation & RR_Reflect_Y)

-	y_dst = height - y_dst - 1;

-

-    switch (rotation & 0xf) {

-    case RR_Rotate_0:

-	break;

-    case RR_Rotate_90:

-	t = x_dst;

-	x_dst = y_dst;

-	y_dst = width - t - 1;

-	break;

-    case RR_Rotate_180:

-	x_dst = width - x_dst - 1;

-	y_dst = height - y_dst - 1;

-	break;

-    case RR_Rotate_270:

-	t = x_dst;

-	x_dst = height - y_dst - 1;

-	y_dst = t;

-	break;

-    }

-    *x_src = x_dst;

-    *y_src = y_dst;

-}

-

-struct cursor_bit {

-    CARD8 *byte;

-    char bitpos;

-};

-

-/*

- * Convert an x coordinate to a position within the cursor bitmap

- */

-static struct cursor_bit

-cursor_bitpos (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y,

-	       Bool mask)

-{

-    const int flags = cursor_info->Flags;

-    const Bool interleaved =

-	!!(flags & (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1 |

-		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8 |

-		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16 |

-		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32 |

-		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64));

-    const int width = cursor_info->MaxWidth;

-    const int height = cursor_info->MaxHeight;

-    const int stride = interleaved ? width / 4 : width / 8;

-

-    struct cursor_bit ret;

-

-    image += y * stride;

-

-    if (flags & HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK)

-	mask = !mask;

-    if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)

-	x = (x & ~3) | (3 - (x & 3));

-    if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) ==

-	(X_BYTE_ORDER == X_BIG_ENDIAN))

-	x = (x & ~7) | (7 - (x & 7));

-    if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1)

-	x = (x << 1) + mask;

-    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8)

-	x = ((x & ~7) << 1) | (mask << 3) | (x & 7);

-    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16)

-	x = ((x & ~15) << 1) | (mask << 4) | (x & 15);

-    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32)

-	x = ((x & ~31) << 1) | (mask << 5) | (x & 31);

-    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64)

-	x = ((x & ~63) << 1) | (mask << 6) | (x & 63);

-    else if (mask)

-	image += stride * height;

-

-    ret.byte = image + (x / 8);

-    ret.bitpos = x & 7;

-

-    return ret;

-}

-

-/*

- * Fetch one bit from a cursor bitmap

- */

-static CARD8

-get_bit (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)

-{

-    struct cursor_bit bit = cursor_bitpos(image, cursor_info, x, y, mask);

-    return (*bit.byte >> bit.bitpos) & 1;

-}

-

-/*

- * Set one bit in a cursor bitmap

- */

-static void

-set_bit (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)

-{

-    struct cursor_bit bit = cursor_bitpos(image, cursor_info, x, y, mask);

-    *bit.byte |= 1 << bit.bitpos;

-}

-    

-/*

- * Load a two color cursor into a driver that supports only ARGB cursors

- */

-static void

-xf86_crtc_convert_cursor_to_argb (xf86CrtcPtr crtc, unsigned char *src)

-{

-    ScrnInfoPtr		scrn = crtc->scrn;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;

-    CARD32		*cursor_image = (CARD32 *) xf86_config->cursor_image;

-    int			x, y;

-    int			xin, yin;

-    int			flags = cursor_info->Flags;

-    CARD32		bits;

-

-#ifdef ARGB_CURSOR

-    crtc->cursor_argb = FALSE;

-#endif

-

-    for (y = 0; y < cursor_info->MaxHeight; y++)

-	for (x = 0; x < cursor_info->MaxWidth; x++) 

-	{

-	    xf86_crtc_rotate_coord (crtc->rotation,

-				    cursor_info->MaxWidth,

-				    cursor_info->MaxHeight,

-				    x, y, &xin, &yin);

-	    if (get_bit (src, cursor_info, xin, yin, TRUE) ==

-		((flags & HARDWARE_CURSOR_INVERT_MASK) == 0))

-	    {

-		if (get_bit (src, cursor_info, xin, yin, FALSE))

-		    bits = xf86_config->cursor_fg;

-		else

-		    bits = xf86_config->cursor_bg;

-	    }

-	    else

-		bits = 0;

-	    cursor_image[y * cursor_info->MaxWidth + x] = bits;

-	}

-    crtc->funcs->load_cursor_argb (crtc, cursor_image);

-}

-

-/*

- * Set the colors for a two-color cursor (ignore for ARGB cursors)

- */

-static void

-xf86_set_cursor_colors (ScrnInfoPtr scrn, int bg, int fg)

-{

-    ScreenPtr		screen = scrn->pScreen;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    CursorPtr		cursor = xf86_config->cursor;

-    int			c;

-    CARD8		*bits = cursor ?

-        dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen))

-      : NULL;

-

-    /* Save ARGB versions of these colors */

-    xf86_config->cursor_fg = (CARD32) fg | 0xff000000;

-    xf86_config->cursor_bg = (CARD32) bg | 0xff000000;

-    

-    for (c = 0; c < xf86_config->num_crtc; c++)

-    {

-	xf86CrtcPtr crtc = xf86_config->crtc[c];

-

-	if (crtc->enabled && !crtc->cursor_argb)

-	{

-	    if (crtc->funcs->load_cursor_image)

-		crtc->funcs->set_cursor_colors (crtc, bg, fg);

-	    else if (bits)

-		xf86_crtc_convert_cursor_to_argb (crtc, bits);

-	}

-    }

-}

-

-static void

-xf86_crtc_hide_cursor (xf86CrtcPtr crtc)

-{

-    if (crtc->cursor_shown)

-    {

-	crtc->funcs->hide_cursor (crtc);

-	crtc->cursor_shown = FALSE;

-    }

-}

-

-void

-xf86_hide_cursors (ScrnInfoPtr scrn)

-{

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			c;

-

-    xf86_config->cursor_on = FALSE;

-    for (c = 0; c < xf86_config->num_crtc; c++)

-    {

-	xf86CrtcPtr crtc = xf86_config->crtc[c];

-

-	if (crtc->enabled)

-	    xf86_crtc_hide_cursor (crtc);

-    }

-}

-    

-static void

-xf86_crtc_show_cursor (xf86CrtcPtr crtc)

-{

-    if (!crtc->cursor_shown && crtc->cursor_in_range)

-    {

-	crtc->funcs->show_cursor (crtc);

-	crtc->cursor_shown = TRUE;

-    }

-}

-

-void

-xf86_show_cursors (ScrnInfoPtr scrn)

-{

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			c;

-

-    xf86_config->cursor_on = TRUE;

-    for (c = 0; c < xf86_config->num_crtc; c++)

-    {

-	xf86CrtcPtr crtc = xf86_config->crtc[c];

-

-	if (crtc->enabled)

-	    xf86_crtc_show_cursor (crtc);

-    }

-}

-    

-static void

-xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)

-{

-    ScrnInfoPtr		scrn = crtc->scrn;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;

-    DisplayModePtr	mode = &crtc->mode;

-    Bool		in_range;

-    int			dx, dy;

-

-    /*

-     * Transform position of cursor on screen

-     */

-    if (crtc->sprite_transform_in_use)

-    {

-	ScreenPtr	screen = scrn->pScreen;

-	xf86CursorScreenPtr ScreenPriv =

-	    (xf86CursorScreenPtr)dixLookupPrivate(&screen->devPrivates,

-						  xf86CursorScreenKey);

-	struct pict_f_vector   v;

-

-	v.v[0] = (x + ScreenPriv->HotX) + 0.5;

-	v.v[1] = (y + ScreenPriv->HotY) + 0.5;

-	v.v[2] = 1;

-	pixman_f_transform_point (&crtc->f_screen_to_crtc, &v);

-	/* cursor will have 0.5 added to it already so floor is sufficent */

-	x = floor (v.v[0]);

-	y = floor (v.v[1]);

-	/*

-	 * Transform position of cursor upper left corner

-	 */

-	xf86_crtc_rotate_coord_back (crtc->rotation,

-				     cursor_info->MaxWidth,

-				     cursor_info->MaxHeight,

-				     ScreenPriv->HotX, ScreenPriv->HotY, &dx, &dy);

-	x -= dx;

-	y -= dy;

-   }

-    else

-    {

-	x -= crtc->x;

-	y -= crtc->y;

-    }

-

-    /*

-     * Disable the cursor when it is outside the viewport

-     */

-    in_range = TRUE;

-    if (x >= mode->HDisplay || y >= mode->VDisplay ||

-	x <= -cursor_info->MaxWidth || y <= -cursor_info->MaxHeight) 

-    {

-	in_range = FALSE;

-	x = 0;

-	y = 0;

-    }

-

-    crtc->cursor_in_range = in_range;

-    

-    if (in_range)

-    {

-	crtc->funcs->set_cursor_position (crtc, x, y);

-	xf86_crtc_show_cursor (crtc);

-    }

-    else

-	xf86_crtc_hide_cursor (crtc);

-}

-

-static void

-xf86_set_cursor_position (ScrnInfoPtr scrn, int x, int y)

-{

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			c;

-

-    /* undo what xf86HWCurs did to the coordinates */

-    x += scrn->frameX0;

-    y += scrn->frameY0;

-    for (c = 0; c < xf86_config->num_crtc; c++)

-    {

-	xf86CrtcPtr crtc = xf86_config->crtc[c];

-

-	if (crtc->enabled)

-	    xf86_crtc_set_cursor_position (crtc, x, y);

-    }

-}

-    

-/*

- * Load a two-color cursor into a crtc, performing rotation as needed

- */

-static void

-xf86_crtc_load_cursor_image (xf86CrtcPtr crtc, CARD8 *src)

-{

-    ScrnInfoPtr		scrn = crtc->scrn;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;

-    CARD8		*cursor_image;

-

-#ifdef ARGB_CURSOR

-    crtc->cursor_argb = FALSE;

-#endif

-

-    if (crtc->rotation == RR_Rotate_0)

-	cursor_image = src;

-    else

-    {

-        int x, y;

-    	int xin, yin;

-	int stride = cursor_info->MaxWidth >> 2;

-	

-	cursor_image = xf86_config->cursor_image;

-	memset(cursor_image, 0, cursor_info->MaxHeight * stride);

-	

-        for (y = 0; y < cursor_info->MaxHeight; y++)

-	    for (x = 0; x < cursor_info->MaxWidth; x++) 

-	    {

-		xf86_crtc_rotate_coord (crtc->rotation,

-					cursor_info->MaxWidth,

-					cursor_info->MaxHeight,

-					x, y, &xin, &yin);

-		if (get_bit(src, cursor_info, xin, yin, FALSE))

-		    set_bit(cursor_image, cursor_info, x, y, FALSE);

-		if (get_bit(src, cursor_info, xin, yin, TRUE))

-		    set_bit(cursor_image, cursor_info, x, y, TRUE);

-	    }

-    }

-    crtc->funcs->load_cursor_image (crtc, cursor_image);

-}

-    

-/*

- * Load a cursor image into all active CRTCs

- */

-static void

-xf86_load_cursor_image (ScrnInfoPtr scrn, unsigned char *src)

-{

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			c;

-

-    for (c = 0; c < xf86_config->num_crtc; c++)

-    {

-	xf86CrtcPtr crtc = xf86_config->crtc[c];

-

-	if (crtc->enabled)

-	{

-	    if (crtc->funcs->load_cursor_image)

-		xf86_crtc_load_cursor_image (crtc, src);

-	    else if (crtc->funcs->load_cursor_argb)

-		xf86_crtc_convert_cursor_to_argb (crtc, src);

-	}

-    }

-}

-

-static Bool

-xf86_use_hw_cursor (ScreenPtr screen, CursorPtr cursor)

-{

-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;

-

-    ++cursor->refcnt;

-    if (xf86_config->cursor)

-	FreeCursor (xf86_config->cursor, None);

-    xf86_config->cursor = cursor;

-

-    if (cursor->bits->width > cursor_info->MaxWidth ||

-	cursor->bits->height> cursor_info->MaxHeight)

-	return FALSE;

-

-    return TRUE;

-}

-

-static Bool

-xf86_use_hw_cursor_argb (ScreenPtr screen, CursorPtr cursor)

-{

-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;

-    

-    ++cursor->refcnt;

-    if (xf86_config->cursor)

-	FreeCursor (xf86_config->cursor, None);

-    xf86_config->cursor = cursor;

-    

-    /* Make sure ARGB support is available */

-    if ((cursor_info->Flags & HARDWARE_CURSOR_ARGB) == 0)

-	return FALSE;

-    

-    if (cursor->bits->width > cursor_info->MaxWidth ||

-	cursor->bits->height> cursor_info->MaxHeight)

-	return FALSE;

-

-    return TRUE;

-}

-

-static void

-xf86_crtc_load_cursor_argb (xf86CrtcPtr crtc, CursorPtr cursor)

-{

-    ScrnInfoPtr		scrn = crtc->scrn;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;

-    CARD32		*cursor_image = (CARD32 *) xf86_config->cursor_image;

-    CARD32		*cursor_source = (CARD32 *) cursor->bits->argb;

-    int			x, y;

-    int			xin, yin;

-    CARD32		bits;

-    int			source_width = cursor->bits->width;

-    int			source_height = cursor->bits->height;

-    int			image_width = cursor_info->MaxWidth;

-    int			image_height = cursor_info->MaxHeight;

-    

-    for (y = 0; y < image_height; y++)

-	for (x = 0; x < image_width; x++)

-	{

-	    xf86_crtc_rotate_coord (crtc->rotation, image_width, image_height,

-				    x, y, &xin, &yin);

-	    if (xin < source_width && yin < source_height)

-		bits = cursor_source[yin * source_width + xin];

-	    else

-		bits = 0;

-	    cursor_image[y * image_width + x] = bits;

-	}

-    

-    crtc->funcs->load_cursor_argb (crtc, cursor_image);

-}

-

-static void

-xf86_load_cursor_argb (ScrnInfoPtr scrn, CursorPtr cursor)

-{

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			c;

-

-    for (c = 0; c < xf86_config->num_crtc; c++)

-    {

-	xf86CrtcPtr crtc = xf86_config->crtc[c];

-

-	if (crtc->enabled)

-	    xf86_crtc_load_cursor_argb (crtc, cursor);

-    }

-}

-

-Bool

-xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags)

-{

-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    xf86CursorInfoPtr	cursor_info;

-

-    cursor_info = xf86CreateCursorInfoRec();

-    if (!cursor_info)

-	return FALSE;

-

-    xf86_config->cursor_image = malloc(max_width * max_height * 4);

-

-    if (!xf86_config->cursor_image)

-    {

-	xf86DestroyCursorInfoRec (cursor_info);

-	return FALSE;

-    }

-	

-    xf86_config->cursor_info = cursor_info;

-

-    cursor_info->MaxWidth = max_width;

-    cursor_info->MaxHeight = max_height;

-    cursor_info->Flags = flags;

-

-    cursor_info->SetCursorColors = xf86_set_cursor_colors;

-    cursor_info->SetCursorPosition = xf86_set_cursor_position;

-    cursor_info->LoadCursorImage = xf86_load_cursor_image;

-    cursor_info->HideCursor = xf86_hide_cursors;

-    cursor_info->ShowCursor = xf86_show_cursors;

-    cursor_info->UseHWCursor = xf86_use_hw_cursor;

-#ifdef ARGB_CURSOR

-    if (flags & HARDWARE_CURSOR_ARGB)

-    {

-	cursor_info->UseHWCursorARGB = xf86_use_hw_cursor_argb;

-	cursor_info->LoadCursorARGB = xf86_load_cursor_argb;

-    }

-#endif

-    

-    xf86_config->cursor = NULL;

-    xf86_hide_cursors (scrn);

-    

-    return xf86InitCursor (screen, cursor_info);

-}

-

-/**

- * Called when anything on the screen is reconfigured.

- *

- * Reloads cursor images as needed, then adjusts cursor positions

- */

-

-void

-xf86_reload_cursors (ScreenPtr screen)

-{

-    ScrnInfoPtr		scrn;

-    xf86CrtcConfigPtr   xf86_config;

-    xf86CursorInfoPtr   cursor_info;

-    CursorPtr		cursor;

-    int			x, y;

-    xf86CursorScreenPtr cursor_screen_priv;

-    

-    /* initial mode setting will not have set a screen yet.

-       May be called before the devices are initialised.

-     */

-    if (!screen || !inputInfo.pointer)

-	return;

-    cursor_screen_priv = dixLookupPrivate(&screen->devPrivates,

-					  xf86CursorScreenKey);

-    /* return if HW cursor is inactive, to avoid displaying two cursors */

-    if (!cursor_screen_priv || !cursor_screen_priv->isUp)

-	return;

-

-    scrn = xf86Screens[screen->myNum];

-    xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-

-    /* make sure the cursor code has been initialized */

-    cursor_info = xf86_config->cursor_info;

-    if (!cursor_info)

-	return;

-

-    cursor = xf86_config->cursor;

-    GetSpritePosition (inputInfo.pointer, &x, &y);

-    if (!(cursor_info->Flags & HARDWARE_CURSOR_UPDATE_UNHIDDEN))

-	(*cursor_info->HideCursor)(scrn);

-

-    if (cursor)

-    {

-	void *src = dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen));

-#ifdef ARGB_CURSOR

-	if (cursor->bits->argb && cursor_info->LoadCursorARGB)

-	    (*cursor_info->LoadCursorARGB) (scrn, cursor);

-	else if (src)

-#endif

-	    (*cursor_info->LoadCursorImage)(scrn, src);

-

-	x += scrn->frameX0 + cursor_screen_priv->HotX;

-	y += scrn->frameY0 + cursor_screen_priv->HotY;

-	(*cursor_info->SetCursorPosition)(scrn, x, y);

-    }

-}

-

-/**

- * Clean up CRTC-based cursor code

- */

-void

-xf86_cursors_fini (ScreenPtr screen)

-{

-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    

-    if (xf86_config->cursor_info)

-    {

-	xf86DestroyCursorInfoRec (xf86_config->cursor_info);

-	xf86_config->cursor_info = NULL;

-    }

-    free(xf86_config->cursor_image);

-    xf86_config->cursor_image = NULL;

-    if (xf86_config->cursor)

-    {

-	FreeCursor (xf86_config->cursor, None);

-	xf86_config->cursor = NULL;

-    }

-}

+/*
+ * Copyright © 2007 Keith Packard
+ * Copyright © 2010 Aaron Plattner
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#else
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#endif
+
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "xf86.h"
+#include "xf86DDC.h"
+#include "xf86Crtc.h"
+#include "xf86Modes.h"
+#include "xf86RandR12.h"
+#include "xf86CursorPriv.h"
+#include "X11/extensions/render.h"
+#include "X11/extensions/dpmsconst.h"
+#include "X11/Xatom.h"
+#include "picturestr.h"
+#include "cursorstr.h"
+#include "inputstr.h"
+
+/*
+ * Given a screen coordinate, rotate back to a cursor source coordinate
+ */
+static void
+xf86_crtc_rotate_coord (Rotation    rotation,
+			int	    width,
+			int	    height,
+			int	    x_dst,
+			int	    y_dst,
+			int	    *x_src,
+			int	    *y_src)
+{
+    int t;
+    
+    switch (rotation & 0xf) {
+    case RR_Rotate_0:
+	break;
+    case RR_Rotate_90:
+	t = x_dst;
+	x_dst = height - y_dst - 1;
+	y_dst = t;
+	break;
+    case RR_Rotate_180:
+	x_dst = width - x_dst - 1;
+	y_dst = height - y_dst - 1;
+	break;
+    case RR_Rotate_270:
+	t = x_dst;
+	x_dst = y_dst;
+	y_dst = width - t - 1;
+	break;
+    }
+    if (rotation & RR_Reflect_X)
+	x_dst = width - x_dst - 1;
+    if (rotation & RR_Reflect_Y)
+	y_dst = height - y_dst - 1;
+    *x_src = x_dst;
+    *y_src = y_dst;
+}
+
+/*
+ * Given a cursor source  coordinate, rotate to a screen coordinate
+ */
+static void
+xf86_crtc_rotate_coord_back (Rotation    rotation,
+			     int	    width,
+			     int	    height,
+			     int	    x_dst,
+			     int	    y_dst,
+			     int	    *x_src,
+			     int	    *y_src)
+{
+    int t;
+    
+    if (rotation & RR_Reflect_X)
+	x_dst = width - x_dst - 1;
+    if (rotation & RR_Reflect_Y)
+	y_dst = height - y_dst - 1;
+
+    switch (rotation & 0xf) {
+    case RR_Rotate_0:
+	break;
+    case RR_Rotate_90:
+	t = x_dst;
+	x_dst = y_dst;
+	y_dst = width - t - 1;
+	break;
+    case RR_Rotate_180:
+	x_dst = width - x_dst - 1;
+	y_dst = height - y_dst - 1;
+	break;
+    case RR_Rotate_270:
+	t = x_dst;
+	x_dst = height - y_dst - 1;
+	y_dst = t;
+	break;
+    }
+    *x_src = x_dst;
+    *y_src = y_dst;
+}
+
+struct cursor_bit {
+    CARD8 *byte;
+    char bitpos;
+};
+
+/*
+ * Convert an x coordinate to a position within the cursor bitmap
+ */
+static struct cursor_bit
+cursor_bitpos (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y,
+	       Bool mask)
+{
+    const int flags = cursor_info->Flags;
+    const Bool interleaved =
+	!!(flags & (HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1 |
+		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8 |
+		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16 |
+		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32 |
+		    HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64));
+    const int width = cursor_info->MaxWidth;
+    const int height = cursor_info->MaxHeight;
+    const int stride = interleaved ? width / 4 : width / 8;
+
+    struct cursor_bit ret;
+
+    image += y * stride;
+
+    if (flags & HARDWARE_CURSOR_SWAP_SOURCE_AND_MASK)
+	mask = !mask;
+    if (flags & HARDWARE_CURSOR_NIBBLE_SWAPPED)
+	x = (x & ~3) | (3 - (x & 3));
+    if (((flags & HARDWARE_CURSOR_BIT_ORDER_MSBFIRST) == 0) ==
+	(X_BYTE_ORDER == X_BIG_ENDIAN))
+	x = (x & ~7) | (7 - (x & 7));
+    if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_1)
+	x = (x << 1) + mask;
+    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_8)
+	x = ((x & ~7) << 1) | (mask << 3) | (x & 7);
+    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_16)
+	x = ((x & ~15) << 1) | (mask << 4) | (x & 15);
+    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_32)
+	x = ((x & ~31) << 1) | (mask << 5) | (x & 31);
+    else if (flags & HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64)
+	x = ((x & ~63) << 1) | (mask << 6) | (x & 63);
+    else if (mask)
+	image += stride * height;
+
+    ret.byte = image + (x / 8);
+    ret.bitpos = x & 7;
+
+    return ret;
+}
+
+/*
+ * Fetch one bit from a cursor bitmap
+ */
+static CARD8
+get_bit (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
+{
+    struct cursor_bit bit = cursor_bitpos(image, cursor_info, x, y, mask);
+    return (*bit.byte >> bit.bitpos) & 1;
+}
+
+/*
+ * Set one bit in a cursor bitmap
+ */
+static void
+set_bit (CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
+{
+    struct cursor_bit bit = cursor_bitpos(image, cursor_info, x, y, mask);
+    *bit.byte |= 1 << bit.bitpos;
+}
+    
+/*
+ * Load a two color cursor into a driver that supports only ARGB cursors
+ */
+static void
+xf86_crtc_convert_cursor_to_argb (xf86CrtcPtr crtc, unsigned char *src)
+{
+    ScrnInfoPtr		scrn = crtc->scrn;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
+    CARD32		*cursor_image = (CARD32 *) xf86_config->cursor_image;
+    int			x, y;
+    int			xin, yin;
+    int			flags = cursor_info->Flags;
+    CARD32		bits;
+
+#ifdef ARGB_CURSOR
+    crtc->cursor_argb = FALSE;
+#endif
+
+    for (y = 0; y < cursor_info->MaxHeight; y++)
+	for (x = 0; x < cursor_info->MaxWidth; x++) 
+	{
+	    xf86_crtc_rotate_coord (crtc->rotation,
+				    cursor_info->MaxWidth,
+				    cursor_info->MaxHeight,
+				    x, y, &xin, &yin);
+	    if (get_bit (src, cursor_info, xin, yin, TRUE) ==
+		((flags & HARDWARE_CURSOR_INVERT_MASK) == 0))
+	    {
+		if (get_bit (src, cursor_info, xin, yin, FALSE))
+		    bits = xf86_config->cursor_fg;
+		else
+		    bits = xf86_config->cursor_bg;
+	    }
+	    else
+		bits = 0;
+	    cursor_image[y * cursor_info->MaxWidth + x] = bits;
+	}
+    crtc->funcs->load_cursor_argb (crtc, cursor_image);
+}
+
+/*
+ * Set the colors for a two-color cursor (ignore for ARGB cursors)
+ */
+static void
+xf86_set_cursor_colors (ScrnInfoPtr scrn, int bg, int fg)
+{
+    ScreenPtr		screen = scrn->pScreen;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    CursorPtr		cursor = xf86_config->cursor;
+    int			c;
+    CARD8		*bits = cursor ?
+        dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen))
+      : NULL;
+
+    /* Save ARGB versions of these colors */
+    xf86_config->cursor_fg = (CARD32) fg | 0xff000000;
+    xf86_config->cursor_bg = (CARD32) bg | 0xff000000;
+    
+    for (c = 0; c < xf86_config->num_crtc; c++)
+    {
+	xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+	if (crtc->enabled && !crtc->cursor_argb)
+	{
+	    if (crtc->funcs->load_cursor_image)
+		crtc->funcs->set_cursor_colors (crtc, bg, fg);
+	    else if (bits)
+		xf86_crtc_convert_cursor_to_argb (crtc, bits);
+	}
+    }
+}
+
+static void
+xf86_crtc_hide_cursor (xf86CrtcPtr crtc)
+{
+    if (crtc->cursor_shown)
+    {
+	crtc->funcs->hide_cursor (crtc);
+	crtc->cursor_shown = FALSE;
+    }
+}
+
+void
+xf86_hide_cursors (ScrnInfoPtr scrn)
+{
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			c;
+
+    xf86_config->cursor_on = FALSE;
+    for (c = 0; c < xf86_config->num_crtc; c++)
+    {
+	xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+	if (crtc->enabled)
+	    xf86_crtc_hide_cursor (crtc);
+    }
+}
+    
+static void
+xf86_crtc_show_cursor (xf86CrtcPtr crtc)
+{
+    if (!crtc->cursor_shown && crtc->cursor_in_range)
+    {
+	crtc->funcs->show_cursor (crtc);
+	crtc->cursor_shown = TRUE;
+    }
+}
+
+void
+xf86_show_cursors (ScrnInfoPtr scrn)
+{
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			c;
+
+    xf86_config->cursor_on = TRUE;
+    for (c = 0; c < xf86_config->num_crtc; c++)
+    {
+	xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+	if (crtc->enabled)
+	    xf86_crtc_show_cursor (crtc);
+    }
+}
+    
+static void
+xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
+{
+    ScrnInfoPtr		scrn = crtc->scrn;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
+    DisplayModePtr	mode = &crtc->mode;
+    Bool		in_range;
+    int			dx, dy;
+
+    /*
+     * Transform position of cursor on screen
+     */
+    if (crtc->transform_in_use)
+    {
+	ScreenPtr	screen = scrn->pScreen;
+	xf86CursorScreenPtr ScreenPriv =
+	    (xf86CursorScreenPtr)dixLookupPrivate(&screen->devPrivates,
+						  xf86CursorScreenKey);
+	struct pict_f_vector   v;
+
+	v.v[0] = (x + ScreenPriv->HotX) + 0.5;
+	v.v[1] = (y + ScreenPriv->HotY) + 0.5;
+	v.v[2] = 1;
+	pixman_f_transform_point (&crtc->f_framebuffer_to_crtc, &v);
+	/* cursor will have 0.5 added to it already so floor is sufficent */
+	x = floor (v.v[0]);
+	y = floor (v.v[1]);
+	/*
+	 * Transform position of cursor upper left corner
+	 */
+	xf86_crtc_rotate_coord_back (crtc->rotation,
+				     cursor_info->MaxWidth,
+				     cursor_info->MaxHeight,
+				     ScreenPriv->HotX, ScreenPriv->HotY, &dx, &dy);
+	x -= dx;
+	y -= dy;
+   }
+    else
+    {
+	x -= crtc->x;
+	y -= crtc->y;
+    }
+
+    /*
+     * Disable the cursor when it is outside the viewport
+     */
+    in_range = TRUE;
+    if (x >= mode->HDisplay || y >= mode->VDisplay ||
+	x <= -cursor_info->MaxWidth || y <= -cursor_info->MaxHeight) 
+    {
+	in_range = FALSE;
+	x = 0;
+	y = 0;
+    }
+
+    crtc->cursor_in_range = in_range;
+    
+    if (in_range)
+    {
+	crtc->funcs->set_cursor_position (crtc, x, y);
+	xf86_crtc_show_cursor (crtc);
+    }
+    else
+	xf86_crtc_hide_cursor (crtc);
+}
+
+static void
+xf86_set_cursor_position (ScrnInfoPtr scrn, int x, int y)
+{
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			c;
+
+    /* undo what xf86HWCurs did to the coordinates */
+    x += scrn->frameX0;
+    y += scrn->frameY0;
+    for (c = 0; c < xf86_config->num_crtc; c++)
+    {
+	xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+	if (crtc->enabled)
+	    xf86_crtc_set_cursor_position (crtc, x, y);
+    }
+}
+    
+/*
+ * Load a two-color cursor into a crtc, performing rotation as needed
+ */
+static void
+xf86_crtc_load_cursor_image (xf86CrtcPtr crtc, CARD8 *src)
+{
+    ScrnInfoPtr		scrn = crtc->scrn;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
+    CARD8		*cursor_image;
+
+#ifdef ARGB_CURSOR
+    crtc->cursor_argb = FALSE;
+#endif
+
+    if (crtc->rotation == RR_Rotate_0)
+	cursor_image = src;
+    else
+    {
+        int x, y;
+    	int xin, yin;
+	int stride = cursor_info->MaxWidth >> 2;
+	
+	cursor_image = xf86_config->cursor_image;
+	memset(cursor_image, 0, cursor_info->MaxHeight * stride);
+	
+        for (y = 0; y < cursor_info->MaxHeight; y++)
+	    for (x = 0; x < cursor_info->MaxWidth; x++) 
+	    {
+		xf86_crtc_rotate_coord (crtc->rotation,
+					cursor_info->MaxWidth,
+					cursor_info->MaxHeight,
+					x, y, &xin, &yin);
+		if (get_bit(src, cursor_info, xin, yin, FALSE))
+		    set_bit(cursor_image, cursor_info, x, y, FALSE);
+		if (get_bit(src, cursor_info, xin, yin, TRUE))
+		    set_bit(cursor_image, cursor_info, x, y, TRUE);
+	    }
+    }
+    crtc->funcs->load_cursor_image (crtc, cursor_image);
+}
+    
+/*
+ * Load a cursor image into all active CRTCs
+ */
+static void
+xf86_load_cursor_image (ScrnInfoPtr scrn, unsigned char *src)
+{
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			c;
+
+    for (c = 0; c < xf86_config->num_crtc; c++)
+    {
+	xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+	if (crtc->enabled)
+	{
+	    if (crtc->funcs->load_cursor_image)
+		xf86_crtc_load_cursor_image (crtc, src);
+	    else if (crtc->funcs->load_cursor_argb)
+		xf86_crtc_convert_cursor_to_argb (crtc, src);
+	}
+    }
+}
+
+static Bool
+xf86_use_hw_cursor (ScreenPtr screen, CursorPtr cursor)
+{
+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
+
+    ++cursor->refcnt;
+    if (xf86_config->cursor)
+	FreeCursor (xf86_config->cursor, None);
+    xf86_config->cursor = cursor;
+
+    if (cursor->bits->width > cursor_info->MaxWidth ||
+	cursor->bits->height> cursor_info->MaxHeight)
+	return FALSE;
+
+    return TRUE;
+}
+
+static Bool
+xf86_use_hw_cursor_argb (ScreenPtr screen, CursorPtr cursor)
+{
+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
+    
+    ++cursor->refcnt;
+    if (xf86_config->cursor)
+	FreeCursor (xf86_config->cursor, None);
+    xf86_config->cursor = cursor;
+    
+    /* Make sure ARGB support is available */
+    if ((cursor_info->Flags & HARDWARE_CURSOR_ARGB) == 0)
+	return FALSE;
+    
+    if (cursor->bits->width > cursor_info->MaxWidth ||
+	cursor->bits->height> cursor_info->MaxHeight)
+	return FALSE;
+
+    return TRUE;
+}
+
+static void
+xf86_crtc_load_cursor_argb (xf86CrtcPtr crtc, CursorPtr cursor)
+{
+    ScrnInfoPtr		scrn = crtc->scrn;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr	cursor_info = xf86_config->cursor_info;
+    CARD32		*cursor_image = (CARD32 *) xf86_config->cursor_image;
+    CARD32		*cursor_source = (CARD32 *) cursor->bits->argb;
+    int			x, y;
+    int			xin, yin;
+    CARD32		bits;
+    int			source_width = cursor->bits->width;
+    int			source_height = cursor->bits->height;
+    int			image_width = cursor_info->MaxWidth;
+    int			image_height = cursor_info->MaxHeight;
+    
+    for (y = 0; y < image_height; y++)
+	for (x = 0; x < image_width; x++)
+	{
+	    xf86_crtc_rotate_coord (crtc->rotation, image_width, image_height,
+				    x, y, &xin, &yin);
+	    if (xin < source_width && yin < source_height)
+		bits = cursor_source[yin * source_width + xin];
+	    else
+		bits = 0;
+	    cursor_image[y * image_width + x] = bits;
+	}
+    
+    crtc->funcs->load_cursor_argb (crtc, cursor_image);
+}
+
+static void
+xf86_load_cursor_argb (ScrnInfoPtr scrn, CursorPtr cursor)
+{
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			c;
+
+    for (c = 0; c < xf86_config->num_crtc; c++)
+    {
+	xf86CrtcPtr crtc = xf86_config->crtc[c];
+
+	if (crtc->enabled)
+	    xf86_crtc_load_cursor_argb (crtc, cursor);
+    }
+}
+
+Bool
+xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags)
+{
+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    xf86CursorInfoPtr	cursor_info;
+
+    cursor_info = xf86CreateCursorInfoRec();
+    if (!cursor_info)
+	return FALSE;
+
+    xf86_config->cursor_image = malloc(max_width * max_height * 4);
+
+    if (!xf86_config->cursor_image)
+    {
+	xf86DestroyCursorInfoRec (cursor_info);
+	return FALSE;
+    }
+	
+    xf86_config->cursor_info = cursor_info;
+
+    cursor_info->MaxWidth = max_width;
+    cursor_info->MaxHeight = max_height;
+    cursor_info->Flags = flags;
+
+    cursor_info->SetCursorColors = xf86_set_cursor_colors;
+    cursor_info->SetCursorPosition = xf86_set_cursor_position;
+    cursor_info->LoadCursorImage = xf86_load_cursor_image;
+    cursor_info->HideCursor = xf86_hide_cursors;
+    cursor_info->ShowCursor = xf86_show_cursors;
+    cursor_info->UseHWCursor = xf86_use_hw_cursor;
+#ifdef ARGB_CURSOR
+    if (flags & HARDWARE_CURSOR_ARGB)
+    {
+	cursor_info->UseHWCursorARGB = xf86_use_hw_cursor_argb;
+	cursor_info->LoadCursorARGB = xf86_load_cursor_argb;
+    }
+#endif
+    
+    xf86_config->cursor = NULL;
+    xf86_hide_cursors (scrn);
+    
+    return xf86InitCursor (screen, cursor_info);
+}
+
+/**
+ * Called when anything on the screen is reconfigured.
+ *
+ * Reloads cursor images as needed, then adjusts cursor positions
+ */
+
+void
+xf86_reload_cursors (ScreenPtr screen)
+{
+    ScrnInfoPtr		scrn;
+    xf86CrtcConfigPtr   xf86_config;
+    xf86CursorInfoPtr   cursor_info;
+    CursorPtr		cursor;
+    int			x, y;
+    xf86CursorScreenPtr cursor_screen_priv;
+    
+    /* initial mode setting will not have set a screen yet.
+       May be called before the devices are initialised.
+     */
+    if (!screen || !inputInfo.pointer)
+	return;
+    cursor_screen_priv = dixLookupPrivate(&screen->devPrivates,
+					  xf86CursorScreenKey);
+    /* return if HW cursor is inactive, to avoid displaying two cursors */
+    if (!cursor_screen_priv || !cursor_screen_priv->isUp)
+	return;
+
+    scrn = xf86Screens[screen->myNum];
+    xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+
+    /* make sure the cursor code has been initialized */
+    cursor_info = xf86_config->cursor_info;
+    if (!cursor_info)
+	return;
+
+    cursor = xf86_config->cursor;
+    GetSpritePosition (inputInfo.pointer, &x, &y);
+    if (!(cursor_info->Flags & HARDWARE_CURSOR_UPDATE_UNHIDDEN))
+	(*cursor_info->HideCursor)(scrn);
+
+    if (cursor)
+    {
+	void *src = dixLookupPrivate(&cursor->devPrivates, CursorScreenKey(screen));
+#ifdef ARGB_CURSOR
+	if (cursor->bits->argb && cursor_info->LoadCursorARGB)
+	    (*cursor_info->LoadCursorARGB) (scrn, cursor);
+	else if (src)
+#endif
+	    (*cursor_info->LoadCursorImage)(scrn, src);
+
+	x += scrn->frameX0 + cursor_screen_priv->HotX;
+	y += scrn->frameY0 + cursor_screen_priv->HotY;
+	(*cursor_info->SetCursorPosition)(scrn, x, y);
+    }
+}
+
+/**
+ * Clean up CRTC-based cursor code
+ */
+void
+xf86_cursors_fini (ScreenPtr screen)
+{
+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    
+    if (xf86_config->cursor_info)
+    {
+	xf86DestroyCursorInfoRec (xf86_config->cursor_info);
+	xf86_config->cursor_info = NULL;
+    }
+    free(xf86_config->cursor_image);
+    xf86_config->cursor_image = NULL;
+    if (xf86_config->cursor)
+    {
+	FreeCursor (xf86_config->cursor, None);
+	xf86_config->cursor = NULL;
+    }
+}
diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index 7bfb6fa47..2fe0c47e6 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -1,2029 +1,1802 @@
-/*

- * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that copyright

- * notice and this permission notice appear in supporting documentation, and

- * that the name of the copyright holders not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  The copyright holders make no representations

- * about the suitability of this software for any purpose.  It is provided "as

- * is" without express or implied warranty.

- *

- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

- * OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#else

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#endif

-

-#include "xf86.h"

-#include "os.h"

-#include "globals.h"

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86DDC.h"

-#include "mipointer.h"

-#include "windowstr.h"

-#include "inputstr.h"

-#include <randrstr.h>

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

-

-#include "xf86Crtc.h"

-#include "xf86RandR12.h"

-

-typedef struct _xf86RandR12Info {

-    int				    virtualX;

-    int				    virtualY;

-    int				    mmWidth;

-    int				    mmHeight;

-    int				    maxX;

-    int				    maxY;

-    int				    pointerX;

-    int				    pointerY;

-    Rotation			    rotation; /* current mode */

-    Rotation                        supported_rotations; /* driver supported */

-

-    /* Used to wrap EnterVT so we can re-probe the outputs when a laptop unsuspends

-     * (actually, any time that we switch back into our VT).

-     *

-     * See https://bugs.freedesktop.org/show_bug.cgi?id=21554

-     */

-    xf86EnterVTProc *orig_EnterVT;

-} XF86RandRInfoRec, *XF86RandRInfoPtr;

-

-#ifdef RANDR_12_INTERFACE

-static Bool xf86RandR12Init12 (ScreenPtr pScreen);

-static Bool xf86RandR12CreateScreenResources12 (ScreenPtr pScreen);

-#endif

-

-static int xf86RandR12Generation;

-

-static DevPrivateKeyRec xf86RandR12KeyRec;

-static DevPrivateKey xf86RandR12Key;

-#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \

-    dixLookupPrivate(&(p)->devPrivates, xf86RandR12Key))

-

-

-static int

-xf86RandR12ModeRefresh (DisplayModePtr mode)

-{

-    if (mode->VRefresh)

-	return (int) (mode->VRefresh + 0.5);

-    else

-	return (int) (mode->Clock * 1000.0 / mode->HTotal / mode->VTotal + 0.5);

-}

-

-/* Adapt panning area; return TRUE if panning area was valid without adaption */

-static int

-xf86RandR13VerifyPanningArea (xf86CrtcPtr crtc, int screenWidth, int screenHeight)

-{

-    int ret = TRUE;

-

-    if (crtc->version < 2)

-	return FALSE;

-

-    if (crtc->panningTotalArea.x2 <= crtc->panningTotalArea.x1) {

-	/* Panning in X is disabled */

-	if (crtc->panningTotalArea.x1 || crtc->panningTotalArea.x2)

-	    /* Illegal configuration -> fail/disable */

-	    ret = FALSE;

-	crtc->panningTotalArea.x1    = crtc->panningTotalArea.x2    = 0;

-	crtc->panningTrackingArea.x1 = crtc->panningTrackingArea.x2 = 0;

-	crtc->panningBorder[0]       = crtc->panningBorder[2]       = 0;

-    } else {

-	/* Panning in X is enabled */

-	if (crtc->panningTotalArea.x1 < 0) {

-	    /* Panning region outside screen -> move inside */

-	    crtc->panningTotalArea.x2 -= crtc->panningTotalArea.x1;

-	    crtc->panningTotalArea.x1 = 0;

-	    ret = FALSE;

-	}

-	if (crtc->panningTotalArea.x2 < crtc->panningTotalArea.x1 + crtc->mode.HDisplay) {

-	    /* Panning region smaller than displayed area -> crop to displayed area */

-	    crtc->panningTotalArea.x2 = crtc->panningTotalArea.x1 + crtc->mode.HDisplay;

-	    ret = FALSE;

-	}

-	if (crtc->panningTotalArea.x2 > screenWidth) {

-	    /* Panning region larger than screen -> move inside, then crop to screen */

-	    crtc->panningTotalArea.x1 -= crtc->panningTotalArea.x2 - screenWidth;

-	    crtc->panningTotalArea.x2 = screenWidth;

-	    ret = FALSE;

-	    if (crtc->panningTotalArea.x1 < 0)

-		crtc->panningTotalArea.x1 = 0;

-	}

-	if (crtc->panningBorder[0] + crtc->panningBorder[2] > crtc->mode.HDisplay) {

-	    /* Borders too large -> set to 0 */

-	    crtc->panningBorder[0] = crtc->panningBorder[2] = 0;

-	    ret = FALSE;

-	}

-    }

-

-    if (crtc->panningTotalArea.y2 <= crtc->panningTotalArea.y1) {

-	/* Panning in Y is disabled */

-	if (crtc->panningTotalArea.y1 || crtc->panningTotalArea.y2)

-	    /* Illegal configuration -> fail/disable */

-	    ret = FALSE;

-	crtc->panningTotalArea.y1    = crtc->panningTotalArea.y2    = 0;

-	crtc->panningTrackingArea.y1 = crtc->panningTrackingArea.y2 = 0;

-	crtc->panningBorder[1]       = crtc->panningBorder[3]       = 0;

-    } else {

-	/* Panning in Y is enabled */

-	if (crtc->panningTotalArea.y1 < 0) {

-	    /* Panning region outside screen -> move inside */

-	    crtc->panningTotalArea.y2 -= crtc->panningTotalArea.y1;

-	    crtc->panningTotalArea.y1 = 0;

-	    ret = FALSE;

-	}

-	if (crtc->panningTotalArea.y2 < crtc->panningTotalArea.y1 + crtc->mode.VDisplay) {

-	    /* Panning region smaller than displayed area -> crop to displayed area */

-	    crtc->panningTotalArea.y2 = crtc->panningTotalArea.y1 + crtc->mode.VDisplay;

-	    ret = FALSE;

-	}

-	if (crtc->panningTotalArea.y2 > screenHeight) {

-	    /* Panning region larger than screen -> move inside, then crop to screen */

-	    crtc->panningTotalArea.y1 -= crtc->panningTotalArea.y2 - screenHeight;

-	    crtc->panningTotalArea.y2 = screenHeight;

-	    ret = FALSE;

-	    if (crtc->panningTotalArea.y1 < 0)

-		crtc->panningTotalArea.y1 = 0;

-	}

-	if (crtc->panningBorder[1] + crtc->panningBorder[3] > crtc->mode.VDisplay) {

-	    /* Borders too large -> set to 0 */

-	    crtc->panningBorder[1] = crtc->panningBorder[3] = 0;

-	    ret = FALSE;

-	}

-    }

-

-    return ret;

-}

-

-/*

- * The heart of the panning operation:

- *

- * Given a frame buffer position (fb_x, fb_y),

- * and a crtc position (crtc_x, crtc_y),

- * and a transform matrix which maps frame buffer to crtc,

- * compute a panning position (pan_x, pan_y) that

- * makes the resulting transform line those two up

- */

-

-static void

-xf86ComputeCrtcPan (Bool sprite_transform_in_use,

-		    struct pixman_f_transform *m,

-		    double screen_x, double screen_y,

-		    double crtc_x, double crtc_y,

-		    int old_pan_x, int old_pan_y,

-		    int *new_pan_x, int *new_pan_y)

-{

-    if (sprite_transform_in_use) {

-	/*

-	 * Given the current transform, M, the current position

-	 * on the Screen, S, and the desired position on the CRTC,

-	 * C, compute a translation, T, such that:

-	 *

-	 * M T S = C

-	 *

-	 * where T is of the form

-	 *

-	 * | 1 0 dx |

-	 * | 0 1 dy |

-	 * | 0 0 1  |

-	 *

-	 * M T S =

-	 *   | M00 Sx + M01 Sy + M00 dx + M01 dy + M02 |   | Cx F |

-	 *   | M10 Sx + M11 Sy + M10 dx + M11 dy + M12 | = | Cy F |

-	 *   | M20 Sx + M21 Sy + M20 dx + M21 dy + M22 |   |  F   |

-	 *

-	 * R = M S

-	 *

-	 *   Cx F = M00 dx + M01 dy + R0

-	 *   Cy F = M10 dx + M11 dy + R1

-	 *      F = M20 dx + M21 dy + R2

-	 *

-	 * Zero out dx, then dy

-	 *

-	 * F (Cx M10 - Cy M00) =

-	 *	    (M10 M01 - M00 M11) dy + M10 R0 - M00 R1

-	 * F (M10 - Cy M20) =

-	 *	    (M10 M21 - M20 M11) dy + M10 R2 - M20 R1

-	 *

-	 * F (Cx M11 - Cy M01) =

-	 *	    (M11 M00 - M01 M10) dx + M11 R0 - M01 R1

-	 * F (M11 - Cy M21) =

-	 *	    (M11 M20 - M21 M10) dx + M11 R2 - M21 R1

-	 *

-	 * Make some temporaries

-	 *

-	 * T = | Cx M10 - Cy M00 |

-	 *     | Cx M11 - Cy M01 |

-	 *

-	 * U = | M10 M01 - M00 M11 |

-	 *     | M11 M00 - M01 M10 |

-	 *

-	 * Q = | M10 R0 - M00 R1 |

-	 *     | M11 R0 - M01 R1 |

-	 *

-	 * P = | M10 - Cy M20 |

-	 *     | M11 - Cy M21 |

-	 *

-	 * W = | M10 M21 - M20 M11 |

-	 *     | M11 M20 - M21 M10 |

-	 *

-	 * V = | M10 R2 - M20 R1 |

-	 *	   | M11 R2 - M21 R1 |

-	 *

-	 * Rewrite:

-	 *

-	 * F T0 = U0 dy + Q0

-	 * F P0 = W0 dy + V0

-	 * F T1 = U1 dx + Q1

-	 * F P1 = W1 dx + V1

-	 *

-	 * Solve for F (two ways)

-	 *

-	 * F (W0 T0 - U0 P0)  = W0 Q0 - U0 V0

-	 *

-	 *     W0 Q0 - U0 V0

-	 * F = -------------

-	 *     W0 T0 - U0 P0

-	 *

-	 * F (W1 T1 - U1 P1) = W1 Q1 - U1 V1

-	 *

-	 *     W1 Q1 - U1 V1

-	 * F = -------------

-	 *     W1 T1 - U1 P1

-	 *

-	 * We'll use which ever solution works (denominator != 0)

-	 *

-	 * Finally, solve for dx and dy:

-	 *

-	 * dx = (F T1 - Q1) / U1

-	 * dx = (F P1 - V1) / W1

-	 *

-	 * dy = (F T0 - Q0) / U0

-	 * dy = (F P0 - V0) / W0

-	 */

-	double			    r[3];

-	double			    q[2], u[2], t[2], v[2], w[2], p[2];

-	double			    f;

-	struct pict_f_vector	    d;

-	int			    i;

-

-	/* Get the un-normalized crtc coordinates again */

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

-	    r[i] = m->m[i][0] * screen_x + m->m[i][1] * screen_y + m->m[i][2];

-

-	/* Combine values into temporaries */

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

-	    q[i] = m->m[1][i] * r[0] - m->m[0][i] * r[1];

-	    u[i] = m->m[1][i] * m->m[0][1-i] - m->m[0][i] * m->m[1][1-i];

-	    t[i] = m->m[1][i] * crtc_x - m->m[0][i] * crtc_y;

-

-	    v[i] = m->m[1][i] * r[2] - m->m[2][i] * r[1];

-	    w[i] = m->m[1][i] * m->m[2][1-i] - m->m[2][i] * m->m[1][1-i];

-	    p[i] = m->m[1][i] - m->m[2][i] * crtc_y;

-	}

-

-	/* Find a way to compute f */

-	f = 0;

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

-	    double a = w[i] * q[i] - u[i] * v[i];

-	    double b = w[i] * t[i] - u[i] * p[i];

-	    if (b != 0) {

-		f = a/b;

-		break;

-	    }

-	}

-

-	/* Solve for the resulting transform vector */

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

-	    if (u[i])

-		d.v[1-i] = (t[i] * f - q[i]) / u[i];

-	    else if (w[1])

-		d.v[1-i] = (p[i] * f - v[i]) / w[i];

-	    else

-		d.v[1-i] = 0;

-	}

-	*new_pan_x = old_pan_x - floor (d.v[0] + 0.5);

-	*new_pan_y = old_pan_y - floor (d.v[1] + 0.5);

-    } else {

-	*new_pan_x = screen_x - crtc_x;

-	*new_pan_y = screen_y - crtc_y;

-    }

-}

-

-static void

-xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)

-{

-    int newX, newY;

-    int width, height;

-    Bool panned = FALSE;

-

-    if (crtc->version < 2)

-	return;

-

-    if (! crtc->enabled						||

-	(crtc->panningTotalArea.x2 <= crtc->panningTotalArea.x1	&&

-	 crtc->panningTotalArea.y2 <= crtc->panningTotalArea.y1))

-	return;

-

-    newX   = crtc->x;

-    newY   = crtc->y;

-    width  = crtc->mode.HDisplay;

-    height = crtc->mode.VDisplay;

-

-    if ((crtc->panningTrackingArea.x2 <= crtc->panningTrackingArea.x1 ||

-	 (x >= crtc->panningTrackingArea.x1 && x < crtc->panningTrackingArea.x2)) &&

-	(crtc->panningTrackingArea.y2 <= crtc->panningTrackingArea.y1 ||

-	 (y >= crtc->panningTrackingArea.y1 && y < crtc->panningTrackingArea.y2)))

-    {

-	struct pict_f_vector    c;

-

-	/*

-	 * Pre-clip the mouse position to the panning area so that we don't

-	 * push the crtc outside. This doesn't deal with changes to the

-	 * panning values, only mouse position changes.

-	 */

-	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1)

-	{

-	    if (x < crtc->panningTotalArea.x1)

-		x = crtc->panningTotalArea.x1;

-	    if (x >= crtc->panningTotalArea.x2)

-		x = crtc->panningTotalArea.x2 - 1;

-	}

-	if (crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1)

-	{

-	    if (y < crtc->panningTotalArea.y1)

-		y = crtc->panningTotalArea.y1;

-	    if (y >= crtc->panningTotalArea.y2)

-		y = crtc->panningTotalArea.y2 - 1;

-	}

-

-	c.v[0] = x;

-	c.v[1] = y;

-	c.v[2] = 1.0;

-	if (crtc->sprite_transform_in_use) {

-	    pixman_f_transform_point(&crtc->f_screen_to_crtc, &c);

-	} else {

-	    c.v[0] -= crtc->x;

-	    c.v[1] -= crtc->y;

-	}

-

-	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1) {

-	    if (c.v[0] < crtc->panningBorder[0]) {

-		c.v[0] = crtc->panningBorder[0];

-		panned = TRUE;

-	    }

-	    if (c.v[0] >= width - crtc->panningBorder[2]) {

-		c.v[0] = width - crtc->panningBorder[2] - 1;

-		panned = TRUE;

-	    }

-	}

-	if (crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {

-	    if (c.v[1] < crtc->panningBorder[1]) {

-		c.v[1] = crtc->panningBorder[1];

-		panned = TRUE;

-	    }

-	    if (c.v[1] >= height - crtc->panningBorder[3]) {

-		c.v[1] = height - crtc->panningBorder[3] - 1;

-		panned = TRUE;

-	    }

-	}

-	if (panned)

-	    xf86ComputeCrtcPan (crtc->sprite_transform_in_use,

-				&crtc->f_screen_to_crtc,

-				x, y, c.v[0], c.v[1],

-				newX, newY, &newX, &newY);

-    }

-

-    /*

-     * Ensure that the crtc is within the panning region.

-     *

-     * XXX This computation only works when we do not have a transform

-     * in use.

-     */

-    if (!crtc->sprite_transform_in_use)

-    {

-	/* Validate against [xy]1 after [xy]2, to be sure that results are > 0 for [xy]1 > 0 */

-	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1) {

-	    if (newX > crtc->panningTotalArea.x2 - width)

-		newX =  crtc->panningTotalArea.x2 - width;

-	    if (newX <  crtc->panningTotalArea.x1)

-		newX =  crtc->panningTotalArea.x1;

-	}

-	if (crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {

-	    if (newY > crtc->panningTotalArea.y2 - height)

-		newY =  crtc->panningTotalArea.y2 - height;

-	    if (newY <  crtc->panningTotalArea.y1)

-		newY =  crtc->panningTotalArea.y1;

-	}

-    }

-    if (newX != crtc->x || newY != crtc->y)

-	xf86CrtcSetOrigin (crtc, newX, newY);

-}

-

-static Bool

-xf86RandR12GetInfo (ScreenPtr pScreen, Rotation *rotations)

-{

-    RRScreenSizePtr	    pSize;

-    ScrnInfoPtr		    scrp = XF86SCRNINFO(pScreen);

-    XF86RandRInfoPtr	    randrp = XF86RANDRINFO(pScreen);

-    DisplayModePtr	    mode;

-    int			    refresh0 = 60;

-    int			    maxX = 0, maxY = 0;

-

-    *rotations = randrp->supported_rotations;

-

-    if (randrp->virtualX == -1 || randrp->virtualY == -1)

-    {

-	randrp->virtualX = scrp->virtualX;

-	randrp->virtualY = scrp->virtualY;

-    }

-

-    /* Re-probe the outputs for new monitors or modes */

-    if (scrp->vtSema)

-    {

-	xf86ProbeOutputModes (scrp, 0, 0);

-	xf86SetScrnInfoModes (scrp);

-    }

-

-    for (mode = scrp->modes; ; mode = mode->next)

-    {

-	int refresh = xf86RandR12ModeRefresh (mode);

-	if (randrp->maxX == 0 || randrp->maxY == 0)

-	{

-		if (maxX < mode->HDisplay)

-			maxX = mode->HDisplay;

-		if (maxY < mode->VDisplay)

-			maxY = mode->VDisplay;

-	}

-	if (mode == scrp->modes)

-	    refresh0 = refresh;

-	pSize = RRRegisterSize (pScreen,

-				mode->HDisplay, mode->VDisplay,

-				randrp->mmWidth, randrp->mmHeight);

-	if (!pSize)

-	    return FALSE;

-	RRRegisterRate (pScreen, pSize, refresh);

-

-	if (xf86ModesEqual(mode, scrp->currentMode))

-	{

-	    RRSetCurrentConfig (pScreen, randrp->rotation, refresh, pSize);

-	}

-	if (mode->next == scrp->modes)

-	    break;

-    }

-

-    if (randrp->maxX == 0 || randrp->maxY == 0)

-    {

-	randrp->maxX = maxX;

-	randrp->maxY = maxY;

-    }

-

-    return TRUE;

-}

-

-static Bool

-xf86RandR12SetMode (ScreenPtr	    pScreen,

-		  DisplayModePtr    mode,

-		  Bool		    useVirtual,

-		  int		    mmWidth,

-		  int		    mmHeight)

-{

-    ScrnInfoPtr		scrp = XF86SCRNINFO(pScreen);

-    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);

-    int			oldWidth = pScreen->width;

-    int			oldHeight = pScreen->height;

-    int			oldmmWidth = pScreen->mmWidth;

-    int			oldmmHeight = pScreen->mmHeight;

-    WindowPtr		pRoot = pScreen->root;

-    DisplayModePtr      currentMode = NULL;

-    Bool 		ret = TRUE;

-

-    if (pRoot)

-	(*scrp->EnableDisableFBAccess) (pScreen->myNum, FALSE);

-    if (useVirtual)

-    {

-	scrp->virtualX = randrp->virtualX;

-	scrp->virtualY = randrp->virtualY;

-    }

-    else

-    {

-	scrp->virtualX = mode->HDisplay;

-	scrp->virtualY = mode->VDisplay;

-    }

-

-    if(randrp->rotation & (RR_Rotate_90 | RR_Rotate_270))

-    {

-	/* If the screen is rotated 90 or 270 degrees, swap the sizes. */

-	pScreen->width = scrp->virtualY;

-	pScreen->height = scrp->virtualX;

-	pScreen->mmWidth = mmHeight;

-	pScreen->mmHeight = mmWidth;

-    }

-    else

-    {

-	pScreen->width = scrp->virtualX;

-	pScreen->height = scrp->virtualY;

-	pScreen->mmWidth = mmWidth;

-	pScreen->mmHeight = mmHeight;

-    }

-    if (scrp->currentMode == mode) {

-        /* Save current mode */

-        currentMode = scrp->currentMode;

-        /* Reset, just so we ensure the drivers SwitchMode is called */

-        scrp->currentMode = NULL;

-    }

-    /*

-     * We know that if the driver failed to SwitchMode to the rotated

-     * version, then it should revert back to it's prior mode.

-     */

-    if (!xf86SwitchMode (pScreen, mode))

-    {

-        ret = FALSE;

-	scrp->virtualX = pScreen->width = oldWidth;

-	scrp->virtualY = pScreen->height = oldHeight;

-	pScreen->mmWidth = oldmmWidth;

-	pScreen->mmHeight = oldmmHeight;

-        scrp->currentMode = currentMode;

-    }

-

-    /*

-     * Make sure the layout is correct

-     */

-    xf86ReconfigureLayout();

-

-    /*

-     * Make sure the whole screen is visible

-     */

-    xf86SetViewport (pScreen, pScreen->width, pScreen->height);

-    xf86SetViewport (pScreen, 0, 0);

-    if (pRoot)

-	(*scrp->EnableDisableFBAccess) (pScreen->myNum, TRUE);

-    return ret;

-}

-

-Bool

-xf86RandR12SetConfig (ScreenPtr		pScreen,

-		    Rotation		rotation,

-		    int			rate,

-		    RRScreenSizePtr	pSize)

-{

-    ScrnInfoPtr		scrp = XF86SCRNINFO(pScreen);

-    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);

-    DisplayModePtr	mode;

-    int			px, py;

-    Bool		useVirtual = FALSE;

-    int			maxX = 0, maxY = 0;

-    Rotation		oldRotation = randrp->rotation;

-

-    randrp->rotation = rotation;

-

-    if (randrp->virtualX == -1 || randrp->virtualY == -1)

-    {

-	randrp->virtualX = scrp->virtualX;

-	randrp->virtualY = scrp->virtualY;

-    }

-

-    miPointerGetPosition (inputInfo.pointer, &px, &py);

-    for (mode = scrp->modes; ; mode = mode->next)

-    {

-	if (randrp->maxX == 0 || randrp->maxY == 0)

-	{

-		if (maxX < mode->HDisplay)

-			maxX = mode->HDisplay;

-		if (maxY < mode->VDisplay)

-			maxY = mode->VDisplay;

-	}

-	if (mode->HDisplay == pSize->width &&

-	    mode->VDisplay == pSize->height &&

-	    (rate == 0 || xf86RandR12ModeRefresh (mode) == rate))

-	    break;

-	if (mode->next == scrp->modes)

-	{

-	    if (pSize->width == randrp->virtualX &&

-		pSize->height == randrp->virtualY)

-	    {

-		mode = scrp->modes;

-		useVirtual = TRUE;

-		break;

-	    }

-    	    if (randrp->maxX == 0 || randrp->maxY == 0)

-    	    {

-		randrp->maxX = maxX;

-		randrp->maxY = maxY;

-    	    }

-	    return FALSE;

-	}

-    }

-

-    if (randrp->maxX == 0 || randrp->maxY == 0)

-    {

-	randrp->maxX = maxX;

-	randrp->maxY = maxY;

-    }

-

-    if (!xf86RandR12SetMode (pScreen, mode, useVirtual, pSize->mmWidth,

-			   pSize->mmHeight)) {

-        randrp->rotation = oldRotation;

-	return FALSE;

-    }

-

-    /*

-     * Move the cursor back where it belongs; SwitchMode repositions it

-     */

-    if (pScreen == miPointerGetScreen(inputInfo.pointer))

-    {

-        px = (px >= pScreen->width ? (pScreen->width - 1) : px);

-        py = (py >= pScreen->height ? (pScreen->height - 1) : py);

-

-	xf86SetViewport(pScreen, px, py);

-

-	(*pScreen->SetCursorPosition) (inputInfo.pointer, pScreen, px, py, FALSE);

-    }

-

-    return TRUE;

-}

-

-static Bool

-xf86RandR12ScreenSetSize (ScreenPtr	pScreen,

-			  CARD16	width,

-			  CARD16	height,

-			  CARD16	pixWidth,

-			  CARD16	pixHeight,

-			  CARD32	mmWidth,

-			  CARD32	mmHeight)

-{

-    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);

-    ScrnInfoPtr		pScrn = XF86SCRNINFO(pScreen);

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(pScrn);

-    WindowPtr		pRoot = pScreen->root;

-    PixmapPtr		pScrnPix;

-    Bool		ret = FALSE;

-    Bool		pixSizeChanged = FALSE;

-    Bool		winSizeChanged = FALSE;

-    int                 c;

-

-    if (xf86RandR12Key) {

-        if (randrp->virtualX == -1 || randrp->virtualY == -1)

-        {

-	    randrp->virtualX = pScrn->virtualX;

-	    randrp->virtualY = pScrn->virtualY;

-	    pixSizeChanged = TRUE;

-        }

-    }

-

-    pScrnPix = (*pScreen->GetScreenPixmap)(pScreen);

-    if (pixWidth != pScrnPix->drawable.width ||

-	pixHeight != pScrnPix->drawable.height)

-	pixSizeChanged = TRUE;

-

-    if (width != pScreen->width || height != pScreen->height)

-	winSizeChanged = TRUE;

-

-    if (pixSizeChanged)

-    {

-	if (pRoot && pScrn->vtSema)

-	    (*pScrn->EnableDisableFBAccess) (pScreen->myNum, FALSE);

-

-	/* Let the driver update virtualX and virtualY */

-	if (!(*config->funcs->resize)(pScrn, pixWidth, pixHeight))

-	    goto finish;

-    }

-

-    ret = TRUE;

-

-    if (winSizeChanged)

-    {

-	/* Update panning information */

-	for (c = 0; c < config->num_crtc; c++) {

-	    xf86CrtcPtr crtc = config->crtc[c];

-	    if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1 ||

-		crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {

-		if (crtc->panningTotalArea.x2 > crtc->panningTrackingArea.x1)

-		    crtc->panningTotalArea.x2 += width  - pScreen->width;

-		if (crtc->panningTotalArea.y2 > crtc->panningTrackingArea.y1)

-		    crtc->panningTotalArea.y2 += height - pScreen->height;

-		if (crtc->panningTrackingArea.x2 > crtc->panningTrackingArea.x1)

-		    crtc->panningTrackingArea.x2 += width  - pScreen->width;

-		if (crtc->panningTrackingArea.y2 > crtc->panningTrackingArea.y1)

-		    crtc->panningTrackingArea.y2 += height - pScreen->height;

-		xf86RandR13VerifyPanningArea (crtc, width, height);

-		xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);

-	    }

-	}

-    }

-

-    pScrnPix = (*pScreen->GetScreenPixmap)(pScreen);

-    pScreen->width = width;

-    pScreen->height = height;

-    if (pRoot)

-    {

-	BoxRec	box;

-

-	pRoot->drawable.width = width;

-	pRoot->drawable.height = height;

-	box.x1 = 0;

-	box.y1 = 0;

-	box.x2 = width;

-	box.y2 = height;

-	RegionInit(&pRoot->winSize, &box, 1);

-	RegionInit(&pRoot->borderSize, &box, 1);

-    }

-    pScrnPix->drawable.width = pixWidth;

-    pScrnPix->drawable.height = pixHeight;

-    randrp->mmWidth = pScreen->mmWidth = mmWidth;

-    randrp->mmHeight = pScreen->mmHeight = mmHeight;

-

-    if (winSizeChanged)

-    {

-	xf86SetViewport (pScreen, pScreen->width-1, pScreen->height-1);

-	xf86SetViewport (pScreen, 0, 0);

-    }

-

-finish:

-    if (pixSizeChanged)

-    {

-	if (pRoot && pScrn->vtSema)

-	    (*pScrn->EnableDisableFBAccess) (pScreen->myNum, TRUE);

-    }

-

-#if RANDR_12_INTERFACE

-    if (xf86RandR12Key && pScreen->root && ret)

-	RRScreenSizeNotify (pScreen);

-#endif

-    return ret;

-}

-

-Rotation

-xf86RandR12GetRotation(ScreenPtr pScreen)

-{

-    XF86RandRInfoPtr	    randrp = XF86RANDRINFO(pScreen);

-

-    return randrp->rotation;

-}

-

-Bool

-xf86RandR12CreateScreenResources (ScreenPtr pScreen)

-{

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

-    xf86CrtcConfigPtr   config;

-    XF86RandRInfoPtr	randrp;

-    int			c;

-    int			width, height;

-    int			mmWidth, mmHeight;

-#ifdef PANORAMIX

-    /* XXX disable RandR when using Xinerama */

-    if (!noPanoramiXExtension)

-	return TRUE;

-#endif

-

-    config = XF86_CRTC_CONFIG_PTR(pScrn);

-    randrp = XF86RANDRINFO(pScreen);

-    /*

-     * Compute size of screen

-     */

-    width = 0; height = 0;

-    for (c = 0; c < config->num_crtc; c++)

-    {

-	xf86CrtcPtr crtc = config->crtc[c];

-	int	    crtc_width = crtc->x + xf86ModeWidth (&crtc->mode, crtc->rotation);

-	int	    crtc_height = crtc->y + xf86ModeHeight (&crtc->mode, crtc->rotation);

-

-	if (crtc->enabled) {

-	    if (crtc_width > width)

-		width = crtc_width;

-	    if (crtc_height > height)

-		height = crtc_height;

-	    if (crtc->panningTotalArea.x2 > width)

-		width = crtc->panningTotalArea.x2;

-	    if (crtc->panningTotalArea.y2 > height)

-		height = crtc->panningTotalArea.y2;

-	}

-    }

-

-    if (width && height)

-    {

-	/*

-	 * Compute physical size of screen

-	 */

-	if (monitorResolution)

-	{

-	    mmWidth = width * 25.4 / monitorResolution;

-	    mmHeight = height * 25.4 / monitorResolution;

-	}

-	else

-	{

-	    xf86OutputPtr   output = xf86CompatOutput(pScrn);

-

-	    if (output &&

-		output->conf_monitor &&

-		(output->conf_monitor->mon_width  > 0 &&

-		 output->conf_monitor->mon_height > 0))

-	    {

-		/*

-		 * Prefer user configured DisplaySize

-		 */

-		mmWidth = output->conf_monitor->mon_width;

-		mmHeight = output->conf_monitor->mon_height;

-	    }

-	    else

-	    {

-		/*

-		 * Otherwise, just set the screen to DEFAULT_DPI

-		 */

-		mmWidth = width * 25.4 / DEFAULT_DPI;

-		mmHeight = height * 25.4 / DEFAULT_DPI;

-	    }

-	}

-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,

-		   "Setting screen physical size to %d x %d\n",

-		   mmWidth, mmHeight);

-	/*

-	 * This is the initial setting of the screen size.

-	 * We have to pre-set it here, otherwise panning would be adapted

-	 * to the new screen size.

-	 */

-	pScreen->width  = width;

-	pScreen->height = height;

-	xf86RandR12ScreenSetSize (pScreen,

-				  width,

-				  height,

-				  width,

-				  height,

-				  mmWidth,

-				  mmHeight);

-    }

-

-    if (xf86RandR12Key == NULL)

-	return TRUE;

-

-    if (randrp->virtualX == -1 || randrp->virtualY == -1)

-    {

-	randrp->virtualX = pScrn->virtualX;

-	randrp->virtualY = pScrn->virtualY;

-    }

-    xf86CrtcSetScreenSubpixelOrder (pScreen);

-#if RANDR_12_INTERFACE

-    if (xf86RandR12CreateScreenResources12 (pScreen))

-	return TRUE;

-#endif

-    return TRUE;

-}

-

-

-Bool

-xf86RandR12Init (ScreenPtr pScreen)

-{

-    rrScrPrivPtr	rp;

-    XF86RandRInfoPtr	randrp;

-

-#ifdef PANORAMIX

-    /* XXX disable RandR when using Xinerama */

-    if (!noPanoramiXExtension)

-    {

-        if (xf86NumScreens == 1)

-            noPanoramiXExtension = TRUE;

-        else

-            return TRUE;

-    }

-#endif

-

-    if (xf86RandR12Generation != serverGeneration)

-	xf86RandR12Generation = serverGeneration;

-

-    xf86RandR12Key = &xf86RandR12KeyRec;

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

-	return FALSE;

-

-    randrp = malloc(sizeof (XF86RandRInfoRec));

-    if (!randrp)

-	return FALSE;

-

-    if (!RRScreenInit(pScreen))

-    {

-	free(randrp);

-	return FALSE;

-    }

-    rp = rrGetScrPriv(pScreen);

-    rp->rrGetInfo = xf86RandR12GetInfo;

-    rp->rrSetConfig = xf86RandR12SetConfig;

-

-    randrp->virtualX = -1;

-    randrp->virtualY = -1;

-    randrp->mmWidth = pScreen->mmWidth;

-    randrp->mmHeight = pScreen->mmHeight;

-

-    randrp->rotation = RR_Rotate_0; /* initial rotated mode */

-

-    randrp->supported_rotations = RR_Rotate_0;

-

-    randrp->maxX = randrp->maxY = 0;

-

-    dixSetPrivate(&pScreen->devPrivates, xf86RandR12Key, randrp);

-

-#if RANDR_12_INTERFACE

-    if (!xf86RandR12Init12 (pScreen))

-	return FALSE;

-#endif

-    return TRUE;

-}

-

-void

-xf86RandR12CloseScreen (ScreenPtr pScreen)

-{

-    XF86RandRInfoPtr	randrp;

-

-    if (xf86RandR12Key == NULL)

-	return;

-

-    randrp = XF86RANDRINFO(pScreen);

-#if RANDR_12_INTERFACE

-    xf86Screens[pScreen->myNum]->EnterVT = randrp->orig_EnterVT;

-#endif

-

-    free(randrp);

-}

-

-void

-xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations)

-{

-    XF86RandRInfoPtr	randrp;

-#if RANDR_12_INTERFACE

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

-    int			c;

-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

-#endif

-

-    if (xf86RandR12Key == NULL)

-	return;

-

-    randrp = XF86RANDRINFO(pScreen);

-#if RANDR_12_INTERFACE

-    for (c = 0; c < config->num_crtc; c++) {

-	xf86CrtcPtr    crtc = config->crtc[c];

-

-	RRCrtcSetRotations (crtc->randr_crtc, rotations);

-    }

-#endif

-    randrp->supported_rotations = rotations;

-}

-

-void

-xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms)

-{

-    XF86RandRInfoPtr	randrp;

-#if RANDR_13_INTERFACE

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

-    int			c;

-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

-#endif

-

-    if (xf86RandR12Key == NULL)

-	return;

-

-    randrp = XF86RANDRINFO(pScreen);

-#if RANDR_13_INTERFACE

-    for (c = 0; c < config->num_crtc; c++) {

-	xf86CrtcPtr    crtc = config->crtc[c];

-

-	RRCrtcSetTransformSupport (crtc->randr_crtc, transforms);

-    }

-#endif

-}

-

-void

-xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y)

-{

-    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];

-

-    if (xf86RandR12Generation != serverGeneration ||

-	XF86RANDRINFO(pScreen)->virtualX == -1)

-    {

-	*x = pScrn->virtualX;

-	*y = pScrn->virtualY;

-    } else {

-	XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);

-

-	*x = randrp->virtualX;

-	*y = randrp->virtualY;

-    }

-}

-

-#if RANDR_12_INTERFACE

-

-#define FLAG_BITS (RR_HSyncPositive | \

-		   RR_HSyncNegative | \

-		   RR_VSyncPositive | \

-		   RR_VSyncNegative | \

-		   RR_Interlace | \

-		   RR_DoubleScan | \

-		   RR_CSync | \

-		   RR_CSyncPositive | \

-		   RR_CSyncNegative | \

-		   RR_HSkewPresent | \

-		   RR_BCast | \

-		   RR_PixelMultiplex | \

-		   RR_DoubleClock | \

-		   RR_ClockDivideBy2)

-

-static Bool

-xf86RandRModeMatches (RRModePtr		randr_mode,

-		      DisplayModePtr	mode)

-{

-#if 0

-    if (match_name)

-    {

-	/* check for same name */

-	int	len = strlen (mode->name);

-	if (randr_mode->mode.nameLength != len)			return FALSE;

-	if (memcmp (randr_mode->name, mode->name, len) != 0)	return FALSE;

-    }

-#endif

-

-    /* check for same timings */

-    if (randr_mode->mode.dotClock / 1000 != mode->Clock)    return FALSE;

-    if (randr_mode->mode.width        != mode->HDisplay)    return FALSE;

-    if (randr_mode->mode.hSyncStart   != mode->HSyncStart)  return FALSE;

-    if (randr_mode->mode.hSyncEnd     != mode->HSyncEnd)    return FALSE;

-    if (randr_mode->mode.hTotal       != mode->HTotal)	    return FALSE;

-    if (randr_mode->mode.hSkew        != mode->HSkew)	    return FALSE;

-    if (randr_mode->mode.height       != mode->VDisplay)    return FALSE;

-    if (randr_mode->mode.vSyncStart   != mode->VSyncStart)  return FALSE;

-    if (randr_mode->mode.vSyncEnd     != mode->VSyncEnd)    return FALSE;

-    if (randr_mode->mode.vTotal       != mode->VTotal)	    return FALSE;

-

-    /* check for same flags (using only the XF86 valid flag bits) */

-    if ((randr_mode->mode.modeFlags & FLAG_BITS) != (mode->Flags & FLAG_BITS))

-	return FALSE;

-

-    /* everything matches */

-    return TRUE;

-}

-

-static Bool

-xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)

-{

-    ScreenPtr		pScreen = randr_crtc->pScreen;

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

-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

-    RRModePtr		randr_mode = NULL;

-    int			x;

-    int			y;

-    Rotation		rotation;

-    int			numOutputs;

-    RROutputPtr		*randr_outputs;

-    RROutputPtr		randr_output;

-    xf86CrtcPtr		crtc = randr_crtc->devPrivate;

-    xf86OutputPtr	output;

-    int			i, j;

-    DisplayModePtr	mode = &crtc->mode;

-    Bool		ret;

-

-    randr_outputs = malloc(config->num_output * sizeof (RROutputPtr));

-    if (!randr_outputs)

-	return FALSE;

-    x = crtc->x;

-    y = crtc->y;

-    rotation = crtc->rotation;

-    numOutputs = 0;

-    randr_mode = NULL;

-    for (i = 0; i < config->num_output; i++)

-    {

-	output = config->output[i];

-	if (output->crtc == crtc)

-	{

-	    randr_output = output->randr_output;

-	    randr_outputs[numOutputs++] = randr_output;

-	    /*

-	     * We make copies of modes, so pointer equality

-	     * isn't sufficient

-	     */

-	    for (j = 0; j < randr_output->numModes + randr_output->numUserModes; j++)

-	    {

-		RRModePtr   m = (j < randr_output->numModes ?

-				 randr_output->modes[j] :

-				 randr_output->userModes[j-randr_output->numModes]);

-

-		if (xf86RandRModeMatches (m, mode))

-		{

-		    randr_mode = m;

-		    break;

-		}

-	    }

-	}

-    }

-    ret = RRCrtcNotify (randr_crtc, randr_mode, x, y,

-			rotation,

-			crtc->transformPresent ? &crtc->transform : NULL,

-			numOutputs, randr_outputs, crtc->scanoutPixmap);

-    free(randr_outputs);

-    return ret;

-}

-

-/*

- * Convert a RandR mode to a DisplayMode

- */

-static void

-xf86RandRModeConvert (ScrnInfoPtr	scrn,

-		      RRModePtr		randr_mode,

-		      DisplayModePtr	mode)

-{

-    memset(mode, 0, sizeof(DisplayModeRec));

-    mode->status = MODE_OK;

-

-    mode->Clock = randr_mode->mode.dotClock / 1000;

-

-    mode->HDisplay = randr_mode->mode.width;

-    mode->HSyncStart = randr_mode->mode.hSyncStart;

-    mode->HSyncEnd = randr_mode->mode.hSyncEnd;

-    mode->HTotal = randr_mode->mode.hTotal;

-    mode->HSkew = randr_mode->mode.hSkew;

-

-    mode->VDisplay = randr_mode->mode.height;

-    mode->VSyncStart = randr_mode->mode.vSyncStart;

-    mode->VSyncEnd = randr_mode->mode.vSyncEnd;

-    mode->VTotal = randr_mode->mode.vTotal;

-    mode->VScan = 0;

-

-    mode->Flags = randr_mode->mode.modeFlags & FLAG_BITS;

-

-    xf86SetModeCrtc (mode, scrn->adjustFlags);

-}

-

-static Bool

-xf86RandR12CrtcSet (ScreenPtr	    pScreen,

-		    RRCrtcPtr	    randr_crtc,

-		    RRModePtr	    randr_mode,

-		    int		    x,

-		    int		    y,

-		    Rotation	    rotation,

-		    int		    num_randr_outputs,

-		    RROutputPtr	    *randr_outputs,

-		    PixmapPtr	    scanout_pixmap)

-{

-    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);

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

-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

-    xf86CrtcPtr		crtc = randr_crtc->devPrivate;

-    RRTransformPtr	transform;

-    xf86CrtcSetFlags	flags = 0;

-    int			o, ro;

-    xf86CrtcPtr		*save_crtcs;

-    Bool		save_enabled = crtc->enabled;

-

-    if (!crtc->scrn->vtSema)

-	return FALSE;

-

-    save_crtcs = malloc(config->num_output * sizeof (xf86CrtcPtr));

-    if ((randr_mode != NULL) != crtc->enabled)

-	flags |= XF86CrtcSetMode;

-    else if (randr_mode && !xf86RandRModeMatches (randr_mode, &crtc->mode))

-	flags |= XF86CrtcSetMode;

-

-    if (rotation != crtc->rotation)

-	flags |= XF86CrtcSetRotation;

-

-    transform = RRCrtcGetTransform (randr_crtc);

-    if ((transform != NULL) != crtc->transformPresent)

-	flags |= XF86CrtcSetTransform;

-    else if (transform && memcmp (&transform->transform, &crtc->transform.transform,

-				  sizeof (transform->transform)) != 0)

-	flags |= XF86CrtcSetTransform;

-

-    if (scanout_pixmap != crtc->scanoutPixmap)

-	flags |= XF86CrtcSetScanoutPixmap;

-

-    if (x != crtc->x || y != crtc->y)

-	flags |= XF86CrtcSetOrigin;

-    for (o = 0; o < config->num_output; o++)

-    {

-	xf86OutputPtr  output = config->output[o];

-	xf86CrtcPtr    new_crtc;

-

-	save_crtcs[o] = output->crtc;

-

-	if (output->crtc == crtc)

-	    new_crtc = NULL;

-	else

-	    new_crtc = output->crtc;

-	for (ro = 0; ro < num_randr_outputs; ro++)

-	    if (output->randr_output == randr_outputs[ro])

-	    {

-		new_crtc = crtc;

-		break;

-	    }

-	if (new_crtc != output->crtc)

-	{

-	    flags |= XF86CrtcSetOutput;

-	    output->crtc = new_crtc;

-	}

-    }

-    for (ro = 0; ro < num_randr_outputs; ro++)

-        if (randr_outputs[ro]->pendingProperties)

-	    flags |= XF86CrtcSetProperty;

-

-    /* XXX need device-independent mode setting code through an API */

-    if (flags)

-    {

-	crtc->enabled = randr_mode != NULL;

-

-	if (randr_mode)

-	{

-	    DisplayModeRec  mode;

-	    RRTransformPtr  transform = RRCrtcGetTransform (randr_crtc);

-	    xf86CrtcSetRec  set;

-

-	    xf86RandRModeConvert (pScrn, randr_mode, &mode);

-	    set.mode = &mode;

-	    set.rotation = rotation;

-	    set.transform = transform;

-	    set.x = x;

-	    set.y = y;

-	    set.scanout_pixmap = scanout_pixmap;

-	    set.flags = flags;

-	    if (!xf86CrtcSet(crtc, &set))

-	    {

-		crtc->enabled = save_enabled;

-		for (o = 0; o < config->num_output; o++)

-		{

-		    xf86OutputPtr	output = config->output[o];

-		    output->crtc = save_crtcs[o];

-		}

-		free(save_crtcs);

-		return FALSE;

-	    }

-	    xf86RandR13VerifyPanningArea (crtc, pScreen->width, pScreen->height);

-	    xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);

-	    /*

-	     * Save the last successful setting for EnterVT

-	     */

-	    crtc->desiredMode = mode;

-	    crtc->desiredRotation = rotation;

-	    if (transform) {

-		crtc->desiredTransform = *transform;

-		crtc->desiredTransformPresent = TRUE;

-	    } else

-		crtc->desiredTransformPresent = FALSE;

-

-	    crtc->desiredX = x;

-	    crtc->desiredY = y;

-	}

-	xf86DisableUnusedFunctions (pScrn);

-    }

-    free(save_crtcs);

-    return xf86RandR12CrtcNotify (randr_crtc);

-}

-

-static Bool

-xf86RandR12CrtcSetGamma (ScreenPtr    pScreen,

-			 RRCrtcPtr    randr_crtc)

-{

-    xf86CrtcPtr		crtc = randr_crtc->devPrivate;

-

-    if (crtc->funcs->gamma_set == NULL)

-	return FALSE;

-

-    if (!crtc->scrn->vtSema)

-	return TRUE;

-

-    /* Realloc local gamma if needed. */

-    if (randr_crtc->gammaSize != crtc->gamma_size) {

-        CARD16 *tmp_ptr;

-        tmp_ptr = realloc(crtc->gamma_red, 3 * crtc->gamma_size * sizeof (CARD16));

-        if (!tmp_ptr)

-            return FALSE;

-        crtc->gamma_red = tmp_ptr;

-        crtc->gamma_green = crtc->gamma_red + crtc->gamma_size;

-        crtc->gamma_blue = crtc->gamma_green + crtc->gamma_size;

-    }

-

-    crtc->gamma_size = randr_crtc->gammaSize;

-    memcpy (crtc->gamma_red, randr_crtc->gammaRed, crtc->gamma_size * sizeof (CARD16));

-    memcpy (crtc->gamma_green, randr_crtc->gammaGreen, crtc->gamma_size * sizeof (CARD16));

-    memcpy (crtc->gamma_blue, randr_crtc->gammaBlue, crtc->gamma_size * sizeof (CARD16));

-

-    /* Only set it when the crtc is actually running.

-     * Otherwise it will be set when it's activated.

-     */

-    if (crtc->active)

-	crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,

-						crtc->gamma_blue, crtc->gamma_size);

-

-    return TRUE;

-}

-

-static Bool

-xf86RandR12CrtcGetGamma (ScreenPtr    pScreen,

-			 RRCrtcPtr    randr_crtc)

-{

-    xf86CrtcPtr crtc = randr_crtc->devPrivate;

-

-    if (!crtc->gamma_size)

-        return FALSE;

-

-    if (!crtc->gamma_red || !crtc->gamma_green || !crtc->gamma_blue)

-        return FALSE;

-

-    /* Realloc randr gamma if needed. */

-    if (randr_crtc->gammaSize != crtc->gamma_size) {

-        CARD16 *tmp_ptr;

-        tmp_ptr = realloc(randr_crtc->gammaRed, 3 * crtc->gamma_size * sizeof (CARD16));

-        if (!tmp_ptr)

-            return FALSE;

-        randr_crtc->gammaRed = tmp_ptr;

-        randr_crtc->gammaGreen = randr_crtc->gammaRed + crtc->gamma_size;

-        randr_crtc->gammaBlue = randr_crtc->gammaGreen + crtc->gamma_size;

-    }

-    randr_crtc->gammaSize = crtc->gamma_size;

-    memcpy (randr_crtc->gammaRed, crtc->gamma_red, crtc->gamma_size * sizeof (CARD16));

-    memcpy (randr_crtc->gammaGreen, crtc->gamma_green, crtc->gamma_size * sizeof (CARD16));

-    memcpy (randr_crtc->gammaBlue, crtc->gamma_blue, crtc->gamma_size * sizeof (CARD16));

-

-    return TRUE;

-}

-

-static Bool

-xf86RandR12OutputSetProperty (ScreenPtr pScreen,

-			      RROutputPtr randr_output,

-			      Atom property,

-			      RRPropertyValuePtr value)

-{

-    xf86OutputPtr output = randr_output->devPrivate;

-

-    /* If we don't have any property handler, then we don't care what the

-     * user is setting properties to.

-     */

-    if (output->funcs->set_property == NULL)

-	return TRUE;

-

-    /*

-     * This function gets called even when vtSema is FALSE, as

-     * drivers will need to remember the correct value to apply

-     * when the VT switch occurs

-     */

-    return output->funcs->set_property(output, property, value);

-}

-

-static Bool

-xf86RandR13OutputGetProperty (ScreenPtr pScreen,

-			      RROutputPtr randr_output,

-			      Atom property)

-{

-    xf86OutputPtr output = randr_output->devPrivate;

-

-    if (output->funcs->get_property == NULL)

-	return TRUE;

-

-    /* Should be safe even w/o vtSema */

-    return output->funcs->get_property(output, property);

-}

-

-static Bool

-xf86RandR12OutputValidateMode (ScreenPtr    pScreen,

-			       RROutputPtr  randr_output,

-			       RRModePtr    randr_mode)

-{

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

-    xf86OutputPtr   output = randr_output->devPrivate;

-    DisplayModeRec  mode;

-

-    xf86RandRModeConvert (pScrn, randr_mode, &mode);

-    /*

-     * This function may be called when vtSema is FALSE, so

-     * the underlying function must either avoid touching the hardware

-     * or return FALSE when vtSema is FALSE

-     */

-    if (output->funcs->mode_valid (output, &mode) != MODE_OK)

-	return FALSE;

-    return TRUE;

-}

-

-static void

-xf86RandR12ModeDestroy (ScreenPtr pScreen, RRModePtr randr_mode)

-{

-}

-

-/**

- * Given a list of xf86 modes and a RandR Output object, construct

- * RandR modes and assign them to the output

- */

-static Bool

-xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)

-{

-    DisplayModePtr  mode;

-    RRModePtr	    *rrmodes = NULL;

-    int		    nmode = 0;

-    int		    npreferred = 0;

-    Bool	    ret = TRUE;

-    int		    pref;

-

-    for (mode = modes; mode; mode = mode->next)

-	nmode++;

-

-    if (nmode) {

-	rrmodes = malloc(nmode * sizeof (RRModePtr));

-

-	if (!rrmodes)

-	    return FALSE;

-	nmode = 0;

-

-	for (pref = 1; pref >= 0; pref--) {

-	    for (mode = modes; mode; mode = mode->next) {

-		if ((pref != 0) == ((mode->type & M_T_PREFERRED) != 0)) {

-		    xRRModeInfo		modeInfo;

-		    RRModePtr		rrmode;

-

-		    modeInfo.nameLength = strlen (mode->name);

-		    modeInfo.width = mode->HDisplay;

-		    modeInfo.dotClock = mode->Clock * 1000;

-		    modeInfo.hSyncStart = mode->HSyncStart;

-		    modeInfo.hSyncEnd = mode->HSyncEnd;

-		    modeInfo.hTotal = mode->HTotal;

-		    modeInfo.hSkew = mode->HSkew;

-

-		    modeInfo.height = mode->VDisplay;

-		    modeInfo.vSyncStart = mode->VSyncStart;

-		    modeInfo.vSyncEnd = mode->VSyncEnd;

-		    modeInfo.vTotal = mode->VTotal;

-		    modeInfo.modeFlags = mode->Flags;

-

-		    rrmode = RRModeGet (&modeInfo, mode->name);

-		    if (rrmode) {

-			rrmodes[nmode++] = rrmode;

-			npreferred += pref;

-		    }

-		}

-	    }

-	}

-    }

-

-    ret = RROutputSetModes (randr_output, rrmodes, nmode, npreferred);

-    free(rrmodes);

-    return ret;

-}

-

-/*

- * Mirror the current mode configuration to RandR

- */

-static Bool

-xf86RandR12SetInfo12 (ScreenPtr pScreen)

-{

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

-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

-    RROutputPtr		*clones;

-    RRCrtcPtr		*crtcs;

-    int			ncrtc;

-    int			o, c, l;

-    RRCrtcPtr		randr_crtc;

-    int			nclone;

-

-    clones = malloc(config->num_output * sizeof (RROutputPtr));

-    crtcs = malloc(config->num_crtc * sizeof (RRCrtcPtr));

-    for (o = 0; o < config->num_output; o++)

-    {

-	xf86OutputPtr	output = config->output[o];

-

-	ncrtc = 0;

-	for (c = 0; c < config->num_crtc; c++)

-	    if (output->possible_crtcs & (1 << c))

-		crtcs[ncrtc++] = config->crtc[c]->randr_crtc;

-

-	if (output->crtc)

-	    randr_crtc = output->crtc->randr_crtc;

-	else

-	    randr_crtc = NULL;

-

-	if (!RROutputSetCrtcs (output->randr_output, crtcs, ncrtc))

-	{

-	    free(crtcs);

-	    free(clones);

-	    return FALSE;

-	}

-

-	RROutputSetPhysicalSize(output->randr_output,

-				output->mm_width,

-				output->mm_height);

-	xf86RROutputSetModes (output->randr_output, output->probed_modes);

-

-	switch (output->status) {

-	case XF86OutputStatusConnected:

-	    RROutputSetConnection (output->randr_output, RR_Connected);

-	    break;

-	case XF86OutputStatusDisconnected:

-	    RROutputSetConnection (output->randr_output, RR_Disconnected);

-	    break;

-	case XF86OutputStatusUnknown:

-	    RROutputSetConnection (output->randr_output, RR_UnknownConnection);

-	    break;

-	}

-

-	RROutputSetSubpixelOrder (output->randr_output, output->subpixel_order);

-

-	/*

-	 * Valid clones

-	 */

-	nclone = 0;

-	for (l = 0; l < config->num_output; l++)

-	{

-	    xf86OutputPtr	    clone = config->output[l];

-

-	    if (l != o && (output->possible_clones & (1 << l)))

-		clones[nclone++] = clone->randr_output;

-	}

-	if (!RROutputSetClones (output->randr_output, clones, nclone))

-	{

-	    free(crtcs);

-	    free(clones);

-	    return FALSE;

-	}

-    }

-    free(crtcs);

-    free(clones);

-    return TRUE;

-}

-

-

-

-/*

- * Query the hardware for the current state, then mirror

- * that to RandR

- */

-static Bool

-xf86RandR12GetInfo12 (ScreenPtr pScreen, Rotation *rotations)

-{

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

-

-    if (!pScrn->vtSema)

-	return TRUE;

-    xf86ProbeOutputModes (pScrn, 0, 0);

-    xf86SetScrnInfoModes (pScrn);

-    return xf86RandR12SetInfo12 (pScreen);

-}

-

-static Bool

-xf86RandR12CreateObjects12 (ScreenPtr pScreen)

-{

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

-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

-    int			c;

-    int			o;

-

-    if (!RRInit ())

-	return FALSE;

-

-    /*

-     * Configure crtcs

-     */

-    for (c = 0; c < config->num_crtc; c++)

-    {

-	xf86CrtcPtr    crtc = config->crtc[c];

-

-	crtc->randr_crtc = RRCrtcCreate (pScreen, crtc);

-	RRCrtcGammaSetSize (crtc->randr_crtc, 256);

-    }

-    /*

-     * Configure outputs

-     */

-    for (o = 0; o < config->num_output; o++)

-    {

-	xf86OutputPtr	output = config->output[o];

-

-	output->randr_output = RROutputCreate (pScreen, output->name,

-					       strlen (output->name),

-					       output);

-

-	if (output->funcs->create_resources != NULL)

-	    output->funcs->create_resources(output);

-	RRPostPendingProperties (output->randr_output);

-    }

-    return TRUE;

-}

-

-static Bool

-xf86RandR12CreateScreenResources12 (ScreenPtr pScreen)

-{

-    int			c;

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

-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

-

-    if (xf86RandR12Key == NULL)

-	return TRUE;

-

-    for (c = 0; c < config->num_crtc; c++)

-        xf86RandR12CrtcNotify (config->crtc[c]->randr_crtc);

-

-    RRScreenSetSizeRange (pScreen, config->minWidth, config->minHeight,

-			  config->maxWidth, config->maxHeight);

-    return TRUE;

-}

-

-/*

- * Something happened within the screen configuration due

- * to DGA, VidMode or hot key. Tell RandR

- */

-

-void

-xf86RandR12TellChanged (ScreenPtr pScreen)

-{

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

-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

-    int			c;

-

-    if (xf86RandR12Key == NULL)

-	return;

-

-    xf86RandR12SetInfo12 (pScreen);

-    for (c = 0; c < config->num_crtc; c++)

-	xf86RandR12CrtcNotify (config->crtc[c]->randr_crtc);

-

-    RRTellChanged (pScreen);

-}

-

-static void

-xf86RandR12PointerMoved (int scrnIndex, int x, int y)

-{

-    ScreenPtr		pScreen = screenInfo.screens[scrnIndex];

-    ScrnInfoPtr		pScrn   = XF86SCRNINFO(pScreen);

-    xf86CrtcConfigPtr	config  = XF86_CRTC_CONFIG_PTR(pScrn);

-    XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);

-    int c;

-

-    randrp->pointerX = x;

-    randrp->pointerY = y;

-    for (c = 0; c < config->num_crtc; c++)

-	xf86RandR13Pan (config->crtc[c], x, y);

-}

-

-static Bool

-xf86RandR13GetPanning (ScreenPtr           pScreen,

-		       RRCrtcPtr           randr_crtc,

-		       BoxPtr              totalArea,

-		       BoxPtr              trackingArea,

-		       INT16               *border)

-{

-    xf86CrtcPtr		crtc = randr_crtc->devPrivate;

-

-    if (crtc->version < 2)

-	return FALSE;

-    if (totalArea)

-	memcpy (totalArea,    &crtc->panningTotalArea,    sizeof(BoxRec));

-    if (trackingArea)

-	memcpy (trackingArea, &crtc->panningTrackingArea, sizeof(BoxRec));

-    if (border)

-	memcpy (border,        crtc->panningBorder,       4*sizeof(INT16));

-

-    return TRUE;

-}

-

-static Bool

-xf86RandR13SetPanning (ScreenPtr           pScreen,

-		       RRCrtcPtr           randr_crtc,

-		       BoxPtr              totalArea,

-		       BoxPtr              trackingArea,

-		       INT16               *border)

-{

-    XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);

-    xf86CrtcPtr		crtc = randr_crtc->devPrivate;

-    BoxRec		oldTotalArea;

-    BoxRec		oldTrackingArea;

-    INT16		oldBorder[4];

-

-

-    if (crtc->version < 2)

-	return FALSE;

-

-    memcpy (&oldTotalArea,    &crtc->panningTotalArea,    sizeof(BoxRec));

-    memcpy (&oldTrackingArea, &crtc->panningTrackingArea, sizeof(BoxRec));

-    memcpy (oldBorder,         crtc->panningBorder,       4*sizeof(INT16));

-

-    if (totalArea)

-	memcpy (&crtc->panningTotalArea, totalArea, sizeof(BoxRec));

-    if (trackingArea)

-	memcpy (&crtc->panningTrackingArea, trackingArea, sizeof(BoxRec));

-    if (border)

-	memcpy (crtc->panningBorder, border, 4*sizeof(INT16));

-

-    if (xf86RandR13VerifyPanningArea (crtc, pScreen->width, pScreen->height)) {

-	xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);

-	return TRUE;

-    } else {

-	/* Restore old settings */

-	memcpy (&crtc->panningTotalArea,    &oldTotalArea,    sizeof(BoxRec));

-	memcpy (&crtc->panningTrackingArea, &oldTrackingArea, sizeof(BoxRec));

-	memcpy (crtc->panningBorder,         oldBorder,       4*sizeof(INT16));

-	return FALSE;

-    }

-}

-

-/*

- * Compatibility with XF86VidMode's gamma changer.  This necessarily clobbers

- * any per-crtc setup.  You asked for it...

- */

-

-static void

-gamma_to_ramp(float gamma, CARD16 *ramp, int size)

-{

-    int i;

-

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

-	if (gamma == 1.0)

-	    ramp[i] = i << 8;

-	else

-	    ramp[i] = (CARD16)(pow((double)i / (double)(size - 1), 1. / gamma)

-			       * (double)(size - 1) * 256);

-    }

-}

-

-static int

-xf86RandR12ChangeGamma(int scrnIndex, Gamma gamma)

-{

-    CARD16 *points, *red, *green, *blue;

-    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];

-    RRCrtcPtr crtc = xf86CompatRRCrtc(pScrn);

-    int size;

-

-    if (!crtc)

-	return Success;

-

-    size = max(0, crtc->gammaSize);

-    if (!size)

-	return Success;

-

-    points = calloc(size, 3 * sizeof(CARD16));

-    if (!points)

-	return BadAlloc;

-

-    red = points;

-    green = points + size;

-    blue = points + 2 * size;

-

-    gamma_to_ramp(gamma.red, red, size);

-    gamma_to_ramp(gamma.green, green, size);

-    gamma_to_ramp(gamma.blue, blue, size);

-    RRCrtcGammaSet(crtc, red, green, blue);

-

-    free(points);

-

-    pScrn->gamma = gamma;

-

-    return Success;

-}

-

-static RRScanoutPixmapInfo *

-xf86RRQueryScanoutPixmaps(ScreenPtr screen, int *n_info)

-{

-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    RRScanoutPixmapInfo	*info;

-    int			f;

-

-    info = calloc(config->num_scanout_formats, sizeof (RRScanoutPixmapInfo));

-    if (config->num_scanout_formats && !info) {

-	*n_info = 0;

-	return NULL;

-    }

-    for (f = 0; f < config->num_scanout_formats; f++) {

-	info[f].maxWidth = config->scanout_formats[f].maxWidth;

-	info[f].maxHeight = config->scanout_formats[f].maxHeight;

-	info[f].depth = config->scanout_formats[f].depth;

-	info[f].rotations = config->scanout_formats[f].rotations;

-	info[f].format = PictureMatchFormat (screen, info[f].depth,

-					     config->scanout_formats[f].format);

-    }

-    *n_info = config->num_scanout_formats;

-    return info;

-}

-

-static PixmapPtr

-xf86RRCreateScanoutPixmap(ScreenPtr screen,

-			  int width, int height, int depth,

-			  Rotation rotations,

-			  PictFormatPtr format)

-{

-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			f;

-

-    if (!config->funcs->create_scanout_pixmap)

-	return NullPixmap;

-

-    for (f = 0; f < config->num_scanout_formats; f++)

-	if (config->scanout_formats[f].depth == depth &&

-	    (config->scanout_formats[f].format & 0xffffff) == format->format) {

-	    return (*config->funcs->create_scanout_pixmap) (scrn, width, height,

-							    rotations,

-							    &config->scanout_formats[f]);

-	}

-    return NullPixmap;

-}

-

-static void

-xf86RandR14SetCrtcSpriteTransform(ScreenPtr		pScreen,

-				  RRCrtcPtr		randr_crtc,

-				  struct pixman_f_transform *f_position_transform,

-				  struct pixman_f_transform *f_image_transform)

-{

-    xf86CrtcPtr		crtc = randr_crtc->devPrivate;

-

-    crtc->user_sprite_position_transform = *f_position_transform;

-    crtc->user_sprite_image_transform = *f_image_transform;

-    xf86CrtcRotateCursor(crtc);

-    xf86_reload_cursors(pScreen);

-}

-

-static Bool

-xf86RRConvertCrtcConfig(xf86CrtcSetConfigPtr	xf86_config,

-			RRCrtcConfigPtr		rr_config)

-{

-    RRCrtcPtr		rr_crtc = rr_config->crtc;

-    xf86CrtcPtr		crtc = rr_crtc->devPrivate;

-    ScrnInfoPtr		scrn = xf86Screens[rr_crtc->pScreen->myNum];

-    int			o;

-

-    xf86_config->crtc = crtc;

-    xf86_config->x = rr_config->x;

-    xf86_config->y = rr_config->y;

-    xf86RandRModeConvert(scrn, rr_config->mode, &xf86_config->mode);

-    xf86_config->rotation = rr_config->rotation;

-    xf86_config->numOutputs = rr_config->numOutputs;

-    xf86_config->outputs = calloc(rr_config->numOutputs, sizeof (xf86OutputPtr));

-    if (!xf86_config->outputs)

-	return FALSE;

-    for (o = 0; o < rr_config->numOutputs; o++)

-	xf86_config->outputs[o] = rr_config->outputs[o]->devPrivate;

-    xf86_config->sprite_position_transform = rr_config->sprite_position_f_transform;

-    xf86_config->sprite_image_transform = rr_config->sprite_image_f_transform;

-    xf86_config->pixmap = rr_config->pixmap;

-    xf86_config->pixmap_x = rr_config->pixmap_x;

-    xf86_config->pixmap_y = rr_config->pixmap_y;

-    return TRUE;

-}

-

-static void

-xf86FreeCrtcSetConfigs(xf86CrtcSetConfigPtr xf86_crtc_configs, int num_configs)

-{

-    int	i;

-

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

-	free(xf86_crtc_configs[i].outputs);

-    free(xf86_crtc_configs);

-}

-

-static Bool

-xf86RRSetCrtcConfigs(ScreenPtr screen,

-		     RRScreenConfigPtr screen_config,

-		     RRCrtcConfigPtr crtc_configs,

-		     int num_configs)

-{

-    ScrnInfoPtr	     		scrn = xf86Screens[screen->myNum];

-    xf86CrtcConfigPtr		config = XF86_CRTC_CONFIG_PTR(scrn);

-

-    if (config->funcs->set_config) {

-	xf86CrtcSetConfigPtr	xf86_crtc_configs;

-	int			i;

-	xf86SetConfigResponse	response;

-

-	/*

-	 * Convert RRCrtcConfigRecs to xf86CrtcSetConfigs

-	 */

-	xf86_crtc_configs = calloc(num_configs, sizeof (xf86CrtcSetConfigRec));

-	if (!xf86_crtc_configs)

-	    return FALSE;

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

-	    if (!xf86RRConvertCrtcConfig(&xf86_crtc_configs[i], &crtc_configs[i])) {

-		xf86FreeCrtcSetConfigs(xf86_crtc_configs, num_configs);

-		return FALSE;

-	    }

-

-	/*

-	 * Ask the driver to set the configuration

-	 */

-	response = (*config->funcs->set_config)(scrn,

-						screen_config,

-						xf86_crtc_configs,

-						num_configs);

-	xf86FreeCrtcSetConfigs(xf86_crtc_configs, num_configs);

-

-	/*

-	 * The driver is allowed to answer with one of three

-	 * responses:

-	 */

-	switch (response) {

-	case xf86SetConfigFailed:

-

-	    /* The configuration isn't usable, or some error

-	     * occurred while setting it. Everything has been

-	     * cleaned up and we're ready to return an error

-	     * back to the client

-	     */

-	    return FALSE;

-	case xf86SetConfigDone:

-

-	    /* The configuration was acceptable, and the whole

-	     * mode setting experience is over. Nothing more to do

-	     * here.

-	     */

-	    return TRUE;

-	case xf86SetConfigChecked:

-

-	    /* The configuration was acceptable, but the driver

-	     * didn't actually do anything. Go ask the DIX code

-	     * to do the mode setting operation using the simpler

-	     * interfaces

-	     */

-	    break;

-	}

-    }

-    return miRRSetCrtcConfigs(screen, screen_config, crtc_configs, num_configs);

-}

-

-static Bool

-xf86RandR12EnterVT (int screen_index, int flags)

-{

-    ScreenPtr        pScreen = screenInfo.screens[screen_index];

-    ScrnInfoPtr	     pScrn = xf86Screens[screen_index];

-    XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);

-    rrScrPrivPtr     rp = rrGetScrPriv(pScreen);

-    Bool	     ret;

-    int i;

-

-    if (randrp->orig_EnterVT) {

-	pScrn->EnterVT = randrp->orig_EnterVT;

-	ret = pScrn->EnterVT (screen_index, flags);

-	randrp->orig_EnterVT = pScrn->EnterVT;

-	pScrn->EnterVT = xf86RandR12EnterVT;

-	if (!ret)

-	    return FALSE;

-    }

-

-    /* reload gamma */

-    for (i = 0; i < rp->numCrtcs; i++)

-	xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]);

-

-    return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */

-}

-

-static Bool

-xf86RandR12Init12 (ScreenPtr pScreen)

-{

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

-    rrScrPrivPtr	rp = rrGetScrPriv(pScreen);

-    XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);

-    int i;

-

-    rp->rrGetInfo = xf86RandR12GetInfo12;

-    rp->rrScreenSetSize = xf86RandR12ScreenSetSize;

-    rp->rrCrtcSet = xf86RandR12CrtcSet;

-    rp->rrCrtcSetGamma = xf86RandR12CrtcSetGamma;

-    rp->rrCrtcGetGamma = xf86RandR12CrtcGetGamma;

-    rp->rrOutputSetProperty = xf86RandR12OutputSetProperty;

-    rp->rrOutputValidateMode = xf86RandR12OutputValidateMode;

-    rp->rrOutputGetProperty = xf86RandR13OutputGetProperty;

-    rp->rrGetPanning = xf86RandR13GetPanning;

-    rp->rrSetPanning = xf86RandR13SetPanning;

-    rp->rrModeDestroy = xf86RandR12ModeDestroy;

-    rp->rrSetConfig = NULL;

-    pScrn->PointerMoved = xf86RandR12PointerMoved;

-    pScrn->ChangeGamma = xf86RandR12ChangeGamma;

-    rp->rrSetCrtcSpriteTransform = xf86RandR14SetCrtcSpriteTransform;

-    rp->rrSetCrtcConfigs = xf86RRSetCrtcConfigs;

-    rp->rrQueryScanoutPixmaps = xf86RRQueryScanoutPixmaps;

-    rp->rrCreateScanoutPixmap = xf86RRCreateScanoutPixmap;

-

-    randrp->orig_EnterVT = pScrn->EnterVT;

-    pScrn->EnterVT = xf86RandR12EnterVT;

-

-    if (!xf86RandR12CreateObjects12 (pScreen))

-	return FALSE;

-

-    /*

-     * Configure output modes

-     */

-    if (!xf86RandR12SetInfo12 (pScreen))

-	return FALSE;

-    for (i = 0; i < rp->numCrtcs; i++) {

-	xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]);

-    }

-    return TRUE;

-}

-

-#endif

-

-Bool

-xf86RandR12PreInit (ScrnInfoPtr pScrn)

-{

-    return TRUE;

-}

+/*
+ * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#else
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#endif
+
+#include "xf86.h"
+#include "os.h"
+#include "globals.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86DDC.h"
+#include "mipointer.h"
+#include "windowstr.h"
+#include "inputstr.h"
+#include <randrstr.h>
+#include <X11/extensions/render.h>
+
+#include "xf86Crtc.h"
+#include "xf86RandR12.h"
+
+typedef struct _xf86RandR12Info {
+    int				    virtualX;
+    int				    virtualY;
+    int				    mmWidth;
+    int				    mmHeight;
+    int				    maxX;
+    int				    maxY;
+    int				    pointerX;
+    int				    pointerY;
+    Rotation			    rotation; /* current mode */
+    Rotation                        supported_rotations; /* driver supported */
+
+    /* Used to wrap EnterVT so we can re-probe the outputs when a laptop unsuspends
+     * (actually, any time that we switch back into our VT).
+     *
+     * See https://bugs.freedesktop.org/show_bug.cgi?id=21554
+     */
+    xf86EnterVTProc *orig_EnterVT;
+} XF86RandRInfoRec, *XF86RandRInfoPtr;
+
+#ifdef RANDR_12_INTERFACE
+static Bool xf86RandR12Init12 (ScreenPtr pScreen);
+static Bool xf86RandR12CreateScreenResources12 (ScreenPtr pScreen);
+#endif
+
+static int xf86RandR12Generation;
+
+static DevPrivateKeyRec xf86RandR12KeyRec;
+static DevPrivateKey xf86RandR12Key;
+#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \
+    dixLookupPrivate(&(p)->devPrivates, xf86RandR12Key))
+
+
+static int
+xf86RandR12ModeRefresh (DisplayModePtr mode)
+{
+    if (mode->VRefresh)
+	return (int) (mode->VRefresh + 0.5);
+    else
+	return (int) (mode->Clock * 1000.0 / mode->HTotal / mode->VTotal + 0.5);
+}
+
+/* Adapt panning area; return TRUE if panning area was valid without adaption */
+static int
+xf86RandR13VerifyPanningArea (xf86CrtcPtr crtc, int screenWidth, int screenHeight)
+{
+    int ret = TRUE;
+
+    if (crtc->version < 2)
+	return FALSE;
+
+    if (crtc->panningTotalArea.x2 <= crtc->panningTotalArea.x1) {
+	/* Panning in X is disabled */
+	if (crtc->panningTotalArea.x1 || crtc->panningTotalArea.x2)
+	    /* Illegal configuration -> fail/disable */
+	    ret = FALSE;
+	crtc->panningTotalArea.x1    = crtc->panningTotalArea.x2    = 0;
+	crtc->panningTrackingArea.x1 = crtc->panningTrackingArea.x2 = 0;
+	crtc->panningBorder[0]       = crtc->panningBorder[2]       = 0;
+    } else {
+	/* Panning in X is enabled */
+	if (crtc->panningTotalArea.x1 < 0) {
+	    /* Panning region outside screen -> move inside */
+	    crtc->panningTotalArea.x2 -= crtc->panningTotalArea.x1;
+	    crtc->panningTotalArea.x1 = 0;
+	    ret = FALSE;
+	}
+	if (crtc->panningTotalArea.x2 < crtc->panningTotalArea.x1 + crtc->mode.HDisplay) {
+	    /* Panning region smaller than displayed area -> crop to displayed area */
+	    crtc->panningTotalArea.x2 = crtc->panningTotalArea.x1 + crtc->mode.HDisplay;
+	    ret = FALSE;
+	}
+	if (crtc->panningTotalArea.x2 > screenWidth) {
+	    /* Panning region larger than screen -> move inside, then crop to screen */
+	    crtc->panningTotalArea.x1 -= crtc->panningTotalArea.x2 - screenWidth;
+	    crtc->panningTotalArea.x2 = screenWidth;
+	    ret = FALSE;
+	    if (crtc->panningTotalArea.x1 < 0)
+		crtc->panningTotalArea.x1 = 0;
+	}
+	if (crtc->panningBorder[0] + crtc->panningBorder[2] > crtc->mode.HDisplay) {
+	    /* Borders too large -> set to 0 */
+	    crtc->panningBorder[0] = crtc->panningBorder[2] = 0;
+	    ret = FALSE;
+	}
+    }
+
+    if (crtc->panningTotalArea.y2 <= crtc->panningTotalArea.y1) {
+	/* Panning in Y is disabled */
+	if (crtc->panningTotalArea.y1 || crtc->panningTotalArea.y2)
+	    /* Illegal configuration -> fail/disable */
+	    ret = FALSE;
+	crtc->panningTotalArea.y1    = crtc->panningTotalArea.y2    = 0;
+	crtc->panningTrackingArea.y1 = crtc->panningTrackingArea.y2 = 0;
+	crtc->panningBorder[1]       = crtc->panningBorder[3]       = 0;
+    } else {
+	/* Panning in Y is enabled */
+	if (crtc->panningTotalArea.y1 < 0) {
+	    /* Panning region outside screen -> move inside */
+	    crtc->panningTotalArea.y2 -= crtc->panningTotalArea.y1;
+	    crtc->panningTotalArea.y1 = 0;
+	    ret = FALSE;
+	}
+	if (crtc->panningTotalArea.y2 < crtc->panningTotalArea.y1 + crtc->mode.VDisplay) {
+	    /* Panning region smaller than displayed area -> crop to displayed area */
+	    crtc->panningTotalArea.y2 = crtc->panningTotalArea.y1 + crtc->mode.VDisplay;
+	    ret = FALSE;
+	}
+	if (crtc->panningTotalArea.y2 > screenHeight) {
+	    /* Panning region larger than screen -> move inside, then crop to screen */
+	    crtc->panningTotalArea.y1 -= crtc->panningTotalArea.y2 - screenHeight;
+	    crtc->panningTotalArea.y2 = screenHeight;
+	    ret = FALSE;
+	    if (crtc->panningTotalArea.y1 < 0)
+		crtc->panningTotalArea.y1 = 0;
+	}
+	if (crtc->panningBorder[1] + crtc->panningBorder[3] > crtc->mode.VDisplay) {
+	    /* Borders too large -> set to 0 */
+	    crtc->panningBorder[1] = crtc->panningBorder[3] = 0;
+	    ret = FALSE;
+	}
+    }
+
+    return ret;
+}
+
+/*
+ * The heart of the panning operation:
+ *
+ * Given a frame buffer position (fb_x, fb_y),
+ * and a crtc position (crtc_x, crtc_y),
+ * and a transform matrix which maps frame buffer to crtc,
+ * compute a panning position (pan_x, pan_y) that
+ * makes the resulting transform line those two up
+ */
+
+static void
+xf86ComputeCrtcPan (Bool transform_in_use,
+		    struct pixman_f_transform *m,
+		    double screen_x, double screen_y,
+		    double crtc_x, double crtc_y,
+		    int old_pan_x, int old_pan_y,
+		    int *new_pan_x, int *new_pan_y)
+{
+    if (transform_in_use) {
+	/*
+	 * Given the current transform, M, the current position
+	 * on the Screen, S, and the desired position on the CRTC,
+	 * C, compute a translation, T, such that:
+	 *
+	 * M T S = C
+	 *
+	 * where T is of the form
+	 *
+	 * | 1 0 dx |
+	 * | 0 1 dy |
+	 * | 0 0 1  |
+	 *
+	 * M T S =
+	 *   | M00 Sx + M01 Sy + M00 dx + M01 dy + M02 |   | Cx F |
+	 *   | M10 Sx + M11 Sy + M10 dx + M11 dy + M12 | = | Cy F |
+	 *   | M20 Sx + M21 Sy + M20 dx + M21 dy + M22 |   |  F   |
+	 *
+	 * R = M S
+	 *
+	 *   Cx F = M00 dx + M01 dy + R0
+	 *   Cy F = M10 dx + M11 dy + R1
+	 *      F = M20 dx + M21 dy + R2
+	 *
+	 * Zero out dx, then dy
+	 *
+	 * F (Cx M10 - Cy M00) =
+	 *	    (M10 M01 - M00 M11) dy + M10 R0 - M00 R1
+	 * F (M10 - Cy M20) =
+	 *	    (M10 M21 - M20 M11) dy + M10 R2 - M20 R1
+	 *
+	 * F (Cx M11 - Cy M01) =
+	 *	    (M11 M00 - M01 M10) dx + M11 R0 - M01 R1
+	 * F (M11 - Cy M21) =
+	 *	    (M11 M20 - M21 M10) dx + M11 R2 - M21 R1
+	 *
+	 * Make some temporaries
+	 *
+	 * T = | Cx M10 - Cy M00 |
+	 *     | Cx M11 - Cy M01 |
+	 *
+	 * U = | M10 M01 - M00 M11 |
+	 *     | M11 M00 - M01 M10 |
+	 *
+	 * Q = | M10 R0 - M00 R1 |
+	 *     | M11 R0 - M01 R1 |
+	 *
+	 * P = | M10 - Cy M20 |
+	 *     | M11 - Cy M21 |
+	 *
+	 * W = | M10 M21 - M20 M11 |
+	 *     | M11 M20 - M21 M10 |
+	 *
+	 * V = | M10 R2 - M20 R1 |
+	 *	   | M11 R2 - M21 R1 |
+	 *
+	 * Rewrite:
+	 *
+	 * F T0 = U0 dy + Q0
+	 * F P0 = W0 dy + V0
+	 * F T1 = U1 dx + Q1
+	 * F P1 = W1 dx + V1
+	 *
+	 * Solve for F (two ways)
+	 *
+	 * F (W0 T0 - U0 P0)  = W0 Q0 - U0 V0
+	 *
+	 *     W0 Q0 - U0 V0
+	 * F = -------------
+	 *     W0 T0 - U0 P0
+	 *
+	 * F (W1 T1 - U1 P1) = W1 Q1 - U1 V1
+	 *
+	 *     W1 Q1 - U1 V1
+	 * F = -------------
+	 *     W1 T1 - U1 P1
+	 *
+	 * We'll use which ever solution works (denominator != 0)
+	 *
+	 * Finally, solve for dx and dy:
+	 *
+	 * dx = (F T1 - Q1) / U1
+	 * dx = (F P1 - V1) / W1
+	 *
+	 * dy = (F T0 - Q0) / U0
+	 * dy = (F P0 - V0) / W0
+	 */
+	double			    r[3];
+	double			    q[2], u[2], t[2], v[2], w[2], p[2];
+	double			    f;
+	struct pict_f_vector	    d;
+	int			    i;
+
+	/* Get the un-normalized crtc coordinates again */
+	for (i = 0; i < 3; i++)
+	    r[i] = m->m[i][0] * screen_x + m->m[i][1] * screen_y + m->m[i][2];
+
+	/* Combine values into temporaries */
+	for (i = 0; i < 2; i++) {
+	    q[i] = m->m[1][i] * r[0] - m->m[0][i] * r[1];
+	    u[i] = m->m[1][i] * m->m[0][1-i] - m->m[0][i] * m->m[1][1-i];
+	    t[i] = m->m[1][i] * crtc_x - m->m[0][i] * crtc_y;
+
+	    v[i] = m->m[1][i] * r[2] - m->m[2][i] * r[1];
+	    w[i] = m->m[1][i] * m->m[2][1-i] - m->m[2][i] * m->m[1][1-i];
+	    p[i] = m->m[1][i] - m->m[2][i] * crtc_y;
+	}
+
+	/* Find a way to compute f */
+	f = 0;
+	for (i = 0; i < 2; i++) {
+	    double a = w[i] * q[i] - u[i] * v[i];
+	    double b = w[i] * t[i] - u[i] * p[i];
+	    if (b != 0) {
+		f = a/b;
+		break;
+	    }
+	}
+
+	/* Solve for the resulting transform vector */
+	for (i = 0; i < 2; i++) {
+	    if (u[i])
+		d.v[1-i] = (t[i] * f - q[i]) / u[i];
+	    else if (w[1])
+		d.v[1-i] = (p[i] * f - v[i]) / w[i];
+	    else
+		d.v[1-i] = 0;
+	}
+	*new_pan_x = old_pan_x - floor (d.v[0] + 0.5);
+	*new_pan_y = old_pan_y - floor (d.v[1] + 0.5);
+    } else {
+	*new_pan_x = screen_x - crtc_x;
+	*new_pan_y = screen_y - crtc_y;
+    }
+}
+
+static void
+xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
+{
+    int newX, newY;
+    int width, height;
+    Bool panned = FALSE;
+
+    if (crtc->version < 2)
+	return;
+
+    if (! crtc->enabled						||
+	(crtc->panningTotalArea.x2 <= crtc->panningTotalArea.x1	&&
+	 crtc->panningTotalArea.y2 <= crtc->panningTotalArea.y1))
+	return;
+
+    newX   = crtc->x;
+    newY   = crtc->y;
+    width  = crtc->mode.HDisplay;
+    height = crtc->mode.VDisplay;
+
+    if ((crtc->panningTrackingArea.x2 <= crtc->panningTrackingArea.x1 ||
+	 (x >= crtc->panningTrackingArea.x1 && x < crtc->panningTrackingArea.x2)) &&
+	(crtc->panningTrackingArea.y2 <= crtc->panningTrackingArea.y1 ||
+	 (y >= crtc->panningTrackingArea.y1 && y < crtc->panningTrackingArea.y2)))
+    {
+	struct pict_f_vector    c;
+
+	/*
+	 * Pre-clip the mouse position to the panning area so that we don't
+	 * push the crtc outside. This doesn't deal with changes to the
+	 * panning values, only mouse position changes.
+	 */
+	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1)
+	{
+	    if (x < crtc->panningTotalArea.x1)
+		x = crtc->panningTotalArea.x1;
+	    if (x >= crtc->panningTotalArea.x2)
+		x = crtc->panningTotalArea.x2 - 1;
+	}
+	if (crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1)
+	{
+	    if (y < crtc->panningTotalArea.y1)
+		y = crtc->panningTotalArea.y1;
+	    if (y >= crtc->panningTotalArea.y2)
+		y = crtc->panningTotalArea.y2 - 1;
+	}
+
+	c.v[0] = x;
+	c.v[1] = y;
+	c.v[2] = 1.0;
+	if (crtc->transform_in_use) {
+	    pixman_f_transform_point(&crtc->f_framebuffer_to_crtc, &c);
+	} else {
+	    c.v[0] -= crtc->x;
+	    c.v[1] -= crtc->y;
+	}
+
+	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1) {
+	    if (c.v[0] < crtc->panningBorder[0]) {
+		c.v[0] = crtc->panningBorder[0];
+		panned = TRUE;
+	    }
+	    if (c.v[0] >= width - crtc->panningBorder[2]) {
+		c.v[0] = width - crtc->panningBorder[2] - 1;
+		panned = TRUE;
+	    }
+	}
+	if (crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {
+	    if (c.v[1] < crtc->panningBorder[1]) {
+		c.v[1] = crtc->panningBorder[1];
+		panned = TRUE;
+	    }
+	    if (c.v[1] >= height - crtc->panningBorder[3]) {
+		c.v[1] = height - crtc->panningBorder[3] - 1;
+		panned = TRUE;
+	    }
+	}
+	if (panned)
+	    xf86ComputeCrtcPan (crtc->transform_in_use,
+				&crtc->f_framebuffer_to_crtc,
+				x, y, c.v[0], c.v[1],
+				newX, newY, &newX, &newY);
+    }
+
+    /*
+     * Ensure that the crtc is within the panning region.
+     *
+     * XXX This computation only works when we do not have a transform
+     * in use.
+     */
+    if (!crtc->transform_in_use)
+    {
+	/* Validate against [xy]1 after [xy]2, to be sure that results are > 0 for [xy]1 > 0 */
+	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1) {
+	    if (newX > crtc->panningTotalArea.x2 - width)
+		newX =  crtc->panningTotalArea.x2 - width;
+	    if (newX <  crtc->panningTotalArea.x1)
+		newX =  crtc->panningTotalArea.x1;
+	}
+	if (crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {
+	    if (newY > crtc->panningTotalArea.y2 - height)
+		newY =  crtc->panningTotalArea.y2 - height;
+	    if (newY <  crtc->panningTotalArea.y1)
+		newY =  crtc->panningTotalArea.y1;
+	}
+    }
+    if (newX != crtc->x || newY != crtc->y)
+	xf86CrtcSetOrigin (crtc, newX, newY);
+}
+
+static Bool
+xf86RandR12GetInfo (ScreenPtr pScreen, Rotation *rotations)
+{
+    RRScreenSizePtr	    pSize;
+    ScrnInfoPtr		    scrp = XF86SCRNINFO(pScreen);
+    XF86RandRInfoPtr	    randrp = XF86RANDRINFO(pScreen);
+    DisplayModePtr	    mode;
+    int			    refresh0 = 60;
+    int			    maxX = 0, maxY = 0;
+
+    *rotations = randrp->supported_rotations;
+
+    if (randrp->virtualX == -1 || randrp->virtualY == -1)
+    {
+	randrp->virtualX = scrp->virtualX;
+	randrp->virtualY = scrp->virtualY;
+    }
+
+    /* Re-probe the outputs for new monitors or modes */
+    if (scrp->vtSema)
+    {
+	xf86ProbeOutputModes (scrp, 0, 0);
+	xf86SetScrnInfoModes (scrp);
+    }
+
+    for (mode = scrp->modes; ; mode = mode->next)
+    {
+	int refresh = xf86RandR12ModeRefresh (mode);
+	if (randrp->maxX == 0 || randrp->maxY == 0)
+	{
+		if (maxX < mode->HDisplay)
+			maxX = mode->HDisplay;
+		if (maxY < mode->VDisplay)
+			maxY = mode->VDisplay;
+	}
+	if (mode == scrp->modes)
+	    refresh0 = refresh;
+	pSize = RRRegisterSize (pScreen,
+				mode->HDisplay, mode->VDisplay,
+				randrp->mmWidth, randrp->mmHeight);
+	if (!pSize)
+	    return FALSE;
+	RRRegisterRate (pScreen, pSize, refresh);
+
+	if (xf86ModesEqual(mode, scrp->currentMode))
+	{
+	    RRSetCurrentConfig (pScreen, randrp->rotation, refresh, pSize);
+	}
+	if (mode->next == scrp->modes)
+	    break;
+    }
+
+    if (randrp->maxX == 0 || randrp->maxY == 0)
+    {
+	randrp->maxX = maxX;
+	randrp->maxY = maxY;
+    }
+
+    return TRUE;
+}
+
+static Bool
+xf86RandR12SetMode (ScreenPtr	    pScreen,
+		  DisplayModePtr    mode,
+		  Bool		    useVirtual,
+		  int		    mmWidth,
+		  int		    mmHeight)
+{
+    ScrnInfoPtr		scrp = XF86SCRNINFO(pScreen);
+    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
+    int			oldWidth = pScreen->width;
+    int			oldHeight = pScreen->height;
+    int			oldmmWidth = pScreen->mmWidth;
+    int			oldmmHeight = pScreen->mmHeight;
+    WindowPtr		pRoot = pScreen->root;
+    DisplayModePtr      currentMode = NULL;
+    Bool 		ret = TRUE;
+
+    if (pRoot)
+	(*scrp->EnableDisableFBAccess) (pScreen->myNum, FALSE);
+    if (useVirtual)
+    {
+	scrp->virtualX = randrp->virtualX;
+	scrp->virtualY = randrp->virtualY;
+    }
+    else
+    {
+	scrp->virtualX = mode->HDisplay;
+	scrp->virtualY = mode->VDisplay;
+    }
+
+    if(randrp->rotation & (RR_Rotate_90 | RR_Rotate_270))
+    {
+	/* If the screen is rotated 90 or 270 degrees, swap the sizes. */
+	pScreen->width = scrp->virtualY;
+	pScreen->height = scrp->virtualX;
+	pScreen->mmWidth = mmHeight;
+	pScreen->mmHeight = mmWidth;
+    }
+    else
+    {
+	pScreen->width = scrp->virtualX;
+	pScreen->height = scrp->virtualY;
+	pScreen->mmWidth = mmWidth;
+	pScreen->mmHeight = mmHeight;
+    }
+    if (scrp->currentMode == mode) {
+        /* Save current mode */
+        currentMode = scrp->currentMode;
+        /* Reset, just so we ensure the drivers SwitchMode is called */
+        scrp->currentMode = NULL;
+    }
+    /*
+     * We know that if the driver failed to SwitchMode to the rotated
+     * version, then it should revert back to it's prior mode.
+     */
+    if (!xf86SwitchMode (pScreen, mode))
+    {
+        ret = FALSE;
+	scrp->virtualX = pScreen->width = oldWidth;
+	scrp->virtualY = pScreen->height = oldHeight;
+	pScreen->mmWidth = oldmmWidth;
+	pScreen->mmHeight = oldmmHeight;
+        scrp->currentMode = currentMode;
+    }
+
+    /*
+     * Make sure the layout is correct
+     */
+    xf86ReconfigureLayout();
+
+    /*
+     * Make sure the whole screen is visible
+     */
+    xf86SetViewport (pScreen, pScreen->width, pScreen->height);
+    xf86SetViewport (pScreen, 0, 0);
+    if (pRoot)
+	(*scrp->EnableDisableFBAccess) (pScreen->myNum, TRUE);
+    return ret;
+}
+
+Bool
+xf86RandR12SetConfig (ScreenPtr		pScreen,
+		    Rotation		rotation,
+		    int			rate,
+		    RRScreenSizePtr	pSize)
+{
+    ScrnInfoPtr		scrp = XF86SCRNINFO(pScreen);
+    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
+    DisplayModePtr	mode;
+    int			px, py;
+    Bool		useVirtual = FALSE;
+    int			maxX = 0, maxY = 0;
+    Rotation		oldRotation = randrp->rotation;
+
+    randrp->rotation = rotation;
+
+    if (randrp->virtualX == -1 || randrp->virtualY == -1)
+    {
+	randrp->virtualX = scrp->virtualX;
+	randrp->virtualY = scrp->virtualY;
+    }
+
+    miPointerGetPosition (inputInfo.pointer, &px, &py);
+    for (mode = scrp->modes; ; mode = mode->next)
+    {
+	if (randrp->maxX == 0 || randrp->maxY == 0)
+	{
+		if (maxX < mode->HDisplay)
+			maxX = mode->HDisplay;
+		if (maxY < mode->VDisplay)
+			maxY = mode->VDisplay;
+	}
+	if (mode->HDisplay == pSize->width &&
+	    mode->VDisplay == pSize->height &&
+	    (rate == 0 || xf86RandR12ModeRefresh (mode) == rate))
+	    break;
+	if (mode->next == scrp->modes)
+	{
+	    if (pSize->width == randrp->virtualX &&
+		pSize->height == randrp->virtualY)
+	    {
+		mode = scrp->modes;
+		useVirtual = TRUE;
+		break;
+	    }
+    	    if (randrp->maxX == 0 || randrp->maxY == 0)
+    	    {
+		randrp->maxX = maxX;
+		randrp->maxY = maxY;
+    	    }
+	    return FALSE;
+	}
+    }
+
+    if (randrp->maxX == 0 || randrp->maxY == 0)
+    {
+	randrp->maxX = maxX;
+	randrp->maxY = maxY;
+    }
+
+    if (!xf86RandR12SetMode (pScreen, mode, useVirtual, pSize->mmWidth,
+			   pSize->mmHeight)) {
+        randrp->rotation = oldRotation;
+	return FALSE;
+    }
+
+    /*
+     * Move the cursor back where it belongs; SwitchMode repositions it
+     */
+    if (pScreen == miPointerGetScreen(inputInfo.pointer))
+    {
+        px = (px >= pScreen->width ? (pScreen->width - 1) : px);
+        py = (py >= pScreen->height ? (pScreen->height - 1) : py);
+
+	xf86SetViewport(pScreen, px, py);
+
+	(*pScreen->SetCursorPosition) (inputInfo.pointer, pScreen, px, py, FALSE);
+    }
+
+    return TRUE;
+}
+
+static Bool
+xf86RandR12ScreenSetSize (ScreenPtr	pScreen,
+			CARD16		width,
+			CARD16		height,
+			CARD32		mmWidth,
+			CARD32		mmHeight)
+{
+    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
+    ScrnInfoPtr		pScrn = XF86SCRNINFO(pScreen);
+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(pScrn);
+    WindowPtr		pRoot = pScreen->root;
+    PixmapPtr		pScrnPix;
+    Bool		ret = FALSE;
+    int                 c;
+
+    if (xf86RandR12Key) {
+        if (randrp->virtualX == -1 || randrp->virtualY == -1)
+        {
+	    randrp->virtualX = pScrn->virtualX;
+	    randrp->virtualY = pScrn->virtualY;
+        }
+    }
+    if (pRoot && pScrn->vtSema)
+	(*pScrn->EnableDisableFBAccess) (pScreen->myNum, FALSE);
+
+    /* Let the driver update virtualX and virtualY */
+    if (!(*config->funcs->resize)(pScrn, width, height))
+	goto finish;
+
+    ret = TRUE;
+    /* Update panning information */
+    for (c = 0; c < config->num_crtc; c++) {
+	xf86CrtcPtr crtc = config->crtc[c];
+	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1 ||
+	    crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {
+	    if (crtc->panningTotalArea.x2 > crtc->panningTrackingArea.x1)
+		crtc->panningTotalArea.x2 += width  - pScreen->width;
+	    if (crtc->panningTotalArea.y2 > crtc->panningTrackingArea.y1)
+		crtc->panningTotalArea.y2 += height - pScreen->height;
+	    if (crtc->panningTrackingArea.x2 > crtc->panningTrackingArea.x1)
+		crtc->panningTrackingArea.x2 += width  - pScreen->width;
+	    if (crtc->panningTrackingArea.y2 > crtc->panningTrackingArea.y1)
+		crtc->panningTrackingArea.y2 += height - pScreen->height;
+	    xf86RandR13VerifyPanningArea (crtc, width, height);
+	    xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);
+	}
+    }
+
+    pScrnPix = (*pScreen->GetScreenPixmap)(pScreen);
+    pScreen->width = pScrnPix->drawable.width = width;
+    pScreen->height = pScrnPix->drawable.height = height;
+    randrp->mmWidth = pScreen->mmWidth = mmWidth;
+    randrp->mmHeight = pScreen->mmHeight = mmHeight;
+
+    xf86SetViewport (pScreen, pScreen->width-1, pScreen->height-1);
+    xf86SetViewport (pScreen, 0, 0);
+
+finish:
+    if (pRoot && pScrn->vtSema)
+	(*pScrn->EnableDisableFBAccess) (pScreen->myNum, TRUE);
+#if RANDR_12_INTERFACE
+    if (xf86RandR12Key && pScreen->root && ret)
+	RRScreenSizeNotify (pScreen);
+#endif
+    return ret;
+}
+
+Rotation
+xf86RandR12GetRotation(ScreenPtr pScreen)
+{
+    XF86RandRInfoPtr	    randrp = XF86RANDRINFO(pScreen);
+
+    return randrp->rotation;
+}
+
+Bool
+xf86RandR12CreateScreenResources (ScreenPtr pScreen)
+{
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr   config;
+    XF86RandRInfoPtr	randrp;
+    int			c;
+    int			width, height;
+    int			mmWidth, mmHeight;
+#ifdef PANORAMIX
+    /* XXX disable RandR when using Xinerama */
+    if (!noPanoramiXExtension)
+	return TRUE;
+#endif
+
+    config = XF86_CRTC_CONFIG_PTR(pScrn);
+    randrp = XF86RANDRINFO(pScreen);
+    /*
+     * Compute size of screen
+     */
+    width = 0; height = 0;
+    for (c = 0; c < config->num_crtc; c++)
+    {
+	xf86CrtcPtr crtc = config->crtc[c];
+	int	    crtc_width = crtc->x + xf86ModeWidth (&crtc->mode, crtc->rotation);
+	int	    crtc_height = crtc->y + xf86ModeHeight (&crtc->mode, crtc->rotation);
+	
+	if (crtc->enabled) {
+	    if (crtc_width > width)
+		width = crtc_width;
+	    if (crtc_height > height)
+		height = crtc_height;
+	    if (crtc->panningTotalArea.x2 > width)
+		width = crtc->panningTotalArea.x2;
+	    if (crtc->panningTotalArea.y2 > height)
+		height = crtc->panningTotalArea.y2;
+	}
+    }
+    
+    if (width && height)
+    {
+	/*
+	 * Compute physical size of screen
+	 */
+	if (monitorResolution) 
+	{
+	    mmWidth = width * 25.4 / monitorResolution;
+	    mmHeight = height * 25.4 / monitorResolution;
+	}
+	else
+	{
+	    xf86OutputPtr   output = xf86CompatOutput(pScrn);
+
+	    if (output &&
+		output->conf_monitor &&
+		(output->conf_monitor->mon_width  > 0 &&
+		 output->conf_monitor->mon_height > 0))
+	    {
+		/*
+		 * Prefer user configured DisplaySize
+		 */
+		mmWidth = output->conf_monitor->mon_width;
+		mmHeight = output->conf_monitor->mon_height;
+	    }
+	    else
+	    {
+		/*
+		 * Otherwise, just set the screen to DEFAULT_DPI
+		 */
+		mmWidth = width * 25.4 / DEFAULT_DPI;
+		mmHeight = height * 25.4 / DEFAULT_DPI;
+	    }
+	}
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		   "Setting screen physical size to %d x %d\n",
+		   mmWidth, mmHeight);
+	/*
+	 * This is the initial setting of the screen size.
+	 * We have to pre-set it here, otherwise panning would be adapted
+	 * to the new screen size.
+	 */
+	pScreen->width  = width;
+	pScreen->height = height;
+	xf86RandR12ScreenSetSize (pScreen,
+				  width,
+				  height,
+				  mmWidth,
+				  mmHeight);
+    }
+
+    if (xf86RandR12Key == NULL)
+	return TRUE;
+
+    if (randrp->virtualX == -1 || randrp->virtualY == -1)
+    {
+	randrp->virtualX = pScrn->virtualX;
+	randrp->virtualY = pScrn->virtualY;
+    }
+    xf86CrtcSetScreenSubpixelOrder (pScreen);
+#if RANDR_12_INTERFACE
+    if (xf86RandR12CreateScreenResources12 (pScreen))
+	return TRUE;
+#endif
+    return TRUE;
+}
+
+
+Bool
+xf86RandR12Init (ScreenPtr pScreen)
+{
+    rrScrPrivPtr	rp;
+    XF86RandRInfoPtr	randrp;
+
+#ifdef PANORAMIX
+    /* XXX disable RandR when using Xinerama */
+    if (!noPanoramiXExtension)
+    {
+        if (xf86NumScreens == 1)
+            noPanoramiXExtension = TRUE;
+        else
+            return TRUE;
+    }
+#endif
+
+    if (xf86RandR12Generation != serverGeneration)
+	xf86RandR12Generation = serverGeneration;
+
+    xf86RandR12Key = &xf86RandR12KeyRec;
+    if (!dixRegisterPrivateKey(&xf86RandR12KeyRec, PRIVATE_SCREEN, 0))
+	return FALSE;
+
+    randrp = malloc(sizeof (XF86RandRInfoRec));
+    if (!randrp)
+	return FALSE;
+
+    if (!RRScreenInit(pScreen))
+    {
+	free(randrp);
+	return FALSE;
+    }
+    rp = rrGetScrPriv(pScreen);
+    rp->rrGetInfo = xf86RandR12GetInfo;
+    rp->rrSetConfig = xf86RandR12SetConfig;
+
+    randrp->virtualX = -1;
+    randrp->virtualY = -1;
+    randrp->mmWidth = pScreen->mmWidth;
+    randrp->mmHeight = pScreen->mmHeight;
+
+    randrp->rotation = RR_Rotate_0; /* initial rotated mode */
+
+    randrp->supported_rotations = RR_Rotate_0;
+
+    randrp->maxX = randrp->maxY = 0;
+
+    dixSetPrivate(&pScreen->devPrivates, xf86RandR12Key, randrp);
+
+#if RANDR_12_INTERFACE
+    if (!xf86RandR12Init12 (pScreen))
+	return FALSE;
+#endif
+    return TRUE;
+}
+
+void
+xf86RandR12CloseScreen (ScreenPtr pScreen)
+{
+    XF86RandRInfoPtr	randrp;
+
+    if (xf86RandR12Key == NULL)
+	return;
+
+    randrp = XF86RANDRINFO(pScreen);
+#if RANDR_12_INTERFACE
+    xf86Screens[pScreen->myNum]->EnterVT = randrp->orig_EnterVT;
+#endif
+
+    free(randrp);
+}
+
+void
+xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations)
+{
+    XF86RandRInfoPtr	randrp;
+#if RANDR_12_INTERFACE
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    int			c;
+    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+#endif
+
+    if (xf86RandR12Key == NULL)
+	return;
+
+    randrp = XF86RANDRINFO(pScreen);
+#if RANDR_12_INTERFACE
+    for (c = 0; c < config->num_crtc; c++) {
+	xf86CrtcPtr    crtc = config->crtc[c];
+
+	RRCrtcSetRotations (crtc->randr_crtc, rotations);
+    }
+#endif
+    randrp->supported_rotations = rotations;
+}
+
+void
+xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms)
+{
+    XF86RandRInfoPtr	randrp;
+#if RANDR_13_INTERFACE
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    int			c;
+    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+#endif
+
+    if (xf86RandR12Key == NULL)
+	return;
+
+    randrp = XF86RANDRINFO(pScreen);
+#if RANDR_13_INTERFACE
+    for (c = 0; c < config->num_crtc; c++) {
+	xf86CrtcPtr    crtc = config->crtc[c];
+
+	RRCrtcSetTransformSupport (crtc->randr_crtc, transforms);
+    }
+#endif
+}
+
+void
+xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y)
+{
+    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
+
+    if (xf86RandR12Generation != serverGeneration ||
+	XF86RANDRINFO(pScreen)->virtualX == -1)
+    {
+	*x = pScrn->virtualX;
+	*y = pScrn->virtualY;
+    } else {
+	XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
+
+	*x = randrp->virtualX;
+	*y = randrp->virtualY;
+    }
+}
+
+#if RANDR_12_INTERFACE
+
+#define FLAG_BITS (RR_HSyncPositive | \
+		   RR_HSyncNegative | \
+		   RR_VSyncPositive | \
+		   RR_VSyncNegative | \
+		   RR_Interlace | \
+		   RR_DoubleScan | \
+		   RR_CSync | \
+		   RR_CSyncPositive | \
+		   RR_CSyncNegative | \
+		   RR_HSkewPresent | \
+		   RR_BCast | \
+		   RR_PixelMultiplex | \
+		   RR_DoubleClock | \
+		   RR_ClockDivideBy2)
+
+static Bool
+xf86RandRModeMatches (RRModePtr		randr_mode,
+		      DisplayModePtr	mode)
+{
+#if 0
+    if (match_name)
+    {
+	/* check for same name */
+	int	len = strlen (mode->name);
+	if (randr_mode->mode.nameLength != len)			return FALSE;
+	if (memcmp (randr_mode->name, mode->name, len) != 0)	return FALSE;
+    }
+#endif
+    
+    /* check for same timings */
+    if (randr_mode->mode.dotClock / 1000 != mode->Clock)    return FALSE;
+    if (randr_mode->mode.width        != mode->HDisplay)    return FALSE;
+    if (randr_mode->mode.hSyncStart   != mode->HSyncStart)  return FALSE;
+    if (randr_mode->mode.hSyncEnd     != mode->HSyncEnd)    return FALSE;
+    if (randr_mode->mode.hTotal       != mode->HTotal)	    return FALSE;
+    if (randr_mode->mode.hSkew        != mode->HSkew)	    return FALSE;
+    if (randr_mode->mode.height       != mode->VDisplay)    return FALSE;
+    if (randr_mode->mode.vSyncStart   != mode->VSyncStart)  return FALSE;
+    if (randr_mode->mode.vSyncEnd     != mode->VSyncEnd)    return FALSE;
+    if (randr_mode->mode.vTotal       != mode->VTotal)	    return FALSE;
+    
+    /* check for same flags (using only the XF86 valid flag bits) */
+    if ((randr_mode->mode.modeFlags & FLAG_BITS) != (mode->Flags & FLAG_BITS))
+	return FALSE;
+    
+    /* everything matches */
+    return TRUE;
+}
+
+static Bool
+xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)
+{
+    ScreenPtr		pScreen = randr_crtc->pScreen;
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+    RRModePtr		randr_mode = NULL;
+    int			x;
+    int			y;
+    Rotation		rotation;
+    int			numOutputs;
+    RROutputPtr		*randr_outputs;
+    RROutputPtr		randr_output;
+    xf86CrtcPtr		crtc = randr_crtc->devPrivate;
+    xf86OutputPtr	output;
+    int			i, j;
+    DisplayModePtr	mode = &crtc->mode;
+    Bool		ret;
+
+    randr_outputs = malloc(config->num_output * sizeof (RROutputPtr));
+    if (!randr_outputs)
+	return FALSE;
+    x = crtc->x;
+    y = crtc->y;
+    rotation = crtc->rotation;
+    numOutputs = 0;
+    randr_mode = NULL;
+    for (i = 0; i < config->num_output; i++)
+    {
+	output = config->output[i];
+	if (output->crtc == crtc)
+	{
+	    randr_output = output->randr_output;
+	    randr_outputs[numOutputs++] = randr_output;
+	    /*
+	     * We make copies of modes, so pointer equality 
+	     * isn't sufficient
+	     */
+	    for (j = 0; j < randr_output->numModes + randr_output->numUserModes; j++)
+	    {
+		RRModePtr   m = (j < randr_output->numModes ?
+				 randr_output->modes[j] :
+				 randr_output->userModes[j-randr_output->numModes]);
+					 
+		if (xf86RandRModeMatches (m, mode))
+		{
+		    randr_mode = m;
+		    break;
+		}
+	    }
+	}
+    }
+    ret = RRCrtcNotify (randr_crtc, randr_mode, x, y,
+			rotation, 
+			crtc->transformPresent ? &crtc->transform : NULL,
+			numOutputs, randr_outputs);
+    free(randr_outputs);
+    return ret;
+}
+
+/*
+ * Convert a RandR mode to a DisplayMode
+ */
+static void
+xf86RandRModeConvert (ScrnInfoPtr	scrn,
+		      RRModePtr		randr_mode,
+		      DisplayModePtr	mode)
+{
+    memset(mode, 0, sizeof(DisplayModeRec));
+    mode->status = MODE_OK;
+
+    mode->Clock = randr_mode->mode.dotClock / 1000;
+    
+    mode->HDisplay = randr_mode->mode.width;
+    mode->HSyncStart = randr_mode->mode.hSyncStart;
+    mode->HSyncEnd = randr_mode->mode.hSyncEnd;
+    mode->HTotal = randr_mode->mode.hTotal;
+    mode->HSkew = randr_mode->mode.hSkew;
+    
+    mode->VDisplay = randr_mode->mode.height;
+    mode->VSyncStart = randr_mode->mode.vSyncStart;
+    mode->VSyncEnd = randr_mode->mode.vSyncEnd;
+    mode->VTotal = randr_mode->mode.vTotal;
+    mode->VScan = 0;
+
+    mode->Flags = randr_mode->mode.modeFlags & FLAG_BITS;
+
+    xf86SetModeCrtc (mode, scrn->adjustFlags);
+}
+
+static Bool
+xf86RandR12CrtcSet (ScreenPtr	    pScreen,
+		    RRCrtcPtr	    randr_crtc,
+		    RRModePtr	    randr_mode,
+		    int		    x,
+		    int		    y,
+		    Rotation	    rotation,
+		    int		    num_randr_outputs,
+		    RROutputPtr	    *randr_outputs)
+{
+    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+    xf86CrtcPtr		crtc = randr_crtc->devPrivate;
+    RRTransformPtr	transform;
+    Bool		changed = FALSE;
+    int			o, ro;
+    xf86CrtcPtr		*save_crtcs;
+    Bool		save_enabled = crtc->enabled;
+
+    if (!crtc->scrn->vtSema)
+	return FALSE;
+
+    save_crtcs = malloc(config->num_output * sizeof (xf86CrtcPtr));
+    if ((randr_mode != NULL) != crtc->enabled)
+	changed = TRUE;
+    else if (randr_mode && !xf86RandRModeMatches (randr_mode, &crtc->mode))
+	changed = TRUE;
+    
+    if (rotation != crtc->rotation)
+	changed = TRUE;
+
+    transform = RRCrtcGetTransform (randr_crtc);
+    if ((transform != NULL) != crtc->transformPresent)
+	changed = TRUE;
+    else if (transform && memcmp (&transform->transform, &crtc->transform.transform,
+				  sizeof (transform->transform)) != 0)
+	changed = TRUE;
+
+    if (x != crtc->x || y != crtc->y)
+	changed = TRUE;
+    for (o = 0; o < config->num_output; o++) 
+    {
+	xf86OutputPtr  output = config->output[o];
+	xf86CrtcPtr    new_crtc;
+
+	save_crtcs[o] = output->crtc;
+	
+	if (output->crtc == crtc)
+	    new_crtc = NULL;
+	else
+	    new_crtc = output->crtc;
+	for (ro = 0; ro < num_randr_outputs; ro++) 
+	    if (output->randr_output == randr_outputs[ro])
+	    {
+		new_crtc = crtc;
+		break;
+	    }
+	if (new_crtc != output->crtc)
+	{
+	    changed = TRUE;
+	    output->crtc = new_crtc;
+	}
+    }
+    for (ro = 0; ro < num_randr_outputs; ro++) 
+        if (randr_outputs[ro]->pendingProperties)
+	    changed = TRUE;
+
+    /* XXX need device-independent mode setting code through an API */
+    if (changed)
+    {
+	crtc->enabled = randr_mode != NULL;
+
+	if (randr_mode)
+	{
+	    DisplayModeRec  mode;
+	    RRTransformPtr  transform = RRCrtcGetTransform (randr_crtc);
+
+	    xf86RandRModeConvert (pScrn, randr_mode, &mode);
+	    if (!xf86CrtcSetModeTransform (crtc, &mode, rotation, transform, x, y))
+	    {
+		crtc->enabled = save_enabled;
+		for (o = 0; o < config->num_output; o++)
+		{
+		    xf86OutputPtr	output = config->output[o];
+		    output->crtc = save_crtcs[o];
+		}
+		free(save_crtcs);
+		return FALSE;
+	    }
+	    xf86RandR13VerifyPanningArea (crtc, pScreen->width, pScreen->height);
+	    xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);
+	    /*
+	     * Save the last successful setting for EnterVT
+	     */
+	    crtc->desiredMode = mode;
+	    crtc->desiredRotation = rotation;
+	    if (transform) {
+		crtc->desiredTransform = *transform;
+		crtc->desiredTransformPresent = TRUE;
+	    } else
+		crtc->desiredTransformPresent = FALSE;
+
+	    crtc->desiredX = x;
+	    crtc->desiredY = y;
+	}
+	xf86DisableUnusedFunctions (pScrn);
+    }
+    free(save_crtcs);
+    return xf86RandR12CrtcNotify (randr_crtc);
+}
+
+static Bool
+xf86RandR12CrtcSetGamma (ScreenPtr    pScreen,
+			 RRCrtcPtr    randr_crtc)
+{
+    xf86CrtcPtr		crtc = randr_crtc->devPrivate;
+
+    if (crtc->funcs->gamma_set == NULL)
+	return FALSE;
+
+    if (!crtc->scrn->vtSema)
+	return TRUE;
+
+    /* Realloc local gamma if needed. */
+    if (randr_crtc->gammaSize != crtc->gamma_size) {
+        CARD16 *tmp_ptr;
+        tmp_ptr = realloc(crtc->gamma_red, 3 * crtc->gamma_size * sizeof (CARD16));
+        if (!tmp_ptr)
+            return FALSE;
+        crtc->gamma_red = tmp_ptr;
+        crtc->gamma_green = crtc->gamma_red + crtc->gamma_size;
+        crtc->gamma_blue = crtc->gamma_green + crtc->gamma_size;
+    }
+
+    crtc->gamma_size = randr_crtc->gammaSize;
+    memcpy (crtc->gamma_red, randr_crtc->gammaRed, crtc->gamma_size * sizeof (CARD16));
+    memcpy (crtc->gamma_green, randr_crtc->gammaGreen, crtc->gamma_size * sizeof (CARD16));
+    memcpy (crtc->gamma_blue, randr_crtc->gammaBlue, crtc->gamma_size * sizeof (CARD16));
+
+    /* Only set it when the crtc is actually running.
+     * Otherwise it will be set when it's activated.
+     */
+    if (crtc->active)
+	crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
+						crtc->gamma_blue, crtc->gamma_size);
+
+    return TRUE;
+}
+
+static Bool
+xf86RandR12CrtcGetGamma (ScreenPtr    pScreen,
+			 RRCrtcPtr    randr_crtc)
+{
+    xf86CrtcPtr crtc = randr_crtc->devPrivate;
+
+    if (!crtc->gamma_size)
+        return FALSE;
+
+    if (!crtc->gamma_red || !crtc->gamma_green || !crtc->gamma_blue)
+        return FALSE;
+
+    /* Realloc randr gamma if needed. */
+    if (randr_crtc->gammaSize != crtc->gamma_size) {
+        CARD16 *tmp_ptr;
+        tmp_ptr = realloc(randr_crtc->gammaRed, 3 * crtc->gamma_size * sizeof (CARD16));
+        if (!tmp_ptr)
+            return FALSE;
+        randr_crtc->gammaRed = tmp_ptr;
+        randr_crtc->gammaGreen = randr_crtc->gammaRed + crtc->gamma_size;
+        randr_crtc->gammaBlue = randr_crtc->gammaGreen + crtc->gamma_size;
+    }
+    randr_crtc->gammaSize = crtc->gamma_size;
+    memcpy (randr_crtc->gammaRed, crtc->gamma_red, crtc->gamma_size * sizeof (CARD16));
+    memcpy (randr_crtc->gammaGreen, crtc->gamma_green, crtc->gamma_size * sizeof (CARD16));
+    memcpy (randr_crtc->gammaBlue, crtc->gamma_blue, crtc->gamma_size * sizeof (CARD16));
+
+    return TRUE;
+}
+
+static Bool
+xf86RandR12OutputSetProperty (ScreenPtr pScreen,
+			      RROutputPtr randr_output,
+			      Atom property,
+			      RRPropertyValuePtr value)
+{
+    xf86OutputPtr output = randr_output->devPrivate;
+
+    /* If we don't have any property handler, then we don't care what the
+     * user is setting properties to.
+     */
+    if (output->funcs->set_property == NULL)
+	return TRUE;
+
+    /*
+     * This function gets called even when vtSema is FALSE, as
+     * drivers will need to remember the correct value to apply
+     * when the VT switch occurs
+     */
+    return output->funcs->set_property(output, property, value);
+}
+
+static Bool
+xf86RandR13OutputGetProperty (ScreenPtr pScreen,
+			      RROutputPtr randr_output,
+			      Atom property)
+{
+    xf86OutputPtr output = randr_output->devPrivate;
+
+    if (output->funcs->get_property == NULL)
+	return TRUE;
+
+    /* Should be safe even w/o vtSema */
+    return output->funcs->get_property(output, property);
+}
+
+static Bool
+xf86RandR12OutputValidateMode (ScreenPtr    pScreen,
+			       RROutputPtr  randr_output,
+			       RRModePtr    randr_mode)
+{
+    ScrnInfoPtr	    pScrn = xf86Screens[pScreen->myNum];
+    xf86OutputPtr   output = randr_output->devPrivate;
+    DisplayModeRec  mode;
+
+    xf86RandRModeConvert (pScrn, randr_mode, &mode);
+    /*
+     * This function may be called when vtSema is FALSE, so
+     * the underlying function must either avoid touching the hardware
+     * or return FALSE when vtSema is FALSE
+     */
+    if (output->funcs->mode_valid (output, &mode) != MODE_OK)
+	return FALSE;
+    return TRUE;
+}
+
+static void
+xf86RandR12ModeDestroy (ScreenPtr pScreen, RRModePtr randr_mode)
+{
+}
+
+/**
+ * Given a list of xf86 modes and a RandR Output object, construct
+ * RandR modes and assign them to the output
+ */
+static Bool
+xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)
+{
+    DisplayModePtr  mode;
+    RRModePtr	    *rrmodes = NULL;
+    int		    nmode = 0;
+    int		    npreferred = 0;
+    Bool	    ret = TRUE;
+    int		    pref;
+
+    for (mode = modes; mode; mode = mode->next)
+	nmode++;
+
+    if (nmode) {
+	rrmodes = malloc(nmode * sizeof (RRModePtr));
+	
+	if (!rrmodes)
+	    return FALSE;
+	nmode = 0;
+
+	for (pref = 1; pref >= 0; pref--) {
+	    for (mode = modes; mode; mode = mode->next) {
+		if ((pref != 0) == ((mode->type & M_T_PREFERRED) != 0)) {
+		    xRRModeInfo		modeInfo;
+		    RRModePtr		rrmode;
+		    
+		    modeInfo.nameLength = strlen (mode->name);
+		    modeInfo.width = mode->HDisplay;
+		    modeInfo.dotClock = mode->Clock * 1000;
+		    modeInfo.hSyncStart = mode->HSyncStart;
+		    modeInfo.hSyncEnd = mode->HSyncEnd;
+		    modeInfo.hTotal = mode->HTotal;
+		    modeInfo.hSkew = mode->HSkew;
+
+		    modeInfo.height = mode->VDisplay;
+		    modeInfo.vSyncStart = mode->VSyncStart;
+		    modeInfo.vSyncEnd = mode->VSyncEnd;
+		    modeInfo.vTotal = mode->VTotal;
+		    modeInfo.modeFlags = mode->Flags;
+
+		    rrmode = RRModeGet (&modeInfo, mode->name);
+		    if (rrmode) {
+			rrmodes[nmode++] = rrmode;
+			npreferred += pref;
+		    }
+		}
+	    }
+	}
+    }
+    
+    ret = RROutputSetModes (randr_output, rrmodes, nmode, npreferred);
+    free(rrmodes);
+    return ret;
+}
+
+/*
+ * Mirror the current mode configuration to RandR
+ */
+static Bool
+xf86RandR12SetInfo12 (ScreenPtr pScreen)
+{
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+    RROutputPtr		*clones;
+    RRCrtcPtr		*crtcs;
+    int			ncrtc;
+    int			o, c, l;
+    RRCrtcPtr		randr_crtc;
+    int			nclone;
+    
+    clones = malloc(config->num_output * sizeof (RROutputPtr));
+    crtcs = malloc(config->num_crtc * sizeof (RRCrtcPtr));
+    for (o = 0; o < config->num_output; o++)
+    {
+	xf86OutputPtr	output = config->output[o];
+	
+	ncrtc = 0;
+	for (c = 0; c < config->num_crtc; c++)
+	    if (output->possible_crtcs & (1 << c))
+		crtcs[ncrtc++] = config->crtc[c]->randr_crtc;
+
+	if (output->crtc)
+	    randr_crtc = output->crtc->randr_crtc;
+	else
+	    randr_crtc = NULL;
+
+	if (!RROutputSetCrtcs (output->randr_output, crtcs, ncrtc))
+	{
+	    free(crtcs);
+	    free(clones);
+	    return FALSE;
+	}
+
+	RROutputSetPhysicalSize(output->randr_output, 
+				output->mm_width,
+				output->mm_height);
+	xf86RROutputSetModes (output->randr_output, output->probed_modes);
+
+	switch (output->status) {
+	case XF86OutputStatusConnected:
+	    RROutputSetConnection (output->randr_output, RR_Connected);
+	    break;
+	case XF86OutputStatusDisconnected:
+	    RROutputSetConnection (output->randr_output, RR_Disconnected);
+	    break;
+	case XF86OutputStatusUnknown:
+	    RROutputSetConnection (output->randr_output, RR_UnknownConnection);
+	    break;
+	}
+
+	RROutputSetSubpixelOrder (output->randr_output, output->subpixel_order);
+
+	/*
+	 * Valid clones
+	 */
+	nclone = 0;
+	for (l = 0; l < config->num_output; l++)
+	{
+	    xf86OutputPtr	    clone = config->output[l];
+	    
+	    if (l != o && (output->possible_clones & (1 << l)))
+		clones[nclone++] = clone->randr_output;
+	}
+	if (!RROutputSetClones (output->randr_output, clones, nclone))
+	{
+	    free(crtcs);
+	    free(clones);
+	    return FALSE;
+	}
+    }
+    free(crtcs);
+    free(clones);
+    return TRUE;
+}
+
+
+
+/*
+ * Query the hardware for the current state, then mirror
+ * that to RandR
+ */
+static Bool
+xf86RandR12GetInfo12 (ScreenPtr pScreen, Rotation *rotations)
+{
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+
+    if (!pScrn->vtSema)
+	return TRUE;
+    xf86ProbeOutputModes (pScrn, 0, 0);
+    xf86SetScrnInfoModes (pScrn);
+    return xf86RandR12SetInfo12 (pScreen);
+}
+
+static Bool
+xf86RandR12CreateObjects12 (ScreenPtr pScreen)
+{
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int			c;
+    int			o;
+    
+    if (!RRInit ())
+	return FALSE;
+
+    /*
+     * Configure crtcs
+     */
+    for (c = 0; c < config->num_crtc; c++)
+    {
+	xf86CrtcPtr    crtc = config->crtc[c];
+	
+	crtc->randr_crtc = RRCrtcCreate (pScreen, crtc);
+	RRCrtcGammaSetSize (crtc->randr_crtc, 256);
+    }
+    /*
+     * Configure outputs
+     */
+    for (o = 0; o < config->num_output; o++)
+    {
+	xf86OutputPtr	output = config->output[o];
+
+	output->randr_output = RROutputCreate (pScreen, output->name, 
+					       strlen (output->name),
+					       output);
+
+	if (output->funcs->create_resources != NULL)
+	    output->funcs->create_resources(output);
+	RRPostPendingProperties (output->randr_output);
+    }
+    return TRUE;
+}
+
+static Bool
+xf86RandR12CreateScreenResources12 (ScreenPtr pScreen)
+{
+    int			c;
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+
+    if (xf86RandR12Key == NULL)
+	return TRUE;
+
+    for (c = 0; c < config->num_crtc; c++)
+        xf86RandR12CrtcNotify (config->crtc[c]->randr_crtc);
+    
+    RRScreenSetSizeRange (pScreen, config->minWidth, config->minHeight,
+			  config->maxWidth, config->maxHeight);
+    return TRUE;
+}
+
+/*
+ * Something happened within the screen configuration due
+ * to DGA, VidMode or hot key. Tell RandR
+ */
+
+void
+xf86RandR12TellChanged (ScreenPtr pScreen)
+{
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int			c;
+
+    if (xf86RandR12Key == NULL)
+	return;
+
+    xf86RandR12SetInfo12 (pScreen);
+    for (c = 0; c < config->num_crtc; c++)
+	xf86RandR12CrtcNotify (config->crtc[c]->randr_crtc);
+
+    RRTellChanged (pScreen);
+}
+
+static void
+xf86RandR12PointerMoved (int scrnIndex, int x, int y)
+{
+    ScreenPtr		pScreen = screenInfo.screens[scrnIndex];
+    ScrnInfoPtr		pScrn   = XF86SCRNINFO(pScreen);
+    xf86CrtcConfigPtr	config  = XF86_CRTC_CONFIG_PTR(pScrn);
+    XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);
+    int c;
+
+    randrp->pointerX = x;
+    randrp->pointerY = y;
+    for (c = 0; c < config->num_crtc; c++)
+	xf86RandR13Pan (config->crtc[c], x, y);
+}
+
+static Bool
+xf86RandR13GetPanning (ScreenPtr           pScreen,
+		       RRCrtcPtr           randr_crtc,
+		       BoxPtr              totalArea,
+		       BoxPtr              trackingArea,
+		       INT16               *border)
+{
+    xf86CrtcPtr		crtc = randr_crtc->devPrivate;
+
+    if (crtc->version < 2)
+	return FALSE;
+    if (totalArea)
+	memcpy (totalArea,    &crtc->panningTotalArea,    sizeof(BoxRec));
+    if (trackingArea)
+	memcpy (trackingArea, &crtc->panningTrackingArea, sizeof(BoxRec));
+    if (border)
+	memcpy (border,        crtc->panningBorder,       4*sizeof(INT16));
+
+    return TRUE;
+}
+
+static Bool
+xf86RandR13SetPanning (ScreenPtr           pScreen,
+		       RRCrtcPtr           randr_crtc,
+		       BoxPtr              totalArea,
+		       BoxPtr              trackingArea,
+		       INT16               *border)
+{
+    XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);
+    xf86CrtcPtr		crtc = randr_crtc->devPrivate;
+    BoxRec		oldTotalArea;
+    BoxRec		oldTrackingArea;
+    INT16		oldBorder[4];
+
+
+    if (crtc->version < 2)
+	return FALSE;
+
+    memcpy (&oldTotalArea,    &crtc->panningTotalArea,    sizeof(BoxRec));
+    memcpy (&oldTrackingArea, &crtc->panningTrackingArea, sizeof(BoxRec));
+    memcpy (oldBorder,         crtc->panningBorder,       4*sizeof(INT16));
+
+    if (totalArea)
+	memcpy (&crtc->panningTotalArea, totalArea, sizeof(BoxRec));
+    if (trackingArea)
+	memcpy (&crtc->panningTrackingArea, trackingArea, sizeof(BoxRec));
+    if (border)
+	memcpy (crtc->panningBorder, border, 4*sizeof(INT16));
+
+    if (xf86RandR13VerifyPanningArea (crtc, pScreen->width, pScreen->height)) {
+	xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);
+	return TRUE;
+    } else {
+	/* Restore old settings */
+	memcpy (&crtc->panningTotalArea,    &oldTotalArea,    sizeof(BoxRec));
+	memcpy (&crtc->panningTrackingArea, &oldTrackingArea, sizeof(BoxRec));
+	memcpy (crtc->panningBorder,         oldBorder,       4*sizeof(INT16));
+	return FALSE;
+    }
+}
+
+/*
+ * Compatibility with XF86VidMode's gamma changer.  This necessarily clobbers
+ * any per-crtc setup.  You asked for it...
+ */
+
+static void
+gamma_to_ramp(float gamma, CARD16 *ramp, int size)
+{
+    int i;
+
+    for (i = 0; i < size; i++) {
+	if (gamma == 1.0)
+	    ramp[i] = i << 8;
+	else
+	    ramp[i] = (CARD16)(pow((double)i / (double)(size - 1), 1. / gamma)
+			       * (double)(size - 1) * 256);
+    }
+}
+
+static int
+xf86RandR12ChangeGamma(int scrnIndex, Gamma gamma)
+{
+    CARD16 *points, *red, *green, *blue;
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+    RRCrtcPtr crtc = xf86CompatRRCrtc(pScrn);
+    int size;
+
+    if (!crtc)
+	return Success;
+
+    size = max(0, crtc->gammaSize);
+    if (!size)
+	return Success;
+
+    points = calloc(size, 3 * sizeof(CARD16));
+    if (!points)
+	return BadAlloc;
+
+    red = points;
+    green = points + size;
+    blue = points + 2 * size;
+
+    gamma_to_ramp(gamma.red, red, size);
+    gamma_to_ramp(gamma.green, green, size);
+    gamma_to_ramp(gamma.blue, blue, size);
+    RRCrtcGammaSet(crtc, red, green, blue);
+
+    free(points);
+
+    pScrn->gamma = gamma;
+
+    return Success;
+}
+
+static Bool
+xf86RandR12EnterVT (int screen_index, int flags)
+{
+    ScreenPtr        pScreen = screenInfo.screens[screen_index];
+    ScrnInfoPtr	     pScrn = xf86Screens[screen_index];
+    XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);
+    rrScrPrivPtr     rp = rrGetScrPriv(pScreen);
+    Bool	     ret;
+
+    if (randrp->orig_EnterVT) {
+	pScrn->EnterVT = randrp->orig_EnterVT;
+	ret = pScrn->EnterVT (screen_index, flags);
+	randrp->orig_EnterVT = pScrn->EnterVT;
+	pScrn->EnterVT = xf86RandR12EnterVT;
+	if (!ret)
+	    return FALSE;
+    }
+
+    /* reload gamma */
+    int i;
+    for (i = 0; i < rp->numCrtcs; i++)
+	xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]);
+
+    return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */
+}
+
+static Bool
+xf86RandR12Init12 (ScreenPtr pScreen)
+{
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    rrScrPrivPtr	rp = rrGetScrPriv(pScreen);
+    XF86RandRInfoPtr	randrp  = XF86RANDRINFO(pScreen);
+    int i;
+
+    rp->rrGetInfo = xf86RandR12GetInfo12;
+    rp->rrScreenSetSize = xf86RandR12ScreenSetSize;
+    rp->rrCrtcSet = xf86RandR12CrtcSet;
+    rp->rrCrtcSetGamma = xf86RandR12CrtcSetGamma;
+    rp->rrCrtcGetGamma = xf86RandR12CrtcGetGamma;
+    rp->rrOutputSetProperty = xf86RandR12OutputSetProperty;
+    rp->rrOutputValidateMode = xf86RandR12OutputValidateMode;
+#if RANDR_13_INTERFACE
+    rp->rrOutputGetProperty = xf86RandR13OutputGetProperty;
+    rp->rrGetPanning = xf86RandR13GetPanning;
+    rp->rrSetPanning = xf86RandR13SetPanning;
+#endif
+    rp->rrModeDestroy = xf86RandR12ModeDestroy;
+    rp->rrSetConfig = NULL;
+    pScrn->PointerMoved = xf86RandR12PointerMoved;
+    pScrn->ChangeGamma = xf86RandR12ChangeGamma;
+
+    randrp->orig_EnterVT = pScrn->EnterVT;
+    pScrn->EnterVT = xf86RandR12EnterVT;
+
+    if (!xf86RandR12CreateObjects12 (pScreen))
+	return FALSE;
+
+    /*
+     * Configure output modes
+     */
+    if (!xf86RandR12SetInfo12 (pScreen))
+	return FALSE;
+    for (i = 0; i < rp->numCrtcs; i++) {
+	xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]);
+    }
+    return TRUE;
+}
+
+#endif
+
+Bool
+xf86RandR12PreInit (ScrnInfoPtr pScrn)
+{
+    return TRUE;
+}
diff --git a/xorg-server/hw/xfree86/modes/xf86Rotate.c b/xorg-server/hw/xfree86/modes/xf86Rotate.c
index 0181bc381..57c3499ac 100644
--- a/xorg-server/hw/xfree86/modes/xf86Rotate.c
+++ b/xorg-server/hw/xfree86/modes/xf86Rotate.c
@@ -1,565 +1,525 @@
-/*

- * Copyright © 2006 Keith Packard

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that copyright

- * notice and this permission notice appear in supporting documentation, and

- * that the name of the copyright holders not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  The copyright holders make no representations

- * about the suitability of this software for any purpose.  It is provided "as

- * is" without express or implied warranty.

- *

- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

- * OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#else

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#endif

-

-#include <stddef.h>

-#include <string.h>

-#include <stdio.h>

-

-#include "xf86.h"

-#include "xf86DDC.h"

-#include "fb.h"

-#include "windowstr.h"

-#include "xf86Crtc.h"

-#include "xf86Modes.h"

-#include "xf86RandR12.h"

-#include "X11/extensions/render.h"

-#include "X11/extensions/dpmsconst.h"

-#include "X11/Xatom.h"

-

-/* borrowed from composite extension, move to Render and publish? */

-

-static VisualPtr

-compGetWindowVisual (WindowPtr pWin)

-{

-    ScreenPtr	    pScreen = pWin->drawable.pScreen;

-    VisualID	    vid = wVisual (pWin);

-    int		    i;

-

-    for (i = 0; i < pScreen->numVisuals; i++)

-	if (pScreen->visuals[i].vid == vid)

-	    return &pScreen->visuals[i];

-    return 0;

-}

-

-static PictFormatPtr

-compWindowFormat (WindowPtr pWin)

-{

-    ScreenPtr	pScreen = pWin->drawable.pScreen;

-    

-    return PictureMatchVisual (pScreen, pWin->drawable.depth,

-			       compGetWindowVisual (pWin));

-}

-

-#define F(x)	IntToxFixed(x)

-

-#define toF(x)	((float) (x) / 65536.0f)

-

-static void

-xf86RotateCrtcRedisplay (xf86CrtcPtr crtc, RegionPtr region)

-{

-    ScrnInfoPtr		scrn = crtc->scrn;

-    ScreenPtr		screen = scrn->pScreen;

-    WindowPtr		root = screen->root;

-    PixmapPtr		dst_pixmap = crtc->rotatedPixmap;

-    PictFormatPtr	format = compWindowFormat (screen->root);

-    int			error;

-    PicturePtr		src, dst;

-    int			n = RegionNumRects(region);

-    BoxPtr		b = RegionRects(region);

-    XID			include_inferiors = IncludeInferiors;

-    

-    src = CreatePicture (None,

-			 &root->drawable,

-			 format,

-			 CPSubwindowMode,

-			 &include_inferiors,

-			 serverClient,

-			 &error);

-    if (!src)

-	return;

-

-    dst = CreatePicture (None,

-			 &dst_pixmap->drawable,

-			 format,

-			 0L,

-			 NULL,

-			 serverClient,

-			 &error);

-    if (!dst)

-	return;

-

-    error = SetPictureTransform (src, &crtc->crtc_to_framebuffer);

-    if (error)

-	return;

-    if (crtc->transform_in_use && crtc->filter)

-	SetPicturePictFilter (src, crtc->filter,

-			      crtc->params, crtc->nparams);

-

-    if (crtc->shadowClear)

-    {

-	CompositePicture (PictOpSrc,

-			  src, NULL, dst,

-			  0, 0, 0, 0, 0, 0,

-			  crtc->mode.HDisplay, crtc->mode.VDisplay);

-	crtc->shadowClear = FALSE;

-    }

-    else

-    {

-	while (n--)

-	{

-	    BoxRec	dst_box;

-

-	    dst_box = *b;

-	    dst_box.x1 -= crtc->filter_width >> 1;

-	    dst_box.x2 += crtc->filter_width >> 1;

-	    dst_box.y1 -= crtc->filter_height >> 1;

-	    dst_box.y2 += crtc->filter_height >> 1;

-	    pixman_f_transform_bounds (&crtc->f_framebuffer_to_crtc, &dst_box);

-	    CompositePicture (PictOpSrc,

-			      src, NULL, dst,

-			      dst_box.x1, dst_box.y1, 0, 0, dst_box.x1, dst_box.y1,

-			      dst_box.x2 - dst_box.x1,

-			      dst_box.y2 - dst_box.y1);

-	    b++;

-	}

-    }

-    FreePicture (src, None);

-    FreePicture (dst, None);

-}

-

-static void

-xf86CrtcDamageShadow (xf86CrtcPtr crtc)

-{

-    ScrnInfoPtr	pScrn = crtc->scrn;

-    BoxRec	damage_box;

-    RegionRec   damage_region;

-    ScreenPtr	pScreen = pScrn->pScreen;

-

-    damage_box.x1 = 0;

-    damage_box.x2 = crtc->mode.HDisplay;

-    damage_box.y1 = 0;

-    damage_box.y2 = crtc->mode.VDisplay;

-    if (!pixman_transform_bounds (&crtc->crtc_to_framebuffer, &damage_box))

-    {

-	damage_box.x1 = 0;

-	damage_box.y1 = 0;

-	damage_box.x2 = pScreen->width;

-	damage_box.y2 = pScreen->height;

-    }

-    if (damage_box.x1 < 0) damage_box.x1 = 0;

-    if (damage_box.y1 < 0) damage_box.y1 = 0;

-    if (damage_box.x2 > pScreen->width) damage_box.x2 = pScreen->width;

-    if (damage_box.y2 > pScreen->height) damage_box.y2 = pScreen->height;

-    RegionInit(&damage_region, &damage_box, 1);

-    DamageDamageRegion (&(*pScreen->GetScreenPixmap)(pScreen)->drawable,

-			&damage_region);

-    RegionUninit(&damage_region);

-    crtc->shadowClear = TRUE;

-}

-

-static void

-xf86RotatePrepare (ScreenPtr pScreen)

-{

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

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);

-    int			c;

-

-    for (c = 0; c < xf86_config->num_crtc; c++)

-    {

-	xf86CrtcPtr crtc = xf86_config->crtc[c];

-	

-	if (crtc->rotatedData && !crtc->rotatedPixmap)

-	{

-	    crtc->rotatedPixmap = crtc->funcs->shadow_create (crtc,

-							     crtc->rotatedData,

-							     crtc->mode.HDisplay,

-							     crtc->mode.VDisplay);

-	    if (!xf86_config->rotation_damage_registered)

-	    {

-		/* Hook damage to screen pixmap */

-		DamageRegister (&(*pScreen->GetScreenPixmap)(pScreen)->drawable,

-				xf86_config->rotation_damage);

-		xf86_config->rotation_damage_registered = TRUE;

-		EnableLimitedSchedulingLatency();

-	    }

-	    

-	    xf86CrtcDamageShadow (crtc);

-	}

-    }

-}

-

-static Bool

-xf86RotateRedisplay(ScreenPtr pScreen)

-{

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

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);

-    DamagePtr		damage = xf86_config->rotation_damage;

-    RegionPtr		region;

-

-    if (!damage)

-	return FALSE;

-    xf86RotatePrepare (pScreen);

-    region = DamageRegion(damage);

-    if (RegionNotEmpty(region))

-    {

-	int			c;

-	SourceValidateProcPtr	SourceValidate;

-

-	/*

-	 * SourceValidate is used by the software cursor code

-	 * to pull the cursor off of the screen when reading

-	 * bits from the frame buffer. Bypassing this function

-	 * leaves the software cursor in place

-	 */

-	SourceValidate = pScreen->SourceValidate;

-	pScreen->SourceValidate = NULL;

-

-	for (c = 0; c < xf86_config->num_crtc; c++)

-	{

-	    xf86CrtcPtr	    crtc = xf86_config->crtc[c];

-

-	    if (crtc->transform_in_use && crtc->enabled)

-	    {

-		RegionRec   crtc_damage;

-

-		/* compute portion of damage that overlaps crtc */

-		RegionInit(&crtc_damage, &crtc->bounds, 1);

-		RegionIntersect(&crtc_damage, &crtc_damage, region);

-		

-		/* update damaged region */

-		if (RegionNotEmpty(&crtc_damage))

-    		    xf86RotateCrtcRedisplay (crtc, &crtc_damage);

-		

-		RegionUninit(&crtc_damage);

-	    }

-	}

-	pScreen->SourceValidate = SourceValidate;

-	DamageEmpty(damage);

-    }

-    return TRUE;

-}

-

-static void

-xf86RotateBlockHandler(int screenNum, pointer blockData,

-		       pointer pTimeout, pointer pReadmask)

-{

-    ScreenPtr		pScreen = screenInfo.screens[screenNum];

-    ScrnInfoPtr		pScrn = xf86Screens[screenNum];

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);

-    Bool		rotation_active;

-

-    rotation_active = xf86RotateRedisplay(pScreen);

-    pScreen->BlockHandler = xf86_config->BlockHandler;

-    (*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);

-    /* cannot avoid re-wrapping until all wrapping is audited */

-    xf86_config->BlockHandler = pScreen->BlockHandler;

-    pScreen->BlockHandler = xf86RotateBlockHandler;

-}

-

-void

-xf86RotateDestroy (xf86CrtcPtr crtc)

-{

-    ScrnInfoPtr		pScrn = crtc->scrn;

-    ScreenPtr		pScreen = pScrn->pScreen;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);

-    int			c;

-    

-    /* Free memory from rotation */

-    if (crtc->rotatedPixmap || crtc->rotatedData)

-    {

-	crtc->funcs->shadow_destroy (crtc, crtc->rotatedPixmap, crtc->rotatedData);

-	crtc->rotatedPixmap = NULL;

-	crtc->rotatedData = NULL;

-    }

-

-    for (c = 0; c < xf86_config->num_crtc; c++)

-	if (xf86_config->crtc[c]->transform_in_use)

-	    return;

-

-    /*

-     * Clean up damage structures when no crtcs are rotated

-     */

-    if (xf86_config->rotation_damage)

-    {

-	/* Free damage structure */

-	if (xf86_config->rotation_damage_registered)

-	{

-	    DamageUnregister (&(*pScreen->GetScreenPixmap)(pScreen)->drawable,

-			      xf86_config->rotation_damage);

-	    xf86_config->rotation_damage_registered = FALSE;

-	    DisableLimitedSchedulingLatency();

-	}

-	DamageDestroy (xf86_config->rotation_damage);

-	xf86_config->rotation_damage = NULL;

-    }

-}

-

-void

-xf86RotateFreeShadow(ScrnInfoPtr pScrn)

-{

-    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);

-    int c;

-

-   for (c = 0; c < config->num_crtc; c++) {

-       xf86CrtcPtr crtc = config->crtc[c];

-

-       if (crtc->rotatedPixmap || crtc->rotatedData) {

-	   crtc->funcs->shadow_destroy(crtc, crtc->rotatedPixmap,

-				crtc->rotatedData);

-	   crtc->rotatedPixmap = NULL;

-	   crtc->rotatedData = NULL;

-       }

-   }

-}

-

-void

-xf86RotateCloseScreen (ScreenPtr screen)

-{

-    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    int			c;

-

-    for (c = 0; c < xf86_config->num_crtc; c++)

-	xf86RotateDestroy (xf86_config->crtc[c]);

-}

-

-static Bool

-xf86CrtcFitsScreen (xf86CrtcPtr crtc, struct pict_f_transform *crtc_to_fb)

-{

-    ScrnInfoPtr		pScrn = crtc->scrn;

-    BoxRec		b;

-

-    /* When called before PreInit, the driver is

-     * presumably doing load detect

-     */

-    if (pScrn->virtualX == 0 || pScrn->virtualY == 0)

-	return TRUE;

-

-    b.x1 = 0;

-    b.y1 = 0;

-    b.x2 = crtc->mode.HDisplay;

-    b.y2 = crtc->mode.VDisplay;

-    if (crtc_to_fb)

-	pixman_f_transform_bounds (crtc_to_fb, &b);

-    else {

-	b.x1 += crtc->x;

-	b.y1 += crtc->y;

-	b.x2 += crtc->x;

-	b.y2 += crtc->y;

-    }

-

-    return (0 <= b.x1 && b.x2 <= pScrn->virtualX &&

-	    0 <= b.y1 && b.y2 <= pScrn->virtualY);

-}

-

-/*

- * A subset of xf86CrtcRotate that just deals with

- * cursor image/position transforms. Used when changing

- * the cursor transform

- */

-void

-xf86CrtcRotateCursor (xf86CrtcPtr crtc)

-{

-    /* if this is called during ScreenInit() we don't have pScrn->pScreen yet */

-    RRTransformPtr	transform = NULL;

-    PictTransform	crtc_to_fb;

-    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc, f_screen_to_crtc, f_crtc_to_cursor;

-

-    if (crtc->transformPresent)

-	transform = &crtc->transform;

-

-    (void) RRTransformCompute (crtc->x, crtc->y,

-			       crtc->mode.HDisplay, crtc->mode.VDisplay,

-			       crtc->rotation,

-			       transform,

-			       &crtc->user_sprite_position_transform,

-			       &crtc->user_sprite_image_transform,

-

-			       &crtc_to_fb,

-			       &f_crtc_to_fb,

-			       &f_fb_to_crtc,

-			       &f_screen_to_crtc,

-			       &f_crtc_to_cursor,

-			       &crtc->sprite_transform_in_use);

-    crtc->f_screen_to_crtc = f_screen_to_crtc;

-    crtc->f_crtc_to_cursor = f_crtc_to_cursor;

-}

-

-Bool

-xf86CrtcRotate (xf86CrtcPtr crtc)

-{

-    ScrnInfoPtr		pScrn = crtc->scrn;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);

-    /* if this is called during ScreenInit() we don't have pScrn->pScreen yet */

-    ScreenPtr		pScreen = screenInfo.screens[pScrn->scrnIndex];

-    PictTransform	crtc_to_fb;

-    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc, f_screen_to_crtc, f_crtc_to_cursor;

-    xFixed		*new_params = NULL;

-    int			new_nparams = 0;

-    PictFilterPtr	new_filter = NULL;

-    int			new_width = 0;

-    int			new_height = 0;

-    RRTransformPtr	transform = NULL;

-    Bool		damage = FALSE;

-

-    if (crtc->transformPresent)

-	transform = &crtc->transform;

-

-    if (!RRTransformCompute (crtc->x, crtc->y,

-			     crtc->mode.HDisplay, crtc->mode.VDisplay,

-			     crtc->rotation,

-			     transform,

-			     &crtc->user_sprite_position_transform,

-			     &crtc->user_sprite_image_transform,

-

-			     &crtc_to_fb,

-			     &f_crtc_to_fb,

-			     &f_fb_to_crtc,

-			     &f_screen_to_crtc,

-			     &f_crtc_to_cursor,

-			     &crtc->sprite_transform_in_use) &&

-	xf86CrtcFitsScreen (crtc, &f_crtc_to_fb))

-    {

-	/*

-	 * If the untranslated transformation is the identity,

-	 * disable the shadow buffer

-	 */

-	xf86RotateDestroy (crtc);

-	crtc->transform_in_use = FALSE;

-	free(new_params);

-	new_params = NULL;

-	new_nparams = 0;

-	new_filter = NULL;

-	new_width = 0;

-	new_height = 0;

-    }

-    else

-    {

-	/*

-	 * these are the size of the shadow pixmap, which

-	 * matches the mode, not the pre-rotated copy in the

-	 * frame buffer

-	 */

-	int	    width = crtc->mode.HDisplay;

-	int	    height = crtc->mode.VDisplay;

-	void	    *shadowData = crtc->rotatedData;

-	PixmapPtr   shadow = crtc->rotatedPixmap;

-	int	    old_width = shadow ? shadow->drawable.width : 0;

-	int	    old_height = shadow ? shadow->drawable.height : 0;

-

-	/* Allocate memory for rotation */

-	if (old_width != width || old_height != height)

-	{

-	    if (shadow || shadowData)

-	    {

-		crtc->funcs->shadow_destroy (crtc, shadow, shadowData);

-		crtc->rotatedPixmap = NULL;

-		crtc->rotatedData = NULL;

-	    }

-	    shadowData = crtc->funcs->shadow_allocate (crtc, width, height);

-	    if (!shadowData)

-		goto bail1;

-	    crtc->rotatedData = shadowData;

-	    /* shadow will be damaged in xf86RotatePrepare */

-	}

-	else

-	{

-	    /* mark shadowed area as damaged so it will be repainted */

-	    damage = TRUE;

-	}

-

-	if (!xf86_config->rotation_damage)

-	{

-	    /* Create damage structure */

-	    xf86_config->rotation_damage = DamageCreate (NULL, NULL,

-						DamageReportNone,

-						TRUE, pScreen, pScreen);

-	    if (!xf86_config->rotation_damage)

-		goto bail2;

-	    

-	    /* Wrap block handler */

-	    if (!xf86_config->BlockHandler) {

-		xf86_config->BlockHandler = pScreen->BlockHandler;

-		pScreen->BlockHandler = xf86RotateBlockHandler;

-	    }

-	}

-#ifdef RANDR_12_INTERFACE

-	if (transform)

-	{

-	    if (transform->nparams) {

-		new_params = malloc(transform->nparams * sizeof (xFixed));

-		if (new_params) {

-		    memcpy (new_params, transform->params,

-			    transform->nparams * sizeof (xFixed));

-		    new_nparams = transform->nparams;

-		    new_filter = transform->filter;

-		}

-	    } else

-		new_filter = transform->filter;

-	    if (new_filter)

-	    {

-		new_width = new_filter->width;

-		new_height = new_filter->height;

-	    }

-	}

-#endif

-

-	if (0)

-	{

-    bail2:

-	    if (shadow || shadowData)

-	    {

-		crtc->funcs->shadow_destroy (crtc, shadow, shadowData);

-		crtc->rotatedPixmap = NULL;

-		crtc->rotatedData = NULL;

-	    }

-    bail1:

-	    if (old_width && old_height)

-		crtc->rotatedPixmap = crtc->funcs->shadow_create (crtc,

-								  NULL,

-								  old_width,

-								  old_height);

-	    return FALSE;

-	}

-	crtc->transform_in_use = TRUE;

-    }

-    crtc->crtc_to_framebuffer = crtc_to_fb;

-    crtc->f_crtc_to_framebuffer = f_crtc_to_fb;

-    crtc->f_framebuffer_to_crtc = f_fb_to_crtc;

-    crtc->f_screen_to_crtc = f_screen_to_crtc;

-    crtc->f_crtc_to_cursor = f_crtc_to_cursor;

-    free(crtc->params);

-    crtc->params = new_params;

-    crtc->nparams = new_nparams;

-    crtc->filter = new_filter;

-    crtc->filter_width = new_width;

-    crtc->filter_height = new_height;

-    crtc->bounds.x1 = 0;

-    crtc->bounds.x2 = crtc->mode.HDisplay;

-    crtc->bounds.y1 = 0;

-    crtc->bounds.y2 = crtc->mode.VDisplay;

-    pixman_f_transform_bounds (&f_crtc_to_fb, &crtc->bounds);

-

-    if (damage)

-        xf86CrtcDamageShadow (crtc);

-

-    /* All done */

-    return TRUE;

-}

+/*
+ * Copyright © 2006 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#else
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#endif
+
+#include <stddef.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "xf86.h"
+#include "xf86DDC.h"
+#include "fb.h"
+#include "windowstr.h"
+#include "xf86Crtc.h"
+#include "xf86Modes.h"
+#include "xf86RandR12.h"
+#include "X11/extensions/render.h"
+#include "X11/extensions/dpmsconst.h"
+#include "X11/Xatom.h"
+
+/* borrowed from composite extension, move to Render and publish? */
+
+static VisualPtr
+compGetWindowVisual (WindowPtr pWin)
+{
+    ScreenPtr	    pScreen = pWin->drawable.pScreen;
+    VisualID	    vid = wVisual (pWin);
+    int		    i;
+
+    for (i = 0; i < pScreen->numVisuals; i++)
+	if (pScreen->visuals[i].vid == vid)
+	    return &pScreen->visuals[i];
+    return 0;
+}
+
+static PictFormatPtr
+compWindowFormat (WindowPtr pWin)
+{
+    ScreenPtr	pScreen = pWin->drawable.pScreen;
+    
+    return PictureMatchVisual (pScreen, pWin->drawable.depth,
+			       compGetWindowVisual (pWin));
+}
+
+#define F(x)	IntToxFixed(x)
+
+#define toF(x)	((float) (x) / 65536.0f)
+
+static void
+xf86RotateCrtcRedisplay (xf86CrtcPtr crtc, RegionPtr region)
+{
+    ScrnInfoPtr		scrn = crtc->scrn;
+    ScreenPtr		screen = scrn->pScreen;
+    WindowPtr		root = screen->root;
+    PixmapPtr		dst_pixmap = crtc->rotatedPixmap;
+    PictFormatPtr	format = compWindowFormat (screen->root);
+    int			error;
+    PicturePtr		src, dst;
+    int			n = RegionNumRects(region);
+    BoxPtr		b = RegionRects(region);
+    XID			include_inferiors = IncludeInferiors;
+    
+    src = CreatePicture (None,
+			 &root->drawable,
+			 format,
+			 CPSubwindowMode,
+			 &include_inferiors,
+			 serverClient,
+			 &error);
+    if (!src)
+	return;
+
+    dst = CreatePicture (None,
+			 &dst_pixmap->drawable,
+			 format,
+			 0L,
+			 NULL,
+			 serverClient,
+			 &error);
+    if (!dst)
+	return;
+
+    error = SetPictureTransform (src, &crtc->crtc_to_framebuffer);
+    if (error)
+	return;
+    if (crtc->transform_in_use && crtc->filter)
+	SetPicturePictFilter (src, crtc->filter,
+			      crtc->params, crtc->nparams);
+
+    if (crtc->shadowClear)
+    {
+	CompositePicture (PictOpSrc,
+			  src, NULL, dst,
+			  0, 0, 0, 0, 0, 0,
+			  crtc->mode.HDisplay, crtc->mode.VDisplay);
+	crtc->shadowClear = FALSE;
+    }
+    else
+    {
+	while (n--)
+	{
+	    BoxRec	dst_box;
+
+	    dst_box = *b;
+	    dst_box.x1 -= crtc->filter_width >> 1;
+	    dst_box.x2 += crtc->filter_width >> 1;
+	    dst_box.y1 -= crtc->filter_height >> 1;
+	    dst_box.y2 += crtc->filter_height >> 1;
+	    pixman_f_transform_bounds (&crtc->f_framebuffer_to_crtc, &dst_box);
+	    CompositePicture (PictOpSrc,
+			      src, NULL, dst,
+			      dst_box.x1, dst_box.y1, 0, 0, dst_box.x1, dst_box.y1,
+			      dst_box.x2 - dst_box.x1,
+			      dst_box.y2 - dst_box.y1);
+	    b++;
+	}
+    }
+    FreePicture (src, None);
+    FreePicture (dst, None);
+}
+
+static void
+xf86CrtcDamageShadow (xf86CrtcPtr crtc)
+{
+    ScrnInfoPtr	pScrn = crtc->scrn;
+    BoxRec	damage_box;
+    RegionRec   damage_region;
+    ScreenPtr	pScreen = pScrn->pScreen;
+
+    damage_box.x1 = 0;
+    damage_box.x2 = crtc->mode.HDisplay;
+    damage_box.y1 = 0;
+    damage_box.y2 = crtc->mode.VDisplay;
+    if (!pixman_transform_bounds (&crtc->crtc_to_framebuffer, &damage_box))
+    {
+	damage_box.x1 = 0;
+	damage_box.y1 = 0;
+	damage_box.x2 = pScreen->width;
+	damage_box.y2 = pScreen->height;
+    }
+    if (damage_box.x1 < 0) damage_box.x1 = 0;
+    if (damage_box.y1 < 0) damage_box.y1 = 0;
+    if (damage_box.x2 > pScreen->width) damage_box.x2 = pScreen->width;
+    if (damage_box.y2 > pScreen->height) damage_box.y2 = pScreen->height;
+    RegionInit(&damage_region, &damage_box, 1);
+    DamageDamageRegion (&(*pScreen->GetScreenPixmap)(pScreen)->drawable,
+			&damage_region);
+    RegionUninit(&damage_region);
+    crtc->shadowClear = TRUE;
+}
+
+static void
+xf86RotatePrepare (ScreenPtr pScreen)
+{
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int			c;
+
+    for (c = 0; c < xf86_config->num_crtc; c++)
+    {
+	xf86CrtcPtr crtc = xf86_config->crtc[c];
+	
+	if (crtc->rotatedData && !crtc->rotatedPixmap)
+	{
+	    crtc->rotatedPixmap = crtc->funcs->shadow_create (crtc,
+							     crtc->rotatedData,
+							     crtc->mode.HDisplay,
+							     crtc->mode.VDisplay);
+	    if (!xf86_config->rotation_damage_registered)
+	    {
+		/* Hook damage to screen pixmap */
+		DamageRegister (&(*pScreen->GetScreenPixmap)(pScreen)->drawable,
+				xf86_config->rotation_damage);
+		xf86_config->rotation_damage_registered = TRUE;
+		EnableLimitedSchedulingLatency();
+	    }
+	    
+	    xf86CrtcDamageShadow (crtc);
+	}
+    }
+}
+
+static Bool
+xf86RotateRedisplay(ScreenPtr pScreen)
+{
+    ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    DamagePtr		damage = xf86_config->rotation_damage;
+    RegionPtr		region;
+
+    if (!damage)
+	return FALSE;
+    xf86RotatePrepare (pScreen);
+    region = DamageRegion(damage);
+    if (RegionNotEmpty(region))
+    {
+	int			c;
+	SourceValidateProcPtr	SourceValidate;
+
+	/*
+	 * SourceValidate is used by the software cursor code
+	 * to pull the cursor off of the screen when reading
+	 * bits from the frame buffer. Bypassing this function
+	 * leaves the software cursor in place
+	 */
+	SourceValidate = pScreen->SourceValidate;
+	pScreen->SourceValidate = NULL;
+
+	for (c = 0; c < xf86_config->num_crtc; c++)
+	{
+	    xf86CrtcPtr	    crtc = xf86_config->crtc[c];
+
+	    if (crtc->transform_in_use && crtc->enabled)
+	    {
+		RegionRec   crtc_damage;
+
+		/* compute portion of damage that overlaps crtc */
+		RegionInit(&crtc_damage, &crtc->bounds, 1);
+		RegionIntersect(&crtc_damage, &crtc_damage, region);
+		
+		/* update damaged region */
+		if (RegionNotEmpty(&crtc_damage))
+    		    xf86RotateCrtcRedisplay (crtc, &crtc_damage);
+		
+		RegionUninit(&crtc_damage);
+	    }
+	}
+	pScreen->SourceValidate = SourceValidate;
+	DamageEmpty(damage);
+    }
+    return TRUE;
+}
+
+static void
+xf86RotateBlockHandler(int screenNum, pointer blockData,
+		       pointer pTimeout, pointer pReadmask)
+{
+    ScreenPtr		pScreen = screenInfo.screens[screenNum];
+    ScrnInfoPtr		pScrn = xf86Screens[screenNum];
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    Bool		rotation_active;
+
+    rotation_active = xf86RotateRedisplay(pScreen);
+    pScreen->BlockHandler = xf86_config->BlockHandler;
+    (*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
+    /* cannot avoid re-wrapping until all wrapping is audited */
+    xf86_config->BlockHandler = pScreen->BlockHandler;
+    pScreen->BlockHandler = xf86RotateBlockHandler;
+}
+
+void
+xf86RotateDestroy (xf86CrtcPtr crtc)
+{
+    ScrnInfoPtr		pScrn = crtc->scrn;
+    ScreenPtr		pScreen = pScrn->pScreen;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int			c;
+    
+    /* Free memory from rotation */
+    if (crtc->rotatedPixmap || crtc->rotatedData)
+    {
+	crtc->funcs->shadow_destroy (crtc, crtc->rotatedPixmap, crtc->rotatedData);
+	crtc->rotatedPixmap = NULL;
+	crtc->rotatedData = NULL;
+    }
+
+    for (c = 0; c < xf86_config->num_crtc; c++)
+	if (xf86_config->crtc[c]->transform_in_use)
+	    return;
+
+    /*
+     * Clean up damage structures when no crtcs are rotated
+     */
+    if (xf86_config->rotation_damage)
+    {
+	/* Free damage structure */
+	if (xf86_config->rotation_damage_registered)
+	{
+	    DamageUnregister (&(*pScreen->GetScreenPixmap)(pScreen)->drawable,
+			      xf86_config->rotation_damage);
+	    xf86_config->rotation_damage_registered = FALSE;
+	    DisableLimitedSchedulingLatency();
+	}
+	DamageDestroy (xf86_config->rotation_damage);
+	xf86_config->rotation_damage = NULL;
+    }
+}
+
+void
+xf86RotateFreeShadow(ScrnInfoPtr pScrn)
+{
+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+    int c;
+
+   for (c = 0; c < config->num_crtc; c++) {
+       xf86CrtcPtr crtc = config->crtc[c];
+
+       if (crtc->rotatedPixmap || crtc->rotatedData) {
+	   crtc->funcs->shadow_destroy(crtc, crtc->rotatedPixmap,
+				crtc->rotatedData);
+	   crtc->rotatedPixmap = NULL;
+	   crtc->rotatedData = NULL;
+       }
+   }
+}
+
+void
+xf86RotateCloseScreen (ScreenPtr screen)
+{
+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    int			c;
+
+    for (c = 0; c < xf86_config->num_crtc; c++)
+	xf86RotateDestroy (xf86_config->crtc[c]);
+}
+
+static Bool
+xf86CrtcFitsScreen (xf86CrtcPtr crtc, struct pict_f_transform *crtc_to_fb)
+{
+    ScrnInfoPtr		pScrn = crtc->scrn;
+    BoxRec		b;
+
+    /* When called before PreInit, the driver is
+     * presumably doing load detect
+     */
+    if (pScrn->virtualX == 0 || pScrn->virtualY == 0)
+	return TRUE;
+
+    b.x1 = 0;
+    b.y1 = 0;
+    b.x2 = crtc->mode.HDisplay;
+    b.y2 = crtc->mode.VDisplay;
+    if (crtc_to_fb)
+	pixman_f_transform_bounds (crtc_to_fb, &b);
+    else {
+	b.x1 += crtc->x;
+	b.y1 += crtc->y;
+	b.x2 += crtc->x;
+	b.y2 += crtc->y;
+    }
+
+    return (0 <= b.x1 && b.x2 <= pScrn->virtualX &&
+	    0 <= b.y1 && b.y2 <= pScrn->virtualY);
+}
+
+Bool
+xf86CrtcRotate (xf86CrtcPtr crtc)
+{
+    ScrnInfoPtr		pScrn = crtc->scrn;
+    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
+    /* if this is called during ScreenInit() we don't have pScrn->pScreen yet */
+    ScreenPtr		pScreen = screenInfo.screens[pScrn->scrnIndex];
+    PictTransform	crtc_to_fb;
+    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc;
+    xFixed		*new_params = NULL;
+    int			new_nparams = 0;
+    PictFilterPtr	new_filter = NULL;
+    int			new_width = 0;
+    int			new_height = 0;
+    RRTransformPtr	transform = NULL;
+    Bool		damage = FALSE;
+
+    if (crtc->transformPresent)
+	transform = &crtc->transform;
+
+    if (!RRTransformCompute (crtc->x, crtc->y,
+			     crtc->mode.HDisplay, crtc->mode.VDisplay,
+			     crtc->rotation,
+			     transform,
+
+			     &crtc_to_fb,
+			     &f_crtc_to_fb,
+			     &f_fb_to_crtc) &&
+	xf86CrtcFitsScreen (crtc, &f_crtc_to_fb))
+    {
+	/*
+	 * If the untranslated transformation is the identity,
+	 * disable the shadow buffer
+	 */
+	xf86RotateDestroy (crtc);
+	crtc->transform_in_use = FALSE;
+	free(new_params);
+	new_params = NULL;
+	new_nparams = 0;
+	new_filter = NULL;
+	new_width = 0;
+	new_height = 0;
+    }
+    else
+    {
+	/*
+	 * these are the size of the shadow pixmap, which
+	 * matches the mode, not the pre-rotated copy in the
+	 * frame buffer
+	 */
+	int	    width = crtc->mode.HDisplay;
+	int	    height = crtc->mode.VDisplay;
+	void	    *shadowData = crtc->rotatedData;
+	PixmapPtr   shadow = crtc->rotatedPixmap;
+	int	    old_width = shadow ? shadow->drawable.width : 0;
+	int	    old_height = shadow ? shadow->drawable.height : 0;
+
+	/* Allocate memory for rotation */
+	if (old_width != width || old_height != height)
+	{
+	    if (shadow || shadowData)
+	    {
+		crtc->funcs->shadow_destroy (crtc, shadow, shadowData);
+		crtc->rotatedPixmap = NULL;
+		crtc->rotatedData = NULL;
+	    }
+	    shadowData = crtc->funcs->shadow_allocate (crtc, width, height);
+	    if (!shadowData)
+		goto bail1;
+	    crtc->rotatedData = shadowData;
+	    /* shadow will be damaged in xf86RotatePrepare */
+	}
+	else
+	{
+	    /* mark shadowed area as damaged so it will be repainted */
+	    damage = TRUE;
+	}
+
+	if (!xf86_config->rotation_damage)
+	{
+	    /* Create damage structure */
+	    xf86_config->rotation_damage = DamageCreate (NULL, NULL,
+						DamageReportNone,
+						TRUE, pScreen, pScreen);
+	    if (!xf86_config->rotation_damage)
+		goto bail2;
+	    
+	    /* Wrap block handler */
+	    if (!xf86_config->BlockHandler) {
+		xf86_config->BlockHandler = pScreen->BlockHandler;
+		pScreen->BlockHandler = xf86RotateBlockHandler;
+	    }
+	}
+#ifdef RANDR_12_INTERFACE
+	if (transform)
+	{
+	    if (transform->nparams) {
+		new_params = malloc(transform->nparams * sizeof (xFixed));
+		if (new_params) {
+		    memcpy (new_params, transform->params,
+			    transform->nparams * sizeof (xFixed));
+		    new_nparams = transform->nparams;
+		    new_filter = transform->filter;
+		}
+	    } else
+		new_filter = transform->filter;
+	    if (new_filter)
+	    {
+		new_width = new_filter->width;
+		new_height = new_filter->height;
+	    }
+	}
+#endif
+
+	if (0)
+	{
+    bail2:
+	    if (shadow || shadowData)
+	    {
+		crtc->funcs->shadow_destroy (crtc, shadow, shadowData);
+		crtc->rotatedPixmap = NULL;
+		crtc->rotatedData = NULL;
+	    }
+    bail1:
+	    if (old_width && old_height)
+		crtc->rotatedPixmap = crtc->funcs->shadow_create (crtc,
+								  NULL,
+								  old_width,
+								  old_height);
+	    return FALSE;
+	}
+	crtc->transform_in_use = TRUE;
+    }
+    crtc->crtc_to_framebuffer = crtc_to_fb;
+    crtc->f_crtc_to_framebuffer = f_crtc_to_fb;
+    crtc->f_framebuffer_to_crtc = f_fb_to_crtc;
+    free(crtc->params);
+    crtc->params = new_params;
+    crtc->nparams = new_nparams;
+    crtc->filter = new_filter;
+    crtc->filter_width = new_width;
+    crtc->filter_height = new_height;
+    crtc->bounds.x1 = 0;
+    crtc->bounds.x2 = crtc->mode.HDisplay;
+    crtc->bounds.y1 = 0;
+    crtc->bounds.y2 = crtc->mode.VDisplay;
+    pixman_f_transform_bounds (&f_crtc_to_fb, &crtc->bounds);
+
+    if (damage)
+        xf86CrtcDamageShadow (crtc);
+
+    /* All done */
+    return TRUE;
+}
diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c
index 62618afd8..123eb17d1 100644
--- a/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c
@@ -1,760 +1,756 @@
-/*

- * Copyright 1992 by Rich Murphey <Rich@Rice.edu>

- * Copyright 1993 by David Wexelblat <dwex@goblin.org>

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that

- * copyright notice and this permission notice appear in supporting

- * documentation, and that the names of Rich Murphey and David Wexelblat 

- * not be used in advertising or publicity pertaining to distribution of 

- * the software without specific, written prior permission.  Rich Murphey and

- * David Wexelblat make no representations about the suitability of this 

- * software for any purpose.  It is provided "as is" without express or 

- * implied warranty.

- *

- * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO 

- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND 

- * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR 

- * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER 

- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF 

- * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 

- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

- *

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-

-#include "compiler.h"

-

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86_OSlib.h"

-

-#include <sys/utsname.h>

-#include <sys/ioctl.h>

-#include <stdlib.h>

-#include <errno.h>

-

-static Bool KeepTty = FALSE;

-static int devConsoleFd = -1;

-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

-static int VTnum = -1;

-static int initialVT = -1;

-static Bool ShareVTs = FALSE;

-#endif

-

-#ifdef PCCONS_SUPPORT

-/* Stock 0.1 386bsd pccons console driver interface */

-#ifndef __OpenBSD__

-#  define PCCONS_CONSOLE_DEV1 "/dev/ttyv0"

-#else

-#  define PCCONS_CONSOLE_DEV1 "/dev/ttyC0"

-#endif

-#define PCCONS_CONSOLE_DEV2 "/dev/vga"

-#define PCCONS_CONSOLE_MODE O_RDWR|O_NDELAY

-#endif

-

-#ifdef SYSCONS_SUPPORT

-/* The FreeBSD 1.1 version syscons driver uses /dev/ttyv0 */

-#define SYSCONS_CONSOLE_DEV1 "/dev/ttyv0"

-#define SYSCONS_CONSOLE_DEV2 "/dev/vga"

-#define SYSCONS_CONSOLE_MODE O_RDWR|O_NDELAY

-#endif

-

-#ifdef PCVT_SUPPORT

-/* Hellmuth Michaelis' pcvt driver */

-#ifndef __OpenBSD__

-#  define PCVT_CONSOLE_DEV "/dev/ttyv0"

-#else

-#  define PCVT_CONSOLE_DEV "/dev/ttyC0"

-#endif

-#define PCVT_CONSOLE_MODE O_RDWR|O_NDELAY

-#endif

-

-#if defined(WSCONS_SUPPORT) && defined(__NetBSD__)

-/* NetBSD's new console driver */

-#define WSCONS_PCVT_COMPAT_CONSOLE_DEV "/dev/ttyE0"

-#endif

-

-#ifdef __GLIBC__

-#define setpgrp setpgid

-#endif

-

-#define CHECK_DRIVER_MSG \

-  "Check your kernel's console driver configuration and /dev entries"

-

-static char *supported_drivers[] = {

-#ifdef PCCONS_SUPPORT

-	"pccons (with X support)",

-#endif

-#ifdef SYSCONS_SUPPORT

-	"syscons",

-#endif

-#ifdef PCVT_SUPPORT

-	"pcvt",

-#endif

-#ifdef WSCONS_SUPPORT

-	"wscons",

-#endif

-};

-

-

-/*

- * Functions to probe for the existance of a supported console driver.

- * Any function returns either a valid file descriptor (driver probed

- * succesfully), -1 (driver not found), or uses FatalError() if the

- * driver was found but proved to not support the required mode to run

- * an X server.

- */

-

-typedef int (*xf86ConsOpen_t)(void);

-

-#ifdef PCCONS_SUPPORT

-static int xf86OpenPccons(void);

-#endif /* PCCONS_SUPPORT */

-

-#ifdef SYSCONS_SUPPORT

-static int xf86OpenSyscons(void);

-#endif /* SYSCONS_SUPPORT */

-

-#ifdef PCVT_SUPPORT

-static int xf86OpenPcvt(void);

-#endif /* PCVT_SUPPORT */

-

-#ifdef WSCONS_SUPPORT

-static int xf86OpenWScons(void);

-#endif

-

-/*

- * The sequence of the driver probes is important; start with the

- * driver that is best distinguishable, and end with the most generic

- * driver.  (Otherwise, pcvt would also probe as syscons, and either

- * pcvt or syscons might succesfully probe as pccons.)

- */

-static xf86ConsOpen_t xf86ConsTab[] = {

-#ifdef PCVT_SUPPORT

-    xf86OpenPcvt,

-#endif

-#ifdef SYSCONS_SUPPORT

-    xf86OpenSyscons,

-#endif

-#ifdef PCCONS_SUPPORT

-    xf86OpenPccons,

-#endif

-#ifdef WSCONS_SUPPORT

-    xf86OpenWScons,

-#endif

-    (xf86ConsOpen_t)NULL

-};

-

-

-void

-xf86OpenConsole()

-{

-    int i, fd = -1;

-    xf86ConsOpen_t *driver;

-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

-    int result;

-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)

-    struct utsname uts;

-#endif

-    vtmode_t vtmode;

-#endif

-    

-    if (serverGeneration == 1)

-    {

-	/* check if we are run with euid==0 */

-	if (geteuid() != 0)

-	{

-	    FatalError("xf86OpenConsole: Server must be suid root");

-	}

-

-	if (!KeepTty)

-	{

-	    /*

-	     * detaching the controlling tty solves problems of kbd character

-	     * loss.  This is not interesting for CO driver, because it is 

-	     * exclusive.

-	     */

-	    setpgrp(0, getpid());

-	    if ((i = open("/dev/tty",O_RDWR)) >= 0)

-	    {

-		ioctl(i,TIOCNOTTY,(char *)0);

-		close(i);

-	    }

-	}

-

-	/* detect which driver we are running on */

-	for (driver = xf86ConsTab; *driver; driver++)

-	{

-	    if ((fd = (*driver)()) >= 0)

-		break;

-	}

-

-	/* Check that a supported console driver was found */

-	if (fd < 0)

-	{

-	    char cons_drivers[80] = {0, };

-	    for (i = 0; i < sizeof(supported_drivers) / sizeof(char *); i++)

-	    {

-		if (i)

-		{

-		    strcat(cons_drivers, ", ");

-		}

-		strcat(cons_drivers, supported_drivers[i]);

-	    }

-	    FatalError(

-		"%s: No console driver found\n\tSupported drivers: %s\n\t%s",

-		"xf86OpenConsole", cons_drivers, CHECK_DRIVER_MSG);

-	}

-#if 0 /* stdin is already closed in OsInit() */

-	fclose(stdin);

-#endif

-	xf86Info.consoleFd = fd;

-	xf86Info.screenFd = fd;

-

-	switch (xf86Info.consType)

-	{

-#ifdef PCCONS_SUPPORT

-	case PCCONS:

-	    if (ioctl (xf86Info.consoleFd, CONSOLE_X_MODE_ON, 0) < 0)

-	    {

-		FatalError("%s: CONSOLE_X_MODE_ON failed (%s)\n%s",

-			   "xf86OpenConsole", strerror(errno),

-			   CHECK_DRIVER_MSG);

-	    }

-	    /*

-	     * Hack to prevent keyboard hanging when syslogd closes

-	     * /dev/console

-	     */

-	    if ((devConsoleFd = open("/dev/console", O_WRONLY,0)) < 0)

-	    {

-		xf86Msg(X_WARNING,

-			"xf86OpenConsole: couldn't open /dev/console (%s)\n",

-			strerror(errno));

-	    }

-	    break;

-#endif

-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

-	case SYSCONS:

-	    /* as of FreeBSD 2.2.8, syscons driver does not need the #1 vt

-	     * switching anymore. Here we check for FreeBSD 3.1 and up.

-	     * Add cases for other *BSD that behave the same.

-	    */

-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)

-	    uname (&uts);

-	    i = atof(uts.release) * 100;

-	    if (i >= 310) goto acquire_vt;

-#endif

-	    /* otherwise fall through */

-	case PCVT:

-#if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000))

-	    /*

-	     * First activate the #1 VT.  This is a hack to allow a server

-	     * to be started while another one is active.  There should be

-	     * a better way.

-	     */

-	    if (initialVT != 1) {

-

-		if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, 1) != 0)

-		{

-		    xf86Msg(X_WARNING,

-				"xf86OpenConsole: VT_ACTIVATE failed\n");

-		}

-		sleep(1);

-	    }

-#endif

-acquire_vt:

-	    if (!ShareVTs) {

-		    /*

-		     * now get the VT

-		     */

-		    SYSCALL(result =

-			    ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno));

-		    if (result != 0)

-		    {

-			xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");

-		    }

-		    SYSCALL(result =

-		    ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno));

-		    if (result != 0)

-		    {

-			xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed\n");

-		    }

-

-		    signal(SIGUSR1, xf86VTRequest);

-

-		    vtmode.mode = VT_PROCESS;

-		    vtmode.relsig = SIGUSR1;

-		    vtmode.acqsig = SIGUSR1;

-		    vtmode.frsig = SIGUSR1;

-		    if (ioctl(xf86Info.consoleFd, VT_SETMODE, &vtmode) < 0) 

-		    {

-			FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed");

-		    }

-	#if !defined(USE_DEV_IO) && !defined(USE_I386_IOPL)

-		    if (ioctl(xf86Info.consoleFd, KDENABIO, 0) < 0)

-		    {

-			FatalError("xf86OpenConsole: KDENABIO failed (%s)",

-				   strerror(errno));

-		    }

-	#endif

-		    if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0)

-		    {

-			FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed");

-		    }

-	    } else { /* ShareVTs */

-		    close(xf86Info.consoleFd);

-	    }	

-  	    break; 

-#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */

-#ifdef WSCONS_SUPPORT

-	case WSCONS:

-	    /* Nothing to do */

-   	    break; 

-#endif

-        }

-    }

-    else 

-    {

-	/* serverGeneration != 1 */

-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

-    	if (!ShareVTs) if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT)

-    	{

-	    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0)

-	    {

-	        xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");

-	    }

-        }

-#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */

-    }

-    return;

-}

-

-

-#ifdef PCCONS_SUPPORT

-

-static int

-xf86OpenPccons()

-{

-    int fd = -1;

-

-    if ((fd = open(PCCONS_CONSOLE_DEV1, PCCONS_CONSOLE_MODE, 0))

-	>= 0 ||

-	(fd = open(PCCONS_CONSOLE_DEV2, PCCONS_CONSOLE_MODE, 0))

-	>= 0)

-    {

-	if (ioctl(fd, CONSOLE_X_MODE_OFF, 0) < 0)

-	{

-	    FatalError(

-		"%s: CONSOLE_X_MODE_OFF failed (%s)\n%s\n%s",

-		"xf86OpenPccons",

-		strerror(errno),

-		"Was expecting pccons driver with X support",

-		CHECK_DRIVER_MSG);

-	}

-	xf86Info.consType = PCCONS;

-	xf86Msg(X_PROBED, "Using pccons driver with X support\n");

-    }

-    return fd;

-}

-

-#endif /* PCCONS_SUPPORT */

-

-#ifdef SYSCONS_SUPPORT

-

-static int

-xf86OpenSyscons()

-{

-    int fd = -1;

-    vtmode_t vtmode;

-    char vtname[12];

-    struct stat status;

-    long syscons_version;

-    MessageType from;

-

-    /* Check for syscons */

-    if ((fd = open(SYSCONS_CONSOLE_DEV1, SYSCONS_CONSOLE_MODE, 0)) >= 0

-	|| (fd = open(SYSCONS_CONSOLE_DEV2, SYSCONS_CONSOLE_MODE, 0)) >= 0)

-    {

-	if (ioctl(fd, VT_GETMODE, &vtmode) >= 0)

-	{

-	    /* Get syscons version */

-	    if (ioctl(fd, CONS_GETVERS, &syscons_version) < 0)

-	    {

-		syscons_version = 0;

-	    }

-

-	    xf86Info.vtno = VTnum;

-	    from = X_CMDLINE;

-

-#ifdef VT_GETACTIVE

-	    if (ioctl(fd, VT_GETACTIVE, &initialVT) < 0)

-		initialVT = -1;

-#endif

-            if (ShareVTs)

-		xf86Info.vtno = initialVT;

-

-	    if (xf86Info.vtno == -1)

-	    {

-		/*

-		 * For old syscons versions (<0x100), VT_OPENQRY returns

-		 * the current VT rather than the next free VT.  In this

-		 * case, the server gets started on the current VT instead

-		 * of the next free VT.

-		 */

-

-#if 0

-		/* check for the fixed VT_OPENQRY */

-		if (syscons_version >= 0x100)

-		{

-#endif

-		    if (ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0)

-		    {

-			/* No free VTs */

-			xf86Info.vtno = -1;

-		    }

-#if 0

-		}

-#endif

-

-		if (xf86Info.vtno == -1)

-		{

-		    /*

-		     * All VTs are in use.  If initialVT was found, use it.

-		     * Otherwise, if stdin is a VT, use that one.

-		     * XXX stdin is already closed, so this won't work.

-		     */

-		    if (initialVT != -1)

-		    {

-			xf86Info.vtno = initialVT;

-		    }

-		    else if ((fstat(0, &status) >= 0)

-			     && S_ISCHR(status.st_mode)

-			     && (ioctl(0, VT_GETMODE, &vtmode) >= 0))

-		    {

-			/* stdin is a VT */

-			xf86Info.vtno = minor(status.st_rdev) + 1;

-		    }

-		    else

-		    {

-			if (syscons_version >= 0x100)

-			{

-			    FatalError("%s: Cannot find a free VT",

-				       "xf86OpenSyscons");

-			}

-			/* Should no longer reach here */

-			FatalError("%s: %s %s\n\t%s %s",

-				   "xf86OpenSyscons",

-				   "syscons versions prior to 1.0 require",

-				   "either the",

-				   "server's stdin be a VT",

-				   "or the use of the vtxx server option");

-		    }

-		}

-		from = X_PROBED;

-	    }

-

-	    close(fd);

-#ifndef __OpenBSD__

-	    sprintf(vtname, "/dev/ttyv%01x", xf86Info.vtno - 1);

-#else 

-	    sprintf(vtname, "/dev/ttyC%01x", xf86Info.vtno - 1);

-#endif	    

-	    if ((fd = open(vtname, SYSCONS_CONSOLE_MODE, 0)) < 0)

-	    {

-		FatalError("xf86OpenSyscons: Cannot open %s (%s)",

-			   vtname, strerror(errno));

-	    }

-	    if (ioctl(fd, VT_GETMODE, &vtmode) < 0)

-	    {

-		FatalError("xf86OpenSyscons: VT_GETMODE failed");

-	    }

-	    xf86Info.consType = SYSCONS;

-	    xf86Msg(X_PROBED, "Using syscons driver with X support");

-	    if (syscons_version >= 0x100)

-	    {

-		xf86ErrorF(" (version %ld.%ld)\n", syscons_version >> 8,

-			   syscons_version & 0xFF);

-	    }

-	    else

-	    {

-		xf86ErrorF(" (version 0.x)\n");

-	    }

-	    xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);

-	}

-	else

-	{

-	    /* VT_GETMODE failed, probably not syscons */

-	    close(fd);

-	    fd = -1;

-	}

-    }

-    return fd;

-}

-

-#endif /* SYSCONS_SUPPORT */

-

-

-#ifdef PCVT_SUPPORT

-

-static int

-xf86OpenPcvt()

-{

-    /* This looks much like syscons, since pcvt is API compatible */

-    int fd = -1;

-    vtmode_t vtmode;

-    char vtname[12], *vtprefix;

-    struct stat status;

-    struct pcvtid pcvt_version;

-

-#ifndef __OpenBSD__

-    vtprefix = "/dev/ttyv";

-#else

-    vtprefix = "/dev/ttyC";

-#endif

-

-    fd = open(PCVT_CONSOLE_DEV, PCVT_CONSOLE_MODE, 0);

-#ifdef WSCONS_PCVT_COMPAT_CONSOLE_DEV

-    if (fd < 0)

-    {

-	fd = open(WSCONS_PCVT_COMPAT_CONSOLE_DEV, PCVT_CONSOLE_MODE, 0);

-	vtprefix = "/dev/ttyE";

-    }

-#endif

-    if (fd >= 0) 

-    {

-	if (ioctl(fd, VGAPCVTID, &pcvt_version) >= 0)

-	{

-	    if(ioctl(fd, VT_GETMODE, &vtmode) < 0)

-	    {

-		FatalError("%s: VT_GETMODE failed\n%s%s\n%s",

-			   "xf86OpenPcvt",

-			   "Found pcvt driver but X11 seems to be",

-			   " not supported.", CHECK_DRIVER_MSG);

-	    }

-

-	    xf86Info.vtno = VTnum;

-		

-	    if (ioctl(fd, VT_GETACTIVE, &initialVT) < 0)

-		initialVT = -1;

-

-	    if (xf86Info.vtno == -1)

-	    {

-		if (ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0)

-		{

-		    /* No free VTs */

-		    xf86Info.vtno = -1;

-		}

-

-		if (xf86Info.vtno == -1)

-		{

-		    /*

-		     * All VTs are in use.  If initialVT was found, use it.

-		     * Otherwise, if stdin is a VT, use that one.

-		     * XXX stdin is already closed, so this won't work.

-		     */

-		    if (initialVT != -1)

-		    {

-			xf86Info.vtno = initialVT;

-		    }

-		    else if ((fstat(0, &status) >= 0)

-			     && S_ISCHR(status.st_mode)

-			     && (ioctl(0, VT_GETMODE, &vtmode) >= 0))

-		    {

-			/* stdin is a VT */

-			xf86Info.vtno = minor(status.st_rdev) + 1;

-		    }

-		    else

-		    {

-			FatalError("%s: Cannot find a free VT",

-				   "xf86OpenPcvt");

-		    }

-		}

-	    }

-

-	    close(fd);

-            sprintf(vtname, "%s%01x", vtprefix, xf86Info.vtno - 1);

-	    if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0)

-	    {

-		ErrorF("xf86OpenPcvt: Cannot open %s (%s)",

-			   vtname, strerror(errno));

-		xf86Info.vtno = initialVT;

-	        sprintf(vtname, "%s%01x", vtprefix, xf86Info.vtno - 1);

-		if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0) {

-			FatalError("xf86OpenPcvt: Cannot open %s (%s)",

-			   	vtname, strerror(errno));

-		}

-	    }

-	    if (ioctl(fd, VT_GETMODE, &vtmode) < 0)

-	    {

-		FatalError("xf86OpenPcvt: VT_GETMODE failed");

-	    }

-	    xf86Info.consType = PCVT;

-#ifdef WSCONS_SUPPORT

-	    xf86Msg(X_PROBED,

-		    "Using wscons driver on %s in pcvt compatibility mode "

-		    "(version %d.%d)\n", vtname,

-		    pcvt_version.rmajor, pcvt_version.rminor);

-#else

-	    xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n",

-		    pcvt_version.rmajor, pcvt_version.rminor);

-#endif

-	}

-	else

-	{

-	    /* Not pcvt */

-	    close(fd);

-	    fd = -1;

-	}

-    }

-    return fd;

-}

-

-#endif /* PCVT_SUPPORT */

-

-#ifdef WSCONS_SUPPORT

-

-static int

-xf86OpenWScons()

-{

-    int fd = -1;

-    int mode = WSDISPLAYIO_MODE_MAPPED;

-    int i;

-    char ttyname[16];

-

-    /* XXX Is this ok? */

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

-#if defined(__NetBSD__)

-	sprintf(ttyname, "/dev/ttyE%d", i);

-#elif defined(__OpenBSD__)

-	sprintf(ttyname, "/dev/ttyC%x", i);

-#endif

-	if ((fd = open(ttyname, 2)) != -1)

-	    break;

-    }

-    if (fd != -1) {

-	if (ioctl(fd, WSDISPLAYIO_SMODE, &mode) < 0) {

-	    FatalError("%s: WSDISPLAYIO_MODE_MAPPED failed (%s)\n%s",

-		       "xf86OpenConsole", strerror(errno),

-		       CHECK_DRIVER_MSG);

-	}

-	xf86Info.consType = WSCONS;

-	xf86Msg(X_PROBED, "Using wscons driver\n");

-    }

-    return fd;

-}

-

-#endif /* WSCONS_SUPPORT */

-

-void

-xf86CloseConsole()

-{

-#if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT)

-    struct vt_mode   VT;

-#endif

-

-    if (ShareVTs) return;

-

-    switch (xf86Info.consType)

-    {

-#ifdef PCCONS_SUPPORT

-    case PCCONS:

-	ioctl (xf86Info.consoleFd, CONSOLE_X_MODE_OFF, 0);

-	break;

-#endif /* PCCONS_SUPPORT */

-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

-    case SYSCONS:

-    case PCVT:

-        ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);  /* Back to text mode */

-        if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1)

-        {

-	    VT.mode = VT_AUTO;

-	    ioctl(xf86Info.consoleFd, VT_SETMODE, &VT); /* dflt vt handling */

-        }

-#if !defined(OpenBSD) && !defined(USE_DEV_IO) && !defined(USE_I386_IOPL)

-        if (ioctl(xf86Info.consoleFd, KDDISABIO, 0) < 0)

-        {

-            xf86FatalError("xf86CloseConsole: KDDISABIO failed (%s)",

-	                   strerror(errno));

-        }

-#endif

-	if (initialVT != -1)

-		ioctl(xf86Info.consoleFd, VT_ACTIVATE, initialVT);

-        break;

-#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */

-#ifdef WSCONS_SUPPORT

-    case WSCONS:

-      {

-	int mode = WSDISPLAYIO_MODE_EMUL;

-	ioctl(xf86Info.screenFd, WSDISPLAYIO_SMODE, &mode);

-	break;

-      }

-#endif

-    }

-

-    if (xf86Info.screenFd != xf86Info.consoleFd)

-    {

-	close(xf86Info.screenFd);

-	close(xf86Info.consoleFd);

-	if ((xf86Info.consoleFd = open("/dev/console",O_RDONLY,0)) <0)

-	{

-	    xf86FatalError("xf86CloseConsole: Cannot open /dev/console (%s)",

-			   strerror(errno));

-	}

-    }

-    close(xf86Info.consoleFd);

-    if (devConsoleFd >= 0)

-	close(devConsoleFd);

-    return;

-}

-

-int

-xf86ProcessArgument(int argc, char *argv[], int i)

-{

-	/*

-	 * Keep server from detaching from controlling tty.  This is useful 

-	 * when debugging (so the server can receive keyboard signals.

-	 */

-	if (!strcmp(argv[i], "-keeptty"))

-	{

-		KeepTty = TRUE;

-		return 1;

-	}

-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

-	if (!strcmp(argv[i], "-sharevts"))

-	{	

-		ShareVTs = TRUE;

-		return 1;

-	}

-	if ((argv[i][0] == 'v') && (argv[i][1] == 't'))

-	{

-		if (sscanf(argv[i], "vt%2d", &VTnum) == 0 ||

-		    VTnum < 1 || VTnum > 12)

-		{

-			UseMsg();

-			VTnum = -1;

-			return 0;

-		}

-		return 1;

-	}

-#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */

-	return 0;

-}

-

-void

-xf86UseMsg()

-{

-#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)

-	ErrorF("vtXX                   use the specified VT number (1-12)\n");

-	ErrorF("-sharevts              share VTs with another X server\n");

-#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */

-	ErrorF("-keeptty               ");

-	ErrorF("don't detach controlling tty (for debugging only)\n");

-	return;

-}

+/*
+ * Copyright 1992 by Rich Murphey <Rich@Rice.edu>
+ * Copyright 1993 by David Wexelblat <dwex@goblin.org>
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the names of Rich Murphey and David Wexelblat 
+ * not be used in advertising or publicity pertaining to distribution of 
+ * the software without specific, written prior permission.  Rich Murphey and
+ * David Wexelblat make no representations about the suitability of this 
+ * software for any purpose.  It is provided "as is" without express or 
+ * implied warranty.
+ *
+ * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO 
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND 
+ * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR 
+ * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER 
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF 
+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+
+#include "compiler.h"
+
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86_OSlib.h"
+
+#include <sys/utsname.h>
+#include <sys/ioctl.h>
+#include <stdlib.h>
+#include <errno.h>
+
+static Bool KeepTty = FALSE;
+static int devConsoleFd = -1;
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+static int VTnum = -1;
+static int initialVT = -1;
+static Bool ShareVTs = FALSE;
+#endif
+
+#ifdef PCCONS_SUPPORT
+/* Stock 0.1 386bsd pccons console driver interface */
+#define PCCONS_CONSOLE_DEV1 "/dev/ttyv0"
+#define PCCONS_CONSOLE_DEV2 "/dev/vga"
+#define PCCONS_CONSOLE_MODE O_RDWR|O_NDELAY
+#endif
+
+#ifdef SYSCONS_SUPPORT
+/* The FreeBSD 1.1 version syscons driver uses /dev/ttyv0 */
+#define SYSCONS_CONSOLE_DEV1 "/dev/ttyv0"
+#define SYSCONS_CONSOLE_DEV2 "/dev/vga"
+#define SYSCONS_CONSOLE_MODE O_RDWR|O_NDELAY
+#endif
+
+#ifdef PCVT_SUPPORT
+/* Hellmuth Michaelis' pcvt driver */
+#ifndef __OpenBSD__
+#  define PCVT_CONSOLE_DEV "/dev/ttyv0"
+#else
+#  define PCVT_CONSOLE_DEV "/dev/ttyC0"
+#endif
+#define PCVT_CONSOLE_MODE O_RDWR|O_NDELAY
+#endif
+
+#if defined(WSCONS_SUPPORT) && defined(__NetBSD__)
+/* NetBSD's new console driver */
+#define WSCONS_PCVT_COMPAT_CONSOLE_DEV "/dev/ttyE0"
+#endif
+
+#ifdef __GLIBC__
+#define setpgrp setpgid
+#endif
+
+#define CHECK_DRIVER_MSG \
+  "Check your kernel's console driver configuration and /dev entries"
+
+static char *supported_drivers[] = {
+#ifdef PCCONS_SUPPORT
+	"pccons (with X support)",
+#endif
+#ifdef SYSCONS_SUPPORT
+	"syscons",
+#endif
+#ifdef PCVT_SUPPORT
+	"pcvt",
+#endif
+#ifdef WSCONS_SUPPORT
+	"wscons",
+#endif
+};
+
+
+/*
+ * Functions to probe for the existance of a supported console driver.
+ * Any function returns either a valid file descriptor (driver probed
+ * succesfully), -1 (driver not found), or uses FatalError() if the
+ * driver was found but proved to not support the required mode to run
+ * an X server.
+ */
+
+typedef int (*xf86ConsOpen_t)(void);
+
+#ifdef PCCONS_SUPPORT
+static int xf86OpenPccons(void);
+#endif /* PCCONS_SUPPORT */
+
+#ifdef SYSCONS_SUPPORT
+static int xf86OpenSyscons(void);
+#endif /* SYSCONS_SUPPORT */
+
+#ifdef PCVT_SUPPORT
+static int xf86OpenPcvt(void);
+#endif /* PCVT_SUPPORT */
+
+#ifdef WSCONS_SUPPORT
+static int xf86OpenWScons(void);
+#endif
+
+/*
+ * The sequence of the driver probes is important; start with the
+ * driver that is best distinguishable, and end with the most generic
+ * driver.  (Otherwise, pcvt would also probe as syscons, and either
+ * pcvt or syscons might succesfully probe as pccons.)
+ */
+static xf86ConsOpen_t xf86ConsTab[] = {
+#ifdef PCVT_SUPPORT
+    xf86OpenPcvt,
+#endif
+#ifdef SYSCONS_SUPPORT
+    xf86OpenSyscons,
+#endif
+#ifdef PCCONS_SUPPORT
+    xf86OpenPccons,
+#endif
+#ifdef WSCONS_SUPPORT
+    xf86OpenWScons,
+#endif
+    (xf86ConsOpen_t)NULL
+};
+
+
+void
+xf86OpenConsole()
+{
+    int i, fd = -1;
+    xf86ConsOpen_t *driver;
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+    int result;
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+    struct utsname uts;
+#endif
+    vtmode_t vtmode;
+#endif
+    
+    if (serverGeneration == 1)
+    {
+	/* check if we are run with euid==0 */
+	if (geteuid() != 0)
+	{
+	    FatalError("xf86OpenConsole: Server must be suid root");
+	}
+
+	if (!KeepTty)
+	{
+	    /*
+	     * detaching the controlling tty solves problems of kbd character
+	     * loss.  This is not interesting for CO driver, because it is 
+	     * exclusive.
+	     */
+	    setpgrp(0, getpid());
+	    if ((i = open("/dev/tty",O_RDWR)) >= 0)
+	    {
+		ioctl(i,TIOCNOTTY,(char *)0);
+		close(i);
+	    }
+	}
+
+	/* detect which driver we are running on */
+	for (driver = xf86ConsTab; *driver; driver++)
+	{
+	    if ((fd = (*driver)()) >= 0)
+		break;
+	}
+
+	/* Check that a supported console driver was found */
+	if (fd < 0)
+	{
+	    char cons_drivers[80] = {0, };
+	    for (i = 0; i < sizeof(supported_drivers) / sizeof(char *); i++)
+	    {
+		if (i)
+		{
+		    strcat(cons_drivers, ", ");
+		}
+		strcat(cons_drivers, supported_drivers[i]);
+	    }
+	    FatalError(
+		"%s: No console driver found\n\tSupported drivers: %s\n\t%s",
+		"xf86OpenConsole", cons_drivers, CHECK_DRIVER_MSG);
+	}
+#if 0 /* stdin is already closed in OsInit() */
+	fclose(stdin);
+#endif
+	xf86Info.consoleFd = fd;
+	xf86Info.screenFd = fd;
+
+	switch (xf86Info.consType)
+	{
+#ifdef PCCONS_SUPPORT
+	case PCCONS:
+	    if (ioctl (xf86Info.consoleFd, CONSOLE_X_MODE_ON, 0) < 0)
+	    {
+		FatalError("%s: CONSOLE_X_MODE_ON failed (%s)\n%s",
+			   "xf86OpenConsole", strerror(errno),
+			   CHECK_DRIVER_MSG);
+	    }
+	    /*
+	     * Hack to prevent keyboard hanging when syslogd closes
+	     * /dev/console
+	     */
+	    if ((devConsoleFd = open("/dev/console", O_WRONLY,0)) < 0)
+	    {
+		xf86Msg(X_WARNING,
+			"xf86OpenConsole: couldn't open /dev/console (%s)\n",
+			strerror(errno));
+	    }
+	    break;
+#endif
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+	case SYSCONS:
+	    /* as of FreeBSD 2.2.8, syscons driver does not need the #1 vt
+	     * switching anymore. Here we check for FreeBSD 3.1 and up.
+	     * Add cases for other *BSD that behave the same.
+	    */
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+	    uname (&uts);
+	    i = atof(uts.release) * 100;
+	    if (i >= 310) goto acquire_vt;
+#endif
+	    /* otherwise fall through */
+	case PCVT:
+#if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000))
+	    /*
+	     * First activate the #1 VT.  This is a hack to allow a server
+	     * to be started while another one is active.  There should be
+	     * a better way.
+	     */
+	    if (initialVT != 1) {
+
+		if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, 1) != 0)
+		{
+		    xf86Msg(X_WARNING,
+				"xf86OpenConsole: VT_ACTIVATE failed\n");
+		}
+		sleep(1);
+	    }
+#endif
+acquire_vt:
+	    if (!ShareVTs) {
+		    /*
+		     * now get the VT
+		     */
+		    SYSCALL(result =
+			    ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno));
+		    if (result != 0)
+		    {
+			xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
+		    }
+		    SYSCALL(result =
+		    ioctl(xf86Info.consoleFd, VT_WAITACTIVE, xf86Info.vtno));
+		    if (result != 0)
+		    {
+			xf86Msg(X_WARNING, "xf86OpenConsole: VT_WAITACTIVE failed\n");
+		    }
+
+		    signal(SIGUSR1, xf86VTRequest);
+
+		    vtmode.mode = VT_PROCESS;
+		    vtmode.relsig = SIGUSR1;
+		    vtmode.acqsig = SIGUSR1;
+		    vtmode.frsig = SIGUSR1;
+		    if (ioctl(xf86Info.consoleFd, VT_SETMODE, &vtmode) < 0) 
+		    {
+			FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed");
+		    }
+	#if !defined(USE_DEV_IO) && !defined(USE_I386_IOPL)
+		    if (ioctl(xf86Info.consoleFd, KDENABIO, 0) < 0)
+		    {
+			FatalError("xf86OpenConsole: KDENABIO failed (%s)",
+				   strerror(errno));
+		    }
+	#endif
+		    if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0)
+		    {
+			FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed");
+		    }
+	    } else { /* ShareVTs */
+		    close(xf86Info.consoleFd);
+	    }	
+  	    break; 
+#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
+#ifdef WSCONS_SUPPORT
+	case WSCONS:
+	    /* Nothing to do */
+   	    break; 
+#endif
+        }
+    }
+    else 
+    {
+	/* serverGeneration != 1 */
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+    	if (!ShareVTs) if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT)
+    	{
+	    if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, xf86Info.vtno) != 0)
+	    {
+	        xf86Msg(X_WARNING, "xf86OpenConsole: VT_ACTIVATE failed\n");
+	    }
+        }
+#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
+    }
+    return;
+}
+
+
+#ifdef PCCONS_SUPPORT
+
+static int
+xf86OpenPccons()
+{
+    int fd = -1;
+
+    if ((fd = open(PCCONS_CONSOLE_DEV1, PCCONS_CONSOLE_MODE, 0))
+	>= 0 ||
+	(fd = open(PCCONS_CONSOLE_DEV2, PCCONS_CONSOLE_MODE, 0))
+	>= 0)
+    {
+	if (ioctl(fd, CONSOLE_X_MODE_OFF, 0) < 0)
+	{
+	    FatalError(
+		"%s: CONSOLE_X_MODE_OFF failed (%s)\n%s\n%s",
+		"xf86OpenPccons",
+		strerror(errno),
+		"Was expecting pccons driver with X support",
+		CHECK_DRIVER_MSG);
+	}
+	xf86Info.consType = PCCONS;
+	xf86Msg(X_PROBED, "Using pccons driver with X support\n");
+    }
+    return fd;
+}
+
+#endif /* PCCONS_SUPPORT */
+
+#ifdef SYSCONS_SUPPORT
+
+static int
+xf86OpenSyscons()
+{
+    int fd = -1;
+    vtmode_t vtmode;
+    char vtname[12];
+    struct stat status;
+    long syscons_version;
+    MessageType from;
+
+    /* Check for syscons */
+    if ((fd = open(SYSCONS_CONSOLE_DEV1, SYSCONS_CONSOLE_MODE, 0)) >= 0
+	|| (fd = open(SYSCONS_CONSOLE_DEV2, SYSCONS_CONSOLE_MODE, 0)) >= 0)
+    {
+	if (ioctl(fd, VT_GETMODE, &vtmode) >= 0)
+	{
+	    /* Get syscons version */
+	    if (ioctl(fd, CONS_GETVERS, &syscons_version) < 0)
+	    {
+		syscons_version = 0;
+	    }
+
+	    xf86Info.vtno = VTnum;
+	    from = X_CMDLINE;
+
+#ifdef VT_GETACTIVE
+	    if (ioctl(fd, VT_GETACTIVE, &initialVT) < 0)
+		initialVT = -1;
+#endif
+            if (ShareVTs)
+		xf86Info.vtno = initialVT;
+
+	    if (xf86Info.vtno == -1)
+	    {
+		/*
+		 * For old syscons versions (<0x100), VT_OPENQRY returns
+		 * the current VT rather than the next free VT.  In this
+		 * case, the server gets started on the current VT instead
+		 * of the next free VT.
+		 */
+
+#if 0
+		/* check for the fixed VT_OPENQRY */
+		if (syscons_version >= 0x100)
+		{
+#endif
+		    if (ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0)
+		    {
+			/* No free VTs */
+			xf86Info.vtno = -1;
+		    }
+#if 0
+		}
+#endif
+
+		if (xf86Info.vtno == -1)
+		{
+		    /*
+		     * All VTs are in use.  If initialVT was found, use it.
+		     * Otherwise, if stdin is a VT, use that one.
+		     * XXX stdin is already closed, so this won't work.
+		     */
+		    if (initialVT != -1)
+		    {
+			xf86Info.vtno = initialVT;
+		    }
+		    else if ((fstat(0, &status) >= 0)
+			     && S_ISCHR(status.st_mode)
+			     && (ioctl(0, VT_GETMODE, &vtmode) >= 0))
+		    {
+			/* stdin is a VT */
+			xf86Info.vtno = minor(status.st_rdev) + 1;
+		    }
+		    else
+		    {
+			if (syscons_version >= 0x100)
+			{
+			    FatalError("%s: Cannot find a free VT",
+				       "xf86OpenSyscons");
+			}
+			/* Should no longer reach here */
+			FatalError("%s: %s %s\n\t%s %s",
+				   "xf86OpenSyscons",
+				   "syscons versions prior to 1.0 require",
+				   "either the",
+				   "server's stdin be a VT",
+				   "or the use of the vtxx server option");
+		    }
+		}
+		from = X_PROBED;
+	    }
+
+	    close(fd);
+#ifndef __OpenBSD__
+	    sprintf(vtname, "/dev/ttyv%01x", xf86Info.vtno - 1);
+#else 
+	    sprintf(vtname, "/dev/ttyC%01x", xf86Info.vtno - 1);
+#endif	    
+	    if ((fd = open(vtname, SYSCONS_CONSOLE_MODE, 0)) < 0)
+	    {
+		FatalError("xf86OpenSyscons: Cannot open %s (%s)",
+			   vtname, strerror(errno));
+	    }
+	    if (ioctl(fd, VT_GETMODE, &vtmode) < 0)
+	    {
+		FatalError("xf86OpenSyscons: VT_GETMODE failed");
+	    }
+	    xf86Info.consType = SYSCONS;
+	    xf86Msg(X_PROBED, "Using syscons driver with X support");
+	    if (syscons_version >= 0x100)
+	    {
+		xf86ErrorF(" (version %ld.%ld)\n", syscons_version >> 8,
+			   syscons_version & 0xFF);
+	    }
+	    else
+	    {
+		xf86ErrorF(" (version 0.x)\n");
+	    }
+	    xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
+	}
+	else
+	{
+	    /* VT_GETMODE failed, probably not syscons */
+	    close(fd);
+	    fd = -1;
+	}
+    }
+    return fd;
+}
+
+#endif /* SYSCONS_SUPPORT */
+
+
+#ifdef PCVT_SUPPORT
+
+static int
+xf86OpenPcvt()
+{
+    /* This looks much like syscons, since pcvt is API compatible */
+    int fd = -1;
+    vtmode_t vtmode;
+    char vtname[12], *vtprefix;
+    struct stat status;
+    struct pcvtid pcvt_version;
+
+#ifndef __OpenBSD__
+    vtprefix = "/dev/ttyv";
+#else
+    vtprefix = "/dev/ttyC";
+#endif
+
+    fd = open(PCVT_CONSOLE_DEV, PCVT_CONSOLE_MODE, 0);
+#ifdef WSCONS_PCVT_COMPAT_CONSOLE_DEV
+    if (fd < 0)
+    {
+	fd = open(WSCONS_PCVT_COMPAT_CONSOLE_DEV, PCVT_CONSOLE_MODE, 0);
+	vtprefix = "/dev/ttyE";
+    }
+#endif
+    if (fd >= 0) 
+    {
+	if (ioctl(fd, VGAPCVTID, &pcvt_version) >= 0)
+	{
+	    if(ioctl(fd, VT_GETMODE, &vtmode) < 0)
+	    {
+		FatalError("%s: VT_GETMODE failed\n%s%s\n%s",
+			   "xf86OpenPcvt",
+			   "Found pcvt driver but X11 seems to be",
+			   " not supported.", CHECK_DRIVER_MSG);
+	    }
+
+	    xf86Info.vtno = VTnum;
+		
+	    if (ioctl(fd, VT_GETACTIVE, &initialVT) < 0)
+		initialVT = -1;
+
+	    if (xf86Info.vtno == -1)
+	    {
+		if (ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0)
+		{
+		    /* No free VTs */
+		    xf86Info.vtno = -1;
+		}
+
+		if (xf86Info.vtno == -1)
+		{
+		    /*
+		     * All VTs are in use.  If initialVT was found, use it.
+		     * Otherwise, if stdin is a VT, use that one.
+		     * XXX stdin is already closed, so this won't work.
+		     */
+		    if (initialVT != -1)
+		    {
+			xf86Info.vtno = initialVT;
+		    }
+		    else if ((fstat(0, &status) >= 0)
+			     && S_ISCHR(status.st_mode)
+			     && (ioctl(0, VT_GETMODE, &vtmode) >= 0))
+		    {
+			/* stdin is a VT */
+			xf86Info.vtno = minor(status.st_rdev) + 1;
+		    }
+		    else
+		    {
+			FatalError("%s: Cannot find a free VT",
+				   "xf86OpenPcvt");
+		    }
+		}
+	    }
+
+	    close(fd);
+            sprintf(vtname, "%s%01x", vtprefix, xf86Info.vtno - 1);
+	    if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0)
+	    {
+		ErrorF("xf86OpenPcvt: Cannot open %s (%s)",
+			   vtname, strerror(errno));
+		xf86Info.vtno = initialVT;
+	        sprintf(vtname, "%s%01x", vtprefix, xf86Info.vtno - 1);
+		if ((fd = open(vtname, PCVT_CONSOLE_MODE, 0)) < 0) {
+			FatalError("xf86OpenPcvt: Cannot open %s (%s)",
+			   	vtname, strerror(errno));
+		}
+	    }
+	    if (ioctl(fd, VT_GETMODE, &vtmode) < 0)
+	    {
+		FatalError("xf86OpenPcvt: VT_GETMODE failed");
+	    }
+	    xf86Info.consType = PCVT;
+#ifdef WSCONS_SUPPORT
+	    xf86Msg(X_PROBED,
+		    "Using wscons driver on %s in pcvt compatibility mode "
+		    "(version %d.%d)\n", vtname,
+		    pcvt_version.rmajor, pcvt_version.rminor);
+#else
+	    xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n",
+		    pcvt_version.rmajor, pcvt_version.rminor);
+#endif
+	}
+	else
+	{
+	    /* Not pcvt */
+	    close(fd);
+	    fd = -1;
+	}
+    }
+    return fd;
+}
+
+#endif /* PCVT_SUPPORT */
+
+#ifdef WSCONS_SUPPORT
+
+static int
+xf86OpenWScons()
+{
+    int fd = -1;
+    int mode = WSDISPLAYIO_MODE_MAPPED;
+    int i;
+    char ttyname[16];
+
+    /* XXX Is this ok? */
+    for (i = 0; i < 8; i++) {
+#if defined(__NetBSD__)
+	sprintf(ttyname, "/dev/ttyE%d", i);
+#elif defined(__OpenBSD__)
+	sprintf(ttyname, "/dev/ttyC%x", i);
+#endif
+	if ((fd = open(ttyname, 2)) != -1)
+	    break;
+    }
+    if (fd != -1) {
+	if (ioctl(fd, WSDISPLAYIO_SMODE, &mode) < 0) {
+	    FatalError("%s: WSDISPLAYIO_MODE_MAPPED failed (%s)\n%s",
+		       "xf86OpenConsole", strerror(errno),
+		       CHECK_DRIVER_MSG);
+	}
+	xf86Info.consType = WSCONS;
+	xf86Msg(X_PROBED, "Using wscons driver\n");
+    }
+    return fd;
+}
+
+#endif /* WSCONS_SUPPORT */
+
+void
+xf86CloseConsole()
+{
+#if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT)
+    struct vt_mode   VT;
+#endif
+
+    if (ShareVTs) return;
+
+    switch (xf86Info.consType)
+    {
+#ifdef PCCONS_SUPPORT
+    case PCCONS:
+	ioctl (xf86Info.consoleFd, CONSOLE_X_MODE_OFF, 0);
+	break;
+#endif /* PCCONS_SUPPORT */
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+    case SYSCONS:
+    case PCVT:
+        ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT);  /* Back to text mode */
+        if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) != -1)
+        {
+	    VT.mode = VT_AUTO;
+	    ioctl(xf86Info.consoleFd, VT_SETMODE, &VT); /* dflt vt handling */
+        }
+#if !defined(OpenBSD) && !defined(USE_DEV_IO) && !defined(USE_I386_IOPL)
+        if (ioctl(xf86Info.consoleFd, KDDISABIO, 0) < 0)
+        {
+            xf86FatalError("xf86CloseConsole: KDDISABIO failed (%s)",
+	                   strerror(errno));
+        }
+#endif
+	if (initialVT != -1)
+		ioctl(xf86Info.consoleFd, VT_ACTIVATE, initialVT);
+        break;
+#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
+#ifdef WSCONS_SUPPORT
+    case WSCONS:
+      {
+	int mode = WSDISPLAYIO_MODE_EMUL;
+	ioctl(xf86Info.screenFd, WSDISPLAYIO_SMODE, &mode);
+	break;
+      }
+#endif
+    }
+
+    if (xf86Info.screenFd != xf86Info.consoleFd)
+    {
+	close(xf86Info.screenFd);
+	close(xf86Info.consoleFd);
+	if ((xf86Info.consoleFd = open("/dev/console",O_RDONLY,0)) <0)
+	{
+	    xf86FatalError("xf86CloseConsole: Cannot open /dev/console (%s)",
+			   strerror(errno));
+	}
+    }
+    close(xf86Info.consoleFd);
+    if (devConsoleFd >= 0)
+	close(devConsoleFd);
+    return;
+}
+
+int
+xf86ProcessArgument(int argc, char *argv[], int i)
+{
+	/*
+	 * Keep server from detaching from controlling tty.  This is useful 
+	 * when debugging (so the server can receive keyboard signals.
+	 */
+	if (!strcmp(argv[i], "-keeptty"))
+	{
+		KeepTty = TRUE;
+		return 1;
+	}
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+	if (!strcmp(argv[i], "-sharevts"))
+	{	
+		ShareVTs = TRUE;
+		return 1;
+	}
+	if ((argv[i][0] == 'v') && (argv[i][1] == 't'))
+	{
+		if (sscanf(argv[i], "vt%2d", &VTnum) == 0 ||
+		    VTnum < 1 || VTnum > 12)
+		{
+			UseMsg();
+			VTnum = -1;
+			return 0;
+		}
+		return 1;
+	}
+#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
+	return 0;
+}
+
+void
+xf86UseMsg()
+{
+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
+	ErrorF("vtXX                   use the specified VT number (1-12)\n");
+	ErrorF("-sharevts              share VTs with another X server\n");
+#endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */
+	ErrorF("-keeptty               ");
+	ErrorF("don't detach controlling tty (for debugging only)\n");
+	return;
+}
diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
index 3b646da70..147a201ee 100644
--- a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
+++ b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h
@@ -264,14 +264,6 @@
 #   define CONSOLE_X_MODE_OFF PCCONIOCCOOK
 #   define CONSOLE_X_BELL PCCONIOCBEEP
 #  else /* __bsdi__ */
-#   if defined(__OpenBSD__)
-#     ifdef PCCONS_SUPPORT
-#       include <machine/pccons.h>
-#       undef CONSOLE_X_MODE_ON
-#       undef CONSOLE_X_MODE_OFF
-#       undef CONSOLE_X_BELL
-#     endif
-#   endif
 #   ifdef SYSCONS_SUPPORT
 #    define COMPAT_SYSCONS
 #    if defined(__NetBSD__) || defined(__OpenBSD__)