Git update 24/2/2010"

18 files changed, 3278 insertions, 3268 deletions

diff --git a/xorg-server/hw/dmx/examples/xinput.c b/xorg-server/hw/dmx/examples/xinput.c
index 74353a93b..7421be337 100644
--- a/xorg-server/hw/dmx/examples/xinput.c
+++ b/xorg-server/hw/dmx/examples/xinput.c
@@ -233,7 +233,7 @@ int main(int argc, char **argv)
         int         total = 0;
 
 #define ADD(type)                                     \
-        if (cnt >= MAX_EVENTS) abort();               \
+        if (cnt >= MAX_EVENTS) OsAbort();             \
         names[cnt] = #type;                           \
         type(dev, event_type[cnt], event_list[cnt]);  \
         if (event_type[cnt]) ++cnt
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index 7675c1e86..1902ab885 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -335,7 +335,7 @@ AbortDDX(void)
     }
 
     if (kdCaughtSignal)
-        abort();
+        OsAbort();
 }
 
 void
diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c
index 2c206ff47..72241a776 100644
--- a/xorg-server/hw/xfree86/common/xf86Init.c
+++ b/xorg-server/hw/xfree86/common/xf86Init.c
@@ -1235,7 +1235,7 @@ ddxGiveUp(void)
 
     /* If an unexpected signal was caught, dump a core for debugging */
     if (xf86Info.caughtSignal)
-	abort();
+	OsAbort();
 }
 
 
diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index cfe808e3e..9b1ff280b 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -1,3198 +1,3199 @@
-/*

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

-#ifdef RENDER

-#include "picturestr.h"

-#endif

-

-#include "xf86xv.h"

-

-/*

- * 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 = xcalloc (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) {

-	xfree (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 = xrealloc (xf86_config->crtc,

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

-    else

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

-    if (!crtcs)

-    {

-	xfree (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;

-	}

-    if (crtc->params)

-	xfree (crtc->params);

-    free(crtc->gamma_red);

-    xfree (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)

-{

-#ifdef RENDER

-    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);

-#endif

-}

-

-/**

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

-    } 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;

-    }

-

-    if (adjusted_mode->name)

-	    xfree(adjusted_mode->name);

-    xfree(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)

-{

-    crtc->x = x;

-    crtc->y = y;

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

-	if (!xf86CrtcRotate (crtc))

-	    return;

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

-    }

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

-} 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 },

-    {-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;

-    static const char monitor_prefix[] = "monitor-";

-    char    *monitor;

-

-    if (!output->name)

-	return;

-

-    if (output->options)

-	xfree (output->options);

-

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

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

-    

-    option_name = xnfalloc (strlen (monitor_prefix) +

-			    strlen (output->name) + 1);

-    strcpy (option_name, monitor_prefix);

-    strcat (option_name, output->name);

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

-    if (!monitor)

-	monitor = output->name;

-    else

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

-    xfree (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)

-	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 = xcalloc (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))

-	{

-	    xfree (output);

-	    return FALSE;

-	}

-    }

-    

-    

-    if (xf86_config->output)

-	outputs = xrealloc (xf86_config->output,

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

-    else

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

-    if (!outputs)

-    {

-	xfree (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)

-{

-    int	    len = strlen(name) + 1;

-    char    *newname = xalloc (len);

-    

-    if (!newname)

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

-    

-    strcpy (newname, name);

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

-	xfree (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))

-	xfree (output->name);

-    xfree (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;

-    }

-    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 = xalloc (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));

-	}

-    }

-    xfree (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->x + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation);

-	    crtc_height = crtc->y + 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;

-	    xfree (n->name);

-	    xfree (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;

-}

-

-struct det_monrec_parameter {

-    MonRec *mon_rec;

-    int *max_clock;

-    Bool set_hsync;

-    Bool set_vrefresh;

-    enum { sync_config, sync_edid, sync_default } *sync_source;

-};

-

-static void handle_detailed_monrec(struct detailed_monitor_section *det_mon,

-                                   void *data)

-{

-    enum { sync_config, sync_edid, sync_default };

-    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 = TRUE;

-	Bool		    debug_modes = config->debug_modes ||

-					  xf86Initialising;

-	enum { sync_config, sync_edid, sync_default } 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)

-	{

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

-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++)

-	    enabled[o] = xf86OutputEnabled(config->output[o], FALSE);

-    }

-}

-

-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));

-    }

-

-    xfree(preferred);

-    xfree(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:

-    xfree(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;

-

-    /* 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));

-    

-    xf86CollectEnabledOutputs(scrn, config, enabled);

-

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

-    {

-	xfree (crtcs);

-	xfree (modes);

-	return FALSE;

-    }

-

-    /*

-     * Set initial panning of each output

-     */

-    xf86InitialPanning (scrn);

-	

-    /*

-     * Assign CRTCs to fit output configuration

-     */

-    if (!xf86PickCrtcs (scrn, crtcs, modes, 0, width, height))

-    {

-	xfree (crtcs);

-	xfree (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);

-    

-	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);

-    }

-

-    /* Mirror output modes to scrn mode list */

-    xf86SetScrnInfoModes (scrn);

-    

-    xfree (crtcs);

-    xfree (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 (config->output[config->compat_output]->crtc == crtc)

-	    output = config->output[config->compat_output];

-	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 = config->output[config->compat_output];

-    DisplayModePtr	compat_mode;

-    int			c;

-

-    /*

-     * Let the compat output drive the final mode selection

-     */

-    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);

-}

-

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

-    

-    if (output->MonInfo != NULL)

-	xfree(output->MonInfo);

-    

-    output->MonInfo = edid_mon;

-

-    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 == config->output[config->compat_output])

-        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) {

-	    REGION_INIT (pScreen, &crtc_region_local, &crtc_box, 1);

-	    crtc_region = &crtc_region_local;

-	    REGION_INTERSECT (pScreen, crtc_region, crtc_region, reg);

-	}

-	*crtc_ret = crtc;

-    }

-

-    ret = xf86XVClipVideoHelper(dst, xa, xb, ya, yb, 

-				crtc_region, width, height);

-

-    if (crtc_region != reg)

-	REGION_UNINIT (pScreen, &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"
+#ifdef RENDER
+#include "picturestr.h"
+#endif
+
+#include "xf86xv.h"
+
+/*
+ * 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 = xcalloc (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) {
+	xfree (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 = xrealloc (xf86_config->crtc,
+			  (xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr));
+    else
+	crtcs = xalloc ((xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr));
+    if (!crtcs)
+    {
+	xfree (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;
+	}
+    if (crtc->params)
+	xfree (crtc->params);
+    free(crtc->gamma_red);
+    xfree (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)
+{
+#ifdef RENDER
+    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);
+#endif
+}
+
+/**
+ * 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);
+    } 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;
+    }
+
+    if (adjusted_mode->name)
+	    xfree(adjusted_mode->name);
+    xfree(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)
+{
+    crtc->x = x;
+    crtc->y = y;
+    if (crtc->funcs->set_origin) {
+	if (!xf86CrtcRotate (crtc))
+	    return;
+	crtc->funcs->set_origin (crtc, x, y);
+    }
+    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,
+} 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 },
+    {-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;
+    static const char monitor_prefix[] = "monitor-";
+    char    *monitor;
+
+    if (!output->name)
+	return;
+
+    if (output->options)
+	xfree (output->options);
+
+    output->options = xnfalloc (sizeof (xf86OutputOptions));
+    memcpy (output->options, xf86OutputOptions, sizeof (xf86OutputOptions));
+    
+    option_name = xnfalloc (strlen (monitor_prefix) +
+			    strlen (output->name) + 1);
+    strcpy (option_name, monitor_prefix);
+    strcat (option_name, output->name);
+    monitor = xf86findOptionValue (output->scrn->options, option_name);
+    if (!monitor)
+	monitor = output->name;
+    else
+	xf86MarkOptionUsedByName (output->scrn->options, option_name);
+    xfree (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)
+	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 = xcalloc (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))
+	{
+	    xfree (output);
+	    return FALSE;
+	}
+    }
+    
+    
+    if (xf86_config->output)
+	outputs = xrealloc (xf86_config->output,
+			  (xf86_config->num_output + 1) * sizeof (xf86OutputPtr));
+    else
+	outputs = xalloc ((xf86_config->num_output + 1) * sizeof (xf86OutputPtr));
+    if (!outputs)
+    {
+	xfree (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)
+{
+    int	    len = strlen(name) + 1;
+    char    *newname = xalloc (len);
+    
+    if (!newname)
+	return FALSE;	/* so sorry... */
+    
+    strcpy (newname, name);
+    if (output->name && output->name != (char *) (output + 1))
+	xfree (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))
+	xfree (output->name);
+    xfree (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;
+    }
+    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 = xalloc (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));
+	}
+    }
+    xfree (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->x + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation);
+	    crtc_height = crtc->y + 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;
+	    xfree (n->name);
+	    xfree (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;
+}
+
+struct det_monrec_parameter {
+    MonRec *mon_rec;
+    int *max_clock;
+    Bool set_hsync;
+    Bool set_vrefresh;
+    enum { sync_config, sync_edid, sync_default } *sync_source;
+};
+
+static void handle_detailed_monrec(struct detailed_monitor_section *det_mon,
+                                   void *data)
+{
+    enum { sync_config, sync_edid, sync_default };
+    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 = TRUE;
+	Bool		    debug_modes = config->debug_modes ||
+					  xf86Initialising;
+	enum { sync_config, sync_edid, sync_default } 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 void
+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++)
+	    enabled[o] = xf86OutputEnabled(config->output[o], FALSE);
+    }
+}
+
+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));
+    }
+
+    xfree(preferred);
+    xfree(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:
+    xfree(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;
+
+    /* 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));
+    
+    xf86CollectEnabledOutputs(scrn, config, enabled);
+
+    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))
+    {
+	xfree (crtcs);
+	xfree (modes);
+	return FALSE;
+    }
+
+    /*
+     * Set initial panning of each output
+     */
+    xf86InitialPanning (scrn);
+	
+    /*
+     * Assign CRTCs to fit output configuration
+     */
+    if (!xf86PickCrtcs (scrn, crtcs, modes, 0, width, height))
+    {
+	xfree (crtcs);
+	xfree (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);
+    
+	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);
+    }
+
+    /* Mirror output modes to scrn mode list */
+    xf86SetScrnInfoModes (scrn);
+    
+    xfree (crtcs);
+    xfree (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 (config->output[config->compat_output]->crtc == crtc)
+	    output = config->output[config->compat_output];
+	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 = config->output[config->compat_output];
+    DisplayModePtr	compat_mode;
+    int			c;
+
+    /*
+     * Let the compat output drive the final mode selection
+     */
+    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);
+}
+
+#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
+    
+    if (output->MonInfo != NULL)
+	xfree(output->MonInfo);
+    
+    output->MonInfo = edid_mon;
+
+    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 == config->output[config->compat_output])
+        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) {
+	    REGION_INIT (pScreen, &crtc_region_local, &crtc_box, 1);
+	    crtc_region = &crtc_region_local;
+	    REGION_INTERSECT (pScreen, crtc_region, crtc_region, reg);
+	}
+	*crtc_ret = crtc;
+    }
+
+    ret = xf86XVClipVideoHelper(dst, xa, xb, ya, yb, 
+				crtc_region, width, height);
+
+    if (crtc_region != reg)
+	REGION_UNINIT (pScreen, &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/os-support/solaris/sun_bell.c b/xorg-server/hw/xfree86/os-support/solaris/sun_bell.c
index 7f146eaaf..05d17492a 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_bell.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_bell.c
@@ -126,14 +126,15 @@ xf86OSRingBell(int loudness, int pitch, int duration)
     iovcnt = 0;
 
     for (cnt = 0; cnt <= repeats; cnt++) {
-        iov[iovcnt].iov_base = (char *) samples;
-        iov[iovcnt++].iov_len = sizeof(samples);
         if (cnt == repeats) {
             /* Insert a bit of silence so that multiple beeps are distinct and
              * not compressed into a single tone.
              */
             iov[iovcnt].iov_base = (char *) silence;
             iov[iovcnt++].iov_len = sizeof(silence);
+        } else {
+            iov[iovcnt].iov_base = (char *) samples;
+            iov[iovcnt++].iov_len = sizeof(samples);
         }
         if ((iovcnt >= IOV_MAX) || (cnt == repeats)) {
             written = writev(audioFD, iov, iovcnt);
diff --git a/xorg-server/hw/xfree86/parser/scan.c b/xorg-server/hw/xfree86/parser/scan.c
index 03cbc8a44..cdca9ca1c 100644
--- a/xorg-server/hw/xfree86/parser/scan.c
+++ b/xorg-server/hw/xfree86/parser/scan.c
@@ -1207,21 +1207,21 @@ xf86getBoolValue(Bool *val, const char *str)
 	if (*str == '\0') {
 		*val = TRUE;
 	} else {
-		if (strcmp(str, "1") == 0)
+		if (xf86nameCompare(str, "1") == 0)
 			*val = TRUE;
-		else if (strcmp(str, "on") == 0)
+		else if (xf86nameCompare(str, "on") == 0)
 			*val = TRUE;
-		else if (strcmp(str, "true") == 0)
+		else if (xf86nameCompare(str, "true") == 0)
 			*val = TRUE;
-		else if (strcmp(str, "yes") == 0)
+		else if (xf86nameCompare(str, "yes") == 0)
 			*val = TRUE;
-		else if (strcmp(str, "0") == 0)
+		else if (xf86nameCompare(str, "0") == 0)
 			*val = FALSE;
-		else if (strcmp(str, "off") == 0)
+		else if (xf86nameCompare(str, "off") == 0)
 			*val = FALSE;
-		else if (strcmp(str, "false") == 0)
+		else if (xf86nameCompare(str, "false") == 0)
 			*val = FALSE;
-		else if (strcmp(str, "no") == 0)
+		else if (xf86nameCompare(str, "no") == 0)
 			*val = FALSE;
 		else
 			return FALSE;
diff --git a/xorg-server/hw/xfree86/x86emu/validate.c b/xorg-server/hw/xfree86/x86emu/validate.c
index 239f6c1f3..b8c4d12d1 100644
--- a/xorg-server/hw/xfree86/x86emu/validate.c
+++ b/xorg-server/hw/xfree86/x86emu/validate.c
@@ -673,7 +673,7 @@ int main(int argc)
     VAL_LONG_LONG_BINARY(cmp_long);
 
     VAL_BYTE_UNARY(daa_byte);
-    VAL_BYTE_UNARY(das_byte);   // Fails for 0x9A (out of range anyway)
+    VAL_BYTE_UNARY(das_byte);   /* Fails for 0x9A (out of range anyway) */
 
     VAL_BYTE_UNARY(dec_byte);
     VAL_WORD_UNARY(dec_word);
diff --git a/xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h b/xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
index 5530a3ada..4c850a1bd 100644
--- a/xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
+++ b/xorg-server/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
@@ -61,7 +61,7 @@ static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d)
                           : "cc");
 }
 
-#else // ! (__PIC__ && __i386__)
+#else /* ! (__PIC__ && __i386__) */
 
 #define x86EMU_HAS_HW_CPUID 1
 static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d)
@@ -73,7 +73,7 @@ static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d)
                           : "cc");
 }
 
-#endif // __PIC__ && __i386__
+#endif /* __PIC__ && __i386__ */
 
 
-#endif // __X86EMU_PRIM_X86_GCC_H
+#endif /* __X86EMU_PRIM_X86_GCC_H */
diff --git a/xorg-server/hw/xquartz/GL/capabilities.c b/xorg-server/hw/xquartz/GL/capabilities.c
index 43064044c..5f1f87013 100644
--- a/xorg-server/hw/xquartz/GL/capabilities.c
+++ b/xorg-server/hw/xquartz/GL/capabilities.c
@@ -522,7 +522,7 @@ bool getGlCapabilities(struct glCapabilities *cap) {
 	    conf = malloc(sizeof(*conf));
 	    if(NULL == conf) {
             perror("malloc");
-            abort();
+            OsAbort();
 	    }
 
 	    /* Copy the struct. */
diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c
index 176282532..44380ffa0 100644
--- a/xorg-server/hw/xquartz/GL/indirect.c
+++ b/xorg-server/hw/xquartz/GL/indirect.c
@@ -548,7 +548,7 @@ static CGLPixelFormatObj makeFormat(__GLXconfig *conf) {
        attr[i++] = conf->samples;
     }
      
-    attr[i++] = 0;
+    attr[i + 1] = 0;
 
     error = CGLChoosePixelFormat(attr, &fobj, &formats);
     if(error) {
diff --git a/xorg-server/hw/xquartz/GL/visualConfigs.c b/xorg-server/hw/xquartz/GL/visualConfigs.c
index f92677847..bef27f048 100644
--- a/xorg-server/hw/xquartz/GL/visualConfigs.c
+++ b/xorg-server/hw/xquartz/GL/visualConfigs.c
@@ -62,7 +62,7 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
     int numConfigs = 0;
     __GLXconfig *visualConfigs, *c;
     struct glCapabilities caps;
-    struct glCapabilitiesConfig *conf = NULL;
+    struct glCapabilitiesConfig *conf;
     int stereo, depth, aux, buffers, stencil, accum, color, msample;
     
     if(getGlCapabilities(&caps)) {
@@ -94,7 +94,6 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
      */
     
     assert(NULL != caps.configurations);
-    conf = caps.configurations;
     
     numConfigs = 0;
     
diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m
index f3c8a307a..3faa1cb84 100644
--- a/xorg-server/hw/xquartz/X11Application.m
+++ b/xorg-server/hw/xquartz/X11Application.m
@@ -482,7 +482,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
 	return out;
 }
 
-- (CFPropertyListRef) prefs_get:(NSString *)key {
+- (CFPropertyListRef) prefs_get_copy:(NSString *)key {
     CFPropertyListRef value;
 	
     value = CFPreferencesCopyAppValue ((CFStringRef) key, app_prefs_domain_cfstr);
@@ -543,7 +543,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
   CFPropertyListRef value;
   int ret;
   
-  value = [self prefs_get:key];
+  value = [self prefs_get_copy:key];
   
   if (value != NULL && CFGetTypeID (value) == CFNumberGetTypeID ())
     CFNumberGetValue (value, kCFNumberIntType, &ret);
@@ -561,7 +561,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
   CFPropertyListRef value;
   const char *ret = NULL;
   
-  value = [self prefs_get:key];
+  value = [self prefs_get_copy:key];
   
   if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
     NSString *s = (NSString *) value;
@@ -578,12 +578,13 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
     CFPropertyListRef value;
     NSURL *ret = NULL;
     
-    value = [self prefs_get:key];
+    value = [self prefs_get_copy:key];
     
     if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
         NSString *s = (NSString *) value;
 
         ret = [NSURL URLWithString:s];
+        [ret retain];
     }
     
     if (value != NULL) CFRelease (value);
@@ -595,7 +596,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
   CFPropertyListRef value;
   float ret = def;
   
-  value = [self prefs_get:key];
+  value = [self prefs_get_copy:key];
   
   if (value != NULL
       && CFGetTypeID (value) == CFNumberGetTypeID ()
@@ -613,7 +614,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
   CFPropertyListRef value;
   int ret = def;
   
-  value = [self prefs_get:key];
+  value = [self prefs_get_copy:key];
   
   if (value != NULL) {
     if (CFGetTypeID (value) == CFNumberGetTypeID ())
@@ -637,7 +638,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
   NSArray *ret = nil;
   CFPropertyListRef value;
   
-  value = [self prefs_get:key];
+  value = [self prefs_get_copy:key];
   
   if (value != NULL) {
     if (CFGetTypeID (value) == CFArrayGetTypeID ())
@@ -757,7 +758,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
     NSURL *url =  [self prefs_copy_url:@PREFS_UPDATE_FEED default:nil];
     if(url) {
         [[SUUpdater sharedUpdater] setFeedURL:url];
-        CFRelease(url);
+        [url release];
     }
 #endif
 }
@@ -970,6 +971,7 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
 //    [[SUUpdater sharedUpdater] checkForUpdates:X11App];
 #endif
 
+    [pool release];
     [NSApp run];
     /* not reached */
 }
diff --git a/xorg-server/hw/xquartz/darwinXinput.c b/xorg-server/hw/xquartz/darwinXinput.c
index 43aea6140..90e440e54 100644
--- a/xorg-server/hw/xquartz/darwinXinput.c
+++ b/xorg-server/hw/xquartz/darwinXinput.c
@@ -249,3 +249,9 @@ DeleteInputDeviceRequest(DeviceIntPtr dev)
 {
   DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev);
 }
+
+void
+CloseInput (void)
+{
+}
+
diff --git a/xorg-server/hw/xquartz/mach-startup/bundle-main.c b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
index 0366f3ba2..4872ff59b 100644
--- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c
+++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
@@ -641,30 +641,46 @@ static int execute(const char *command) {
 static char *command_from_prefs(const char *key, const char *default_value) {
     char *command = NULL;
     
-    CFStringRef cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);
-    CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
+    CFStringRef cfKey;
+    CFPropertyListRef PlistRef;
+
+    if(!key)
+        return NULL;
+
+    cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);
+
+    if(!cfKey)
+        return NULL;
+
+    PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
     
     if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
         CFStringRef cfDefaultValue = CFStringCreateWithCString(NULL, default_value, kCFStringEncodingASCII);
         int len = strlen(default_value) + 1;
 
+        if(!cfDefaultValue)
+            goto command_from_prefs_out;
+
         CFPreferencesSetAppValue(cfKey, cfDefaultValue, kCFPreferencesCurrentApplication);
         CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+        CFRelease(cfDefaultValue);
         
         command = (char *)malloc(len * sizeof(char));
         if(!command)
-            return NULL;
+            goto command_from_prefs_out;
         strcpy(command, default_value);
     } else {
         int len = CFStringGetLength((CFStringRef)PlistRef) + 1;
         command = (char *)malloc(len * sizeof(char));
         if(!command)
-            return NULL;
+            goto command_from_prefs_out;
         CFStringGetCString((CFStringRef)PlistRef, command, len,  kCFStringEncodingASCII);
-	}
-    
+    }
+
+command_from_prefs_out:
     if (PlistRef)
         CFRelease(PlistRef);
-    
+    if(cfKey)
+        CFRelease(cfKey);
     return command;
 }
diff --git a/xorg-server/hw/xquartz/mach-startup/stub.c b/xorg-server/hw/xquartz/mach-startup/stub.c
index 89f9e1058..ccf5ab426 100644
--- a/xorg-server/hw/xquartz/mach-startup/stub.c
+++ b/xorg-server/hw/xquartz/mach-startup/stub.c
@@ -73,7 +73,6 @@ static void set_x11_path(void) {
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
 
     CFURLRef appURL = NULL;
-    CFBundleRef bundle = NULL;
     OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
 
     switch (osstatus) {
@@ -84,12 +83,6 @@ static void set_x11_path(void) {
                 exit(1);
             }
 
-            bundle = CFBundleCreate(NULL, appURL);
-            if(!bundle) {
-                fprintf(stderr, "Xquartz: Null value returned from CFBundleCreate().\n");
-                exit(2);                
-            }
-
             if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {
                 fprintf(stderr, "Xquartz: Error resolving URL for %s\n", kX11AppBundleId);
                 exit(3);
diff --git a/xorg-server/hw/xquartz/pbproxy/x-selection.h b/xorg-server/hw/xquartz/pbproxy/x-selection.h
index fc903d0af..614c8b091 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-selection.h
+++ b/xorg-server/hw/xquartz/pbproxy/x-selection.h
@@ -58,15 +58,6 @@ struct atom_list {
     /* The unmapped window we use for fetching selections. */
     Window _selection_window;
 
-    /* Last time we declared anything on the pasteboard. */
-    int _my_last_change;
-
-    /* Name of the selection we're proxying onto the pasteboard. */
-    Atom _proxied_selection;
-
-    /* When true, we're expecting a SelectionNotify event. */
-    unsigned int _pending_notify :1;
- 
     Atom request_atom;
     
     struct {
diff --git a/xorg-server/hw/xquartz/quartzAudio.c b/xorg-server/hw/xquartz/quartzAudio.c
index af63d18f5..708202b5b 100644
--- a/xorg-server/hw/xquartz/quartzAudio.c
+++ b/xorg-server/hw/xquartz/quartzAudio.c
@@ -62,7 +62,6 @@ typedef struct QuartzAudioRec {
     UInt32 curFrame;
     UInt32 remainingFrames;
     UInt32 totalFrames;
-    UInt32 bytesPerFrame;
     double sampleRate;
     UInt32 fadeLength;
 
@@ -117,9 +116,9 @@ static void QuartzFillBuffer(
     unsigned int bufferFrameCount;
     float multiplier, v;
     int i;
-
+    
     buffer = (float *)audiobuffer->mData;
-    bufferFrameCount = audiobuffer->mDataByteSize / data->bytesPerFrame;
+    bufferFrameCount = audiobuffer->mDataByteSize / (sizeof(float) * audiobuffer->mNumberChannels);
 
     frameCount = min(bufferFrameCount, data->remainingFrames);
 
@@ -141,7 +140,7 @@ static void QuartzFillBuffer(
         data->prevFrame = 0;
 
         // adjust for space eaten by prev fade
-        buffer += audiobuffer->mNumberChannels*frame;
+        b += audiobuffer->mNumberChannels*frame;
         bufferFrameCount -= frame;
         frameCount = min(bufferFrameCount, data->remainingFrames);
     }
@@ -204,6 +203,8 @@ QuartzAudioIOProc(
     if (wasPlaying  &&  !data->playing) {
         OSStatus err;
         err = AudioDeviceStop(inDevice, QuartzAudioIOProc);
+        if(err != noErr)
+            fprintf(stderr, "Error stopping audio device: %ld\n", (long int)err);
     }
     pthread_mutex_unlock(&data->lock);
     return 0;
@@ -262,16 +263,17 @@ void QuartzAudioInit(void)
     UInt32 propertySize;
     OSStatus status;
     AudioDeviceID outputDevice;
-    AudioStreamBasicDescription outputStreamDescription;
     double sampleRate;
-
+    AudioObjectPropertyAddress devicePropertyAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+    AudioObjectPropertyAddress sampleRatePropertyAddress = { kAudioDevicePropertyNominalSampleRate, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
+    
     // Get the default output device
     propertySize = sizeof(outputDevice);
-    status = AudioHardwareGetProperty(
-                    kAudioHardwarePropertyDefaultOutputDevice, 
-                    &propertySize, &outputDevice);
+    status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &devicePropertyAddress,
+                                        0, NULL,
+                                        &propertySize, &outputDevice);
     if (status) {
-        ErrorF("QuartzAudioInit: AudioHardwareGetProperty returned %ld\n",
+        ErrorF("QuartzAudioInit: AudioObjectGetPropertyData(output device) returned %ld\n",
                (long)status);
         return;
     }
@@ -281,23 +283,22 @@ void QuartzAudioInit(void)
     }
 
     // Get the basic device description
-    propertySize = sizeof(outputStreamDescription);
-    status = AudioDeviceGetProperty(outputDevice, 0, FALSE, 
-                                    kAudioDevicePropertyStreamFormat, 
-                                    &propertySize, &outputStreamDescription);
+    sampleRate = 0.;
+    propertySize = sizeof(sampleRate);
+    status = AudioObjectGetPropertyData(outputDevice, &sampleRatePropertyAddress,
+                                        0, NULL,
+                                        &propertySize, &sampleRate);
     if (status) {
-        ErrorF("QuartzAudioInit: GetProperty(stream format) returned %ld\n",
+        ErrorF("QuartzAudioInit: AudioObjectGetPropertyData(sample rate) returned %ld\n",
                (long)status);
         return;
     }
-    sampleRate = outputStreamDescription.mSampleRate;
 
     // Fill in the playback data
     data.frequency = 0;
     data.amplitude = 0;
     data.curFrame = 0;
     data.remainingFrames = 0; 
-    data.bytesPerFrame = outputStreamDescription.mBytesPerFrame;
     data.sampleRate = sampleRate;
     // data.bufferByteCount = bufferByteCount;
     data.playing = FALSE;
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.c b/xorg-server/hw/xquartz/quartzKeyboard.c
index 96b5fa5b6..3b4eac31c 100644
--- a/xorg-server/hw/xquartz/quartzKeyboard.c
+++ b/xorg-server/hw/xquartz/quartzKeyboard.c
@@ -368,7 +368,7 @@ void DarwinKeyboardReloadHandler(void) {
     KeySymsRec keySyms;
     CFIndex initialKeyRepeatValue, keyRepeatValue;
     BOOL ok;
-    DeviceIntPtr pDev = darwinKeyboard;
+    DeviceIntPtr pDev;
     const char *xmodmap = PROJECTROOT "/bin/xmodmap";
     const char *sysmodmap = PROJECTROOT "/lib/X11/xinit/.Xmodmap";
     const char *homedir = getenv("HOME");