xserver pixman git update 7-12-2010

24 files changed, 1904 insertions, 1419 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86AutoConfig.c b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
index a00340191..14b266d38 100644
--- a/xorg-server/hw/xfree86/common/xf86AutoConfig.c
+++ b/xorg-server/hw/xfree86/common/xf86AutoConfig.c
@@ -282,21 +282,31 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
 static Bool

 copyScreen(confScreenPtr oscreen, GDevPtr odev, int i, char *driver)

 {

+    confScreenPtr nscreen;

     GDevPtr cptr = NULL;

 

-    xf86ConfigLayout.screens[i].screen = xnfcalloc(1, sizeof(confScreenRec));

-    if(!xf86ConfigLayout.screens[i].screen)

+    nscreen = malloc(sizeof(confScreenRec));

+    if (!nscreen)

         return FALSE;

-    memcpy(xf86ConfigLayout.screens[i].screen, oscreen, sizeof(confScreenRec));

+    memcpy(nscreen, oscreen, sizeof(confScreenRec));

 

-    cptr = calloc(1, sizeof(GDevRec));

-    if (!cptr)

+    cptr = malloc(sizeof(GDevRec));

+    if (!cptr) {

+        free(nscreen);

         return FALSE;

+    }

     memcpy(cptr, odev, sizeof(GDevRec));

 

     cptr->identifier = Xprintf("Autoconfigured Video Device %s", driver);

+    if (!cptr->identifier) {

+        free(cptr);

+        free(nscreen);

+        return FALSE;

+    }

     cptr->driver = driver;

 

+    xf86ConfigLayout.screens[i].screen = nscreen;

+

     /* now associate the new driver entry with the new screen entry */

     xf86ConfigLayout.screens[i].screen->device = cptr;

     cptr->myScreenSection = xf86ConfigLayout.screens[i].screen;

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index c0cba2994..c439221f9 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -1458,14 +1458,15 @@ configInputDevices(XF86ConfLayoutPtr layout, serverLayoutPtr servlayoutp)
     irp = layout->lay_input_lst;

     count = 0;

     while (irp) {

-	indp[count] = xnfalloc(sizeof(InputInfoRec));

+	indp[count] = xf86AllocateInput();

 	if (!configInput(indp[count], irp->iref_inputdev, X_CONFIG)) {

 	    while(count--)

 		free(indp[count]);

 	    free(indp);

 	    return FALSE;

 	}

-	indp[count]->options = irp->iref_option_lst;

+	indp[count]->options = xf86OptionListMerge(indp[count]->options,

+						   irp->iref_option_lst);

 	count++;

 	irp = (XF86ConfInputrefPtr)irp->list.next;

     }

diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index abb198690..9b6daaf41 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -1038,7 +1038,12 @@ xf86SetRootClip (ScreenPtr pScreen, Bool enable)
 	RegionInit(&pWin->winSize, &box, 1);

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

 	if (WasViewable)

+	{

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

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

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

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

+	}

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

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

         RegionBreak(&pWin->clipList);

@@ -1116,7 +1121,6 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
 	 */

 	if (!xf86Resetting)

 	    xf86SetRootClip (pScreen, TRUE);

-

     }

     else

     {

@@ -1190,7 +1194,7 @@ xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *forma
     char *msg;

 

     msg = Xprintf("%s: %s: %s", dev->drv->driverName, dev->name, format);

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

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

     free(msg);

 }

 

diff --git a/xorg-server/hw/xfree86/common/xf86Mode.c b/xorg-server/hw/xfree86/common/xf86Mode.c
index 2ba5ea990..df0884794 100644
--- a/xorg-server/hw/xfree86/common/xf86Mode.c
+++ b/xorg-server/hw/xfree86/common/xf86Mode.c
@@ -1643,8 +1643,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
 	    new = xnfcalloc(1, sizeof(DisplayModeRec));

 	    new->prev = last;

 	    new->type = M_T_USERDEF;

-	    new->name = xnfalloc(strlen(modeNames[i]) + 1);

-	    strcpy(new->name, modeNames[i]);

+	    new->name = xnfstrdup(modeNames[i]);

 	    if (new->prev)

 		new->prev->next = new;

 	    *endp = last = new;

@@ -1716,10 +1715,9 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
 

 	    p = xnfcalloc(1, sizeof(DisplayModeRec));

 	    p->prev = last;

-	    p->name = xnfalloc(strlen(r->name) + 1);

+	    p->name = xnfstrdup(r->name);

 	    if (!userModes)

 		p->type = M_T_USERDEF;

-	    strcpy(p->name, r->name);

 	    if (p->prev)

 		p->prev->next = p;

 	    *endp = last = p;

diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index 9335e116f..fb6f9673d 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -84,7 +84,7 @@ typedef enum {
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)

 #define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(9, 0)

 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(12, 0)

-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(4, 0)

+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(5, 0)

 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)

 

 #define MODINFOSTRING1	0xef23fdc5

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index 3a48fe9c3..dad993ec1 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -280,7 +280,8 @@ void
 xf86ProcessCommonOptions(InputInfoPtr pInfo,

                          pointer	list)

 {

-    if (!xf86SetBoolOption(list, "AlwaysCore", 1) ||

+    if (xf86SetBoolOption(list, "Floating", 0) ||

+        !xf86SetBoolOption(list, "AlwaysCore", 1) ||

         !xf86SetBoolOption(list, "SendCoreEvents", 1) ||

         !xf86SetBoolOption(list, "CorePointer", 1) ||

         !xf86SetBoolOption(list, "CoreKeyboard", 1)) {

@@ -652,7 +653,7 @@ IgnoreInputClass(const InputInfoPtr idev, const InputAttributes *attrs)
     return ignore;

 }

 

-static InputInfoPtr

+InputInfoPtr

 xf86AllocateInput(void)

 {

     InputInfoPtr pInfo;

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h
index 15ab82421..84683168c 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.h
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.h
@@ -155,6 +155,7 @@ extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
 extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);

 /* not exported */

 int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);

+InputInfoPtr xf86AllocateInput(void);

 

 /* xf86Helper.c */

 extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags);

diff --git a/xorg-server/hw/xfree86/common/xf86pciBus.c b/xorg-server/hw/xfree86/common/xf86pciBus.c
index b5e8790b6..aef7d277a 100644
--- a/xorg-server/hw/xfree86/common/xf86pciBus.c
+++ b/xorg-server/hw/xfree86/common/xf86pciBus.c
@@ -1167,6 +1167,7 @@ videoPtrToDriverList(struct pci_device *dev,
     return i;	/* Number of entries added */

 }

 

+#ifdef __linux__

 static int

 xchomp(char *line)

 {

@@ -1183,7 +1184,6 @@ xchomp(char *line)
     return 0;

 }

 

-#ifdef __linux__

 /* This function is used to provide a workaround for binary drivers that

  * don't export their PCI ID's properly. If distros don't end up using this

  * feature it can and should be removed because the symbol-based resolution

diff --git a/xorg-server/hw/xfree86/doc/devel/Registry b/xorg-server/hw/xfree86/doc/devel/Registry
index 613b50c7b..89a5f10fa 100644
--- a/xorg-server/hw/xfree86/doc/devel/Registry
+++ b/xorg-server/hw/xfree86/doc/devel/Registry
@@ -243,6 +243,7 @@ DemandLoad                O     I    ??
 Device                    S     I    Device file name

 DeviceName                S     I    Input device name

 FlowControl               S     I    Serial flow control ("xon", "none")

+Floating                  B     I    Device initialised as floating

 HistorySize               I     I    ??

 MaxX                      I     I    Maximum X coordinate

 MaxY                      I     I    Maximum Y coordinate

diff --git a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
index 6547d38aa..2267a0a1a 100644
--- a/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -904,30 +904,42 @@ the server. This affects implied layouts as well as explicit layouts
 specified in the configuration and/or on the command line.

 .TP 7

 .BI "Option \*qCorePointer\*q"

-Deprecated, use

-.B SendCoreEvents

-instead.

+Deprecated, see

+.B Floating

 .TP 7

 .BI "Option \*qCoreKeyboard\*q"

-Deprecated, use

-.B SendCoreEvents

-instead.

+Deprecated, see

+.B Floating

 .TP 7

 .BI "Option \*qAlwaysCore\*q  \*q" boolean \*q

-.B

-Deprecated, use

-.B SendCoreEvents

-instead.

+Deprecated, see

+.B Floating

 .TP 7

 .BI "Option \*qSendCoreEvents\*q  \*q" boolean \*q

-Both of these options are equivalent, and when enabled cause the

-input device to report core events through the master device. They are

-enabled by default.  Any device configured to send core events will be

-attached to the virtual core pointer or keyboard and control the cursor by

-default. Devices with

-.B SendCoreEvents

-disabled will be \*qfloating\*q and only accessible by clients employing the

-X Input extension. This option controls the startup behavior only, a device

+Deprecated, see

+.B Floating

+

+.TP 7

+.BI "Option \*qFloating\*q  \*q" boolean \*q

+When enabled, the input device is set up floating and does not

+report events through any master device or control a cursor. The device is

+only available to clients using the X Input Extension API. This option is

+disabled by default.

+The options

+.B CorePointer,

+.B CoreKeyboard,

+.B AlwaysCore,

+and

+.B SendCoreEvents,

+are the inverse of option

+.B Floating

+(i.e.

+.B SendCoreEvents \*qon\*q

+is equivalent to

+.B Floating \*qoff\*q

+).

+

+This option controls the startup behavior only, a device

 may be reattached or set floating at runtime.

 .PP

 For pointing devices, the following options control how the pointer

diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index 395cdf104..6fcb06df2 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -406,21 +406,21 @@ FindModuleInSubdir(const char *dirpath, const char *module)
  

         snprintf(tmpBuf, PATH_MAX, "lib%s.so", module);

         if (strcmp(direntry->d_name, tmpBuf) == 0) {

-            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2);

+            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 1);

             sprintf(ret, "%s%s", dirpath, tmpBuf);

             break;

         }

 

         snprintf(tmpBuf, PATH_MAX, "%s_drv.so", module);

         if (strcmp(direntry->d_name, tmpBuf) == 0) {

-            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2);

+            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 1);

             sprintf(ret, "%s%s", dirpath, tmpBuf);

             break;

         }

 

         snprintf(tmpBuf, PATH_MAX, "%s.so", module);

         if (strcmp(direntry->d_name, tmpBuf) == 0) {

-            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2);

+            ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 1);

             sprintf(ret, "%s%s", dirpath, tmpBuf);

             break;

         }

diff --git a/xorg-server/hw/xfree86/loader/sdksyms.sh b/xorg-server/hw/xfree86/loader/sdksyms.sh
index e9f8eda78..d69ae769e 100644
--- a/xorg-server/hw/xfree86/loader/sdksyms.sh
+++ b/xorg-server/hw/xfree86/loader/sdksyms.sh
@@ -41,6 +41,9 @@ cat > sdksyms.c << EOF
 #include "damage.h"

 #include "damagestr.h"

 

+/* miext/sync/Makefile.am */

+#include "misync.h"

+#include "misyncstr.h"

 

 /* Xext/Makefile.am -- half is module, half is builtin */

 /*

@@ -50,6 +53,7 @@ cat > sdksyms.c << EOF
 #include "geext.h"

 #include "geint.h"

 #include "shmint.h"

+#include "syncsdk.h"

 #if XINERAMA

 # include "panoramiXsrv.h"

 # include "panoramiX.h"

diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index 77f7375b1..99658e0ca 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -82,6 +82,17 @@ xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
     config->maxHeight = maxHeight;

 }

 

+void

+xf86CrtcSetScanoutFormats(ScrnInfoPtr		scrn,

+			  int			num_formats,

+			  xf86CrtcScanoutFormat	*formats)

+{

+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

+

+    config->num_scanout_formats = num_formats;

+    config->scanout_formats = formats;

+}

+

 /*

  * Crtc functions

  */

@@ -106,12 +117,17 @@ xf86CrtcCreate (ScrnInfoPtr		scrn,
     pixman_transform_init_identity (&crtc->crtc_to_framebuffer);

     pixman_f_transform_init_identity (&crtc->f_crtc_to_framebuffer);

     pixman_f_transform_init_identity (&crtc->f_framebuffer_to_crtc);

+    pixman_f_transform_init_identity (&crtc->f_screen_to_crtc);

+    pixman_f_transform_init_identity (&crtc->user_sprite_position_transform);

+    pixman_f_transform_init_identity (&crtc->f_crtc_to_cursor);

+    pixman_f_transform_init_identity (&crtc->user_sprite_image_transform);

     crtc->filter = NULL;

     crtc->params = NULL;

     crtc->nparams = 0;

     crtc->filter_width = 0;

     crtc->filter_height = 0;

     crtc->transform_in_use = FALSE;

+    crtc->sprite_transform_in_use = FALSE;

     crtc->transformPresent = FALSE;

     crtc->desiredTransformPresent = FALSE;

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

@@ -247,20 +263,20 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
  * Sets the given video mode on the given crtc

  */

 Bool

-xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,

-			  RRTransformPtr transform, int x, int y)

+xf86CrtcSet(xf86CrtcPtr crtc, xf86CrtcSetRec *set)

 {

     ScrnInfoPtr		scrn = crtc->scrn;

     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

     int			i;

     Bool		ret = FALSE;

     Bool		didLock = FALSE;

-    DisplayModePtr	adjusted_mode;

+    DisplayModePtr	adjusted_mode = NULL;

     DisplayModeRec	saved_mode;

     int			saved_x, saved_y;

     Rotation		saved_rotation;

     RRTransformRec	saved_transform;

     Bool		saved_transform_present;

+    PixmapPtr		saved_scanout_pixmap;

 

     crtc->enabled = xf86CrtcInUse (crtc);

 

@@ -272,13 +288,15 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
 	return TRUE;

     }

 

-    adjusted_mode = xf86DuplicateMode(mode);

-

+    /* See if nothing has changed */

+    if (!set->flags)

+	return TRUE;

 

     saved_mode = crtc->mode;

     saved_x = crtc->x;

     saved_y = crtc->y;

     saved_rotation = crtc->rotation;

+    saved_scanout_pixmap = crtc->scanoutPixmap;

     if (crtc->transformPresent) {

 	RRTransformInit (&saved_transform);

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

@@ -288,21 +306,46 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
     /* 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 (set->flags & XF86CrtcSetMode)

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

+    if (set->flags & XF86CrtcSetOrigin) {

+	crtc->x = set->x;

+	crtc->y = set->y;

+    }

+    if (set->flags & XF86CrtcSetRotation)

+	crtc->rotation = set->rotation;

+    if (set->flags & XF86CrtcSetScanoutPixmap)

+	crtc->scanoutPixmap = set->scanout_pixmap;

+

+    if (set->flags & XF86CrtcSetTransform) {

+	if (set->transform) {

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

+	    crtc->transformPresent = TRUE;

+	} else

+	    crtc->transformPresent = FALSE;

+    }

+

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

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

+	goto done;

+    }

+

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

+	ret = xf86CrtcRotate(crtc);

+	if (ret)

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

+	goto done;

+    }

 

     if (crtc->funcs->set_mode_major) {

-	ret = crtc->funcs->set_mode_major(crtc, mode, rotation, x, y);

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

+					  crtc->rotation,

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

 	goto done;

     }

 

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

+

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

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

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

@@ -314,12 +357,12 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
 	if (output->crtc != crtc)

 	    continue;

 

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

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

 	    goto done;

 	}

     }

 

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

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

 	goto done;

     }

 

@@ -342,12 +385,12 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
     /* 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);

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

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

     {

 	xf86OutputPtr output = xf86_config->output[i];

 	if (output->crtc == crtc)

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

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

     }

 

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

@@ -381,10 +424,13 @@ done:
 	if (saved_transform_present)

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

 	crtc->transformPresent = saved_transform_present;

+	crtc->scanoutPixmap = saved_scanout_pixmap;

     }

 

-    free(adjusted_mode->name);

-    free(adjusted_mode);

+    if (adjusted_mode) {

+	free(adjusted_mode->name);

+	free(adjusted_mode);

+    }

 

     if (didLock)

 	crtc->funcs->unlock (crtc);

@@ -393,35 +439,19 @@ done:
 }

 

 /**

- * Sets the given video mode on the given crtc, but without providing

- * a transform

- */

-Bool

-xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,

-		 int x, int y)

-{

-    return xf86CrtcSetModeTransform (crtc, mode, rotation, NULL, x, y);

-}

-

-/**

  * Pans the screen, does not change the mode

  */

 void

 xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y)

 {

-    ScrnInfoPtr scrn = crtc->scrn;

+    xf86CrtcSetRec	set;

 

-    crtc->x = x;

-    crtc->y = y;

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

-	if (!xf86CrtcRotate (crtc))

-	    return;

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

-	if (scrn->ModeSet)

-	    scrn->ModeSet(scrn);

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

+	set.x = x;

+	set.y = y;

+	set.flags = XF86CrtcSetOrigin;

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

     }

-    else

-	xf86CrtcSetMode (crtc, &crtc->mode, crtc->rotation, x, y);

 }

 

 /*

@@ -666,13 +696,11 @@ xf86OutputCreate (ScrnInfoPtr		    scrn,
 Bool

 xf86OutputRename (xf86OutputPtr output, const char *name)

 {

-    int	    len = strlen(name) + 1;

-    char    *newname = malloc(len);

+    char    *newname = strdup(name);

     

     if (!newname)

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

     

-    strcpy (newname, name);

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

 	free(output->name);

     output->name = newname;

@@ -2619,6 +2647,7 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
     for (c = 0; c < config->num_crtc; c++)

     {

 	xf86OutputPtr	output = NULL;

+	xf86CrtcSetRec	set;

 	int		o;

 	RRTransformPtr	transform;

 

@@ -2662,8 +2691,15 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
 	    transform = &crtc->desiredTransform;

 	else

 	    transform = NULL;

-	if (!xf86CrtcSetModeTransform (crtc, &crtc->desiredMode, crtc->desiredRotation,

-				       transform, crtc->desiredX, crtc->desiredY))

+	set.mode = &crtc->desiredMode;

+	set.rotation = crtc->desiredRotation;

+	set.transform = transform;

+	set.x = crtc->desiredX;

+	set.y = crtc->desiredY;

+	set.flags = (XF86CrtcSetMode | XF86CrtcSetOutput |

+		     XF86CrtcSetOrigin | XF86CrtcSetTransform |

+		     XF86CrtcSetRotation);

+	if (!xf86CrtcSet(crtc, &set))

 	    return FALSE;

     }

 

@@ -2767,6 +2803,7 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
 	xf86CrtcPtr	crtc = config->crtc[c];

 	DisplayModePtr	crtc_mode = NULL;

 	int		o;

+	xf86CrtcSetRec	set;

 

 	if (!crtc->enabled)

 	    continue;

@@ -2794,7 +2831,15 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
 	    crtc->enabled = FALSE;

 	    continue;

 	}

-	if (!xf86CrtcSetModeTransform (crtc, crtc_mode, rotation, NULL, 0, 0))

+	set.mode = crtc_mode;

+	set.rotation = rotation;

+	set.transform = NULL;

+	set.x = 0;

+	set.y = 0;

+	set.flags = (XF86CrtcSetMode | XF86CrtcSetOutput |

+		     XF86CrtcSetOrigin | XF86CrtcSetTransform |

+		     XF86CrtcSetRotation);

+	if (!xf86CrtcSet (crtc, &set))

 	    ok = FALSE;

 	else

 	{

diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.h b/xorg-server/hw/xfree86/modes/xf86Crtc.h
index 68a968cc2..e4037142f 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.h
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.h
@@ -1,972 +1,1075 @@
-/*
- * Copyright © 2006 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no representations
- * about the suitability of this software for any purpose.  It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
-#ifndef _XF86CRTC_H_
-#define _XF86CRTC_H_
-
-#include <edid.h>
-#include "randrstr.h"
-#if XF86_MODES_RENAME
-#include "xf86Rename.h"
-#endif
-#include "xf86Modes.h"
-#include "xf86Cursor.h"
-#include "xf86i2c.h"
-#include "damage.h"
-#include "picturestr.h"
-
-/* Compat definitions for older X Servers. */
-#ifndef M_T_PREFERRED
-#define M_T_PREFERRED	0x08
-#endif
-#ifndef M_T_DRIVER
-#define M_T_DRIVER	0x40
-#endif
-#ifndef M_T_USERPREF
-#define M_T_USERPREF	0x80
-#endif
-#ifndef HARDWARE_CURSOR_ARGB
-#define HARDWARE_CURSOR_ARGB				0x00004000
-#endif
-
-typedef struct _xf86Crtc xf86CrtcRec, *xf86CrtcPtr;
-typedef struct _xf86Output xf86OutputRec, *xf86OutputPtr;
-
-/* define a standard for connector types */
-typedef enum _xf86ConnectorType {
-   XF86ConnectorNone,
-   XF86ConnectorVGA,
-   XF86ConnectorDVI_I,
-   XF86ConnectorDVI_D,
-   XF86ConnectorDVI_A,
-   XF86ConnectorComposite,
-   XF86ConnectorSvideo,
-   XF86ConnectorComponent,
-   XF86ConnectorLFP,
-   XF86ConnectorProprietary,
-   XF86ConnectorHDMI,
-   XF86ConnectorDisplayPort,
-} xf86ConnectorType;
-
-typedef enum _xf86OutputStatus {
-   XF86OutputStatusConnected,
-   XF86OutputStatusDisconnected,
-   XF86OutputStatusUnknown
-} xf86OutputStatus;
-
-typedef struct _xf86CrtcFuncs {
-   /**
-    * Turns the crtc on/off, or sets intermediate power levels if available.
-    *
-    * Unsupported intermediate modes drop to the lower power setting.  If the
-    * mode is DPMSModeOff, the crtc must be disabled sufficiently for it to
-    * be safe to call mode_set.
-    */
-   void
-    (*dpms)(xf86CrtcPtr		crtc,
-	    int		    	mode);
-
-   /**
-    * Saves the crtc's state for restoration on VT switch.
-    */
-   void
-    (*save)(xf86CrtcPtr		crtc);
-
-   /**
-    * Restore's the crtc's state at VT switch.
-    */
-   void
-    (*restore)(xf86CrtcPtr	crtc);
-
-    /**
-     * Lock CRTC prior to mode setting, mostly for DRI.
-     * Returns whether unlock is needed
-     */
-    Bool
-    (*lock) (xf86CrtcPtr crtc);
-    
-    /**
-     * Unlock CRTC after mode setting, mostly for DRI
-     */
-    void
-    (*unlock) (xf86CrtcPtr crtc);
-    
-    /**
-     * Callback to adjust the mode to be set in the CRTC.
-     *
-     * This allows a CRTC to adjust the clock or even the entire set of
-     * timings, which is used for panels with fixed timings or for
-     * buses with clock limitations.
-     */
-    Bool
-    (*mode_fixup)(xf86CrtcPtr crtc,
-		  DisplayModePtr mode,
-		  DisplayModePtr adjusted_mode);
-
-    /**
-     * Prepare CRTC for an upcoming mode set.
-     */
-    void
-    (*prepare)(xf86CrtcPtr crtc);
-
-    /**
-     * Callback for setting up a video mode after fixups have been made.
-     */
-    void
-    (*mode_set)(xf86CrtcPtr crtc,
-		DisplayModePtr mode,
-		DisplayModePtr adjusted_mode,
-		int x, int y);
-
-    /**
-     * Commit mode changes to a CRTC
-     */
-    void
-    (*commit)(xf86CrtcPtr crtc);
-
-    /* Set the color ramps for the CRTC to the given values. */
-    void
-    (*gamma_set)(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
-		 int size);
-
-    /**
-     * Allocate the shadow area, delay the pixmap creation until needed
-     */
-    void *
-    (*shadow_allocate) (xf86CrtcPtr crtc, int width, int height);
-    
-    /**
-     * Create shadow pixmap for rotation support
-     */
-    PixmapPtr
-    (*shadow_create) (xf86CrtcPtr crtc, void *data, int width, int height);
-    
-    /**
-     * Destroy shadow pixmap
-     */
-    void
-    (*shadow_destroy) (xf86CrtcPtr crtc, PixmapPtr pPixmap, void *data);
-
-    /**
-     * Set cursor colors
-     */
-    void
-    (*set_cursor_colors) (xf86CrtcPtr crtc, int bg, int fg);
-
-    /**
-     * Set cursor position
-     */
-    void
-    (*set_cursor_position) (xf86CrtcPtr crtc, int x, int y);
-
-    /**
-     * Show cursor
-     */
-    void
-    (*show_cursor) (xf86CrtcPtr crtc);
-
-    /**
-     * Hide cursor
-     */
-    void
-    (*hide_cursor) (xf86CrtcPtr crtc);
-
-    /**
-     * Load monochrome image
-     */
-    void
-    (*load_cursor_image) (xf86CrtcPtr crtc, CARD8 *image);
-
-    /**
-     * Load ARGB image
-     */
-     void
-     (*load_cursor_argb) (xf86CrtcPtr crtc, CARD32 *image);
-     
-    /**
-     * Clean up driver-specific bits of the crtc
-     */
-    void
-    (*destroy) (xf86CrtcPtr	crtc);
-
-    /**
-     * Less fine-grained mode setting entry point for kernel modesetting
-     */
-    Bool
-    (*set_mode_major)(xf86CrtcPtr crtc, DisplayModePtr mode,
-		      Rotation rotation, int x, int y);
-
-    /**
-     * Callback for panning. Doesn't change the mode.
-     * Added in ABI version 2
-     */
-    void
-    (*set_origin)(xf86CrtcPtr crtc, int x, int y);
-
-} xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;
-
-#define XF86_CRTC_VERSION 3
-
-struct _xf86Crtc {
-    /**
-     * ABI versioning
-     */
-    int version;
-
-    /**
-     * Associated ScrnInfo
-     */
-    ScrnInfoPtr	    scrn;
-    
-    /**
-     * Desired state of this CRTC
-     *
-     * Set when this CRTC should be driving one or more outputs 
-     */
-    Bool	    enabled;
-    
-    /**
-     * Active mode
-     *
-     * This reflects the mode as set in the CRTC currently
-     * It will be cleared when the VT is not active or
-     * during server startup
-     */
-    DisplayModeRec  mode;
-    Rotation	    rotation;
-    PixmapPtr	    rotatedPixmap;
-    void	    *rotatedData;
-    
-    /**
-     * Position on screen
-     *
-     * Locates this CRTC within the frame buffer
-     */
-    int		    x, y;
-    
-    /**
-     * Desired mode
-     *
-     * This is set to the requested mode, independent of
-     * whether the VT is active. In particular, it receives
-     * the startup configured mode and saves the active mode
-     * on VT switch.
-     */
-    DisplayModeRec  desiredMode;
-    Rotation	    desiredRotation;
-    int		    desiredX, desiredY;
-    
-    /** crtc-specific functions */
-    const xf86CrtcFuncsRec *funcs;
-
-    /**
-     * Driver private
-     *
-     * Holds driver-private information
-     */
-    void	    *driver_private;
-
-#ifdef RANDR_12_INTERFACE
-    /**
-     * RandR crtc
-     *
-     * When RandR 1.2 is available, this
-     * points at the associated crtc object
-     */
-    RRCrtcPtr	    randr_crtc;
-#else
-    void	    *randr_crtc;
-#endif
-
-    /**
-     * Current cursor is ARGB
-     */
-    Bool	    cursor_argb;
-    /**
-     * Track whether cursor is within CRTC range 
-     */
-    Bool	    cursor_in_range;
-    /**
-     * Track state of cursor associated with this CRTC
-     */
-    Bool	    cursor_shown;
-
-    /**
-     * Current transformation matrix
-     */
-    PictTransform   crtc_to_framebuffer;
-    /* framebuffer_to_crtc was removed in ABI 2 */
-    struct pict_f_transform f_crtc_to_framebuffer; /* ABI 2 */
-    struct pict_f_transform f_framebuffer_to_crtc; /* ABI 2 */
-    PictFilterPtr   filter; /* ABI 2 */
-    xFixed	    *params; /* ABI 2 */
-    int		    nparams; /* ABI 2 */
-    int		    filter_width; /* ABI 2 */
-    int		    filter_height; /* ABI 2 */
-    Bool	    transform_in_use;
-    RRTransformRec  transform; /* ABI 2 */
-    Bool	    transformPresent; /* ABI 2 */
-    RRTransformRec  desiredTransform; /* ABI 2 */
-    Bool	    desiredTransformPresent; /* ABI 2 */
-    /**
-     * Bounding box in screen space
-     */
-    BoxRec	    bounds;
-    /**
-     * Panning:
-     * TotalArea: total panning area, larger than CRTC's size
-     * TrackingArea: Area of the pointer for which the CRTC is panned
-     * border: Borders of the displayed CRTC area which induces panning if the pointer reaches them
-     * Added in ABI version 2
-     */
-    BoxRec          panningTotalArea;
-    BoxRec          panningTrackingArea;
-    INT16           panningBorder[4];
-
-    /**
-     * Current gamma, especially useful after initial config.
-     * Added in ABI version 3
-     */
-    CARD16 *gamma_red;
-    CARD16 *gamma_green;
-    CARD16 *gamma_blue;
-    int gamma_size;
-
-    /**
-     * Actual state of this CRTC
-     *
-     * Set to TRUE after modesetting, set to FALSE if no outputs are connected
-     * Added in ABI version 3
-     */
-    Bool	    active;
-    /**
-     * Clear the shadow
-     */
-    Bool	    shadowClear;
-};
-
-typedef struct _xf86OutputFuncs {
-    /**
-     * Called to allow the output a chance to create properties after the
-     * RandR objects have been created.
-     */
-    void
-    (*create_resources)(xf86OutputPtr output);
-
-    /**
-     * Turns the output on/off, or sets intermediate power levels if available.
-     *
-     * Unsupported intermediate modes drop to the lower power setting.  If the
-     * mode is DPMSModeOff, the output must be disabled, as the DPLL may be
-     * disabled afterwards.
-     */
-    void
-    (*dpms)(xf86OutputPtr	output,
-	    int			mode);
-
-    /**
-     * Saves the output's state for restoration on VT switch.
-     */
-    void
-    (*save)(xf86OutputPtr	output);
-
-    /**
-     * Restore's the output's state at VT switch.
-     */
-    void
-    (*restore)(xf86OutputPtr	output);
-
-    /**
-     * Callback for testing a video mode for a given output.
-     *
-     * This function should only check for cases where a mode can't be supported
-     * on the output specifically, and not represent generic CRTC limitations.
-     *
-     * \return MODE_OK if the mode is valid, or another MODE_* otherwise.
-     */
-    int
-    (*mode_valid)(xf86OutputPtr	    output,
-		  DisplayModePtr    pMode);
-
-    /**
-     * Callback to adjust the mode to be set in the CRTC.
-     *
-     * This allows an output to adjust the clock or even the entire set of
-     * timings, which is used for panels with fixed timings or for
-     * buses with clock limitations.
-     */
-    Bool
-    (*mode_fixup)(xf86OutputPtr output,
-		  DisplayModePtr mode,
-		  DisplayModePtr adjusted_mode);
-
-    /**
-     * Callback for preparing mode changes on an output
-     */
-    void
-    (*prepare)(xf86OutputPtr output);
-
-    /**
-     * Callback for committing mode changes on an output
-     */
-    void
-    (*commit)(xf86OutputPtr output);
-
-    /**
-     * Callback for setting up a video mode after fixups have been made.
-     *
-     * This is only called while the output is disabled.  The dpms callback
-     * must be all that's necessary for the output, to turn the output on
-     * after this function is called.
-     */
-    void
-    (*mode_set)(xf86OutputPtr  output,
-		DisplayModePtr mode,
-		DisplayModePtr adjusted_mode);
-
-    /**
-     * Probe for a connected output, and return detect_status.
-     */
-    xf86OutputStatus
-    (*detect)(xf86OutputPtr	    output);
-
-    /**
-     * Query the device for the modes it provides.
-     *
-     * This function may also update MonInfo, mm_width, and mm_height.
-     *
-     * \return singly-linked list of modes or NULL if no modes found.
-     */
-    DisplayModePtr
-    (*get_modes)(xf86OutputPtr	    output);
-
-#ifdef RANDR_12_INTERFACE
-    /**
-     * Callback when an output's property has changed.
-     */
-    Bool
-    (*set_property)(xf86OutputPtr output,
-		    Atom property,
-		    RRPropertyValuePtr value);
-#endif
-#ifdef RANDR_13_INTERFACE
-    /**
-     * Callback to get an updated property value
-     */
-    Bool
-    (*get_property)(xf86OutputPtr output,
-		    Atom property);
-#endif
-#ifdef RANDR_GET_CRTC_INTERFACE
-    /**
-     * Callback to get current CRTC for a given output
-     */
-    xf86CrtcPtr
-    (*get_crtc)(xf86OutputPtr output);
-#endif
-    /**
-     * Clean up driver-specific bits of the output
-     */
-    void
-    (*destroy) (xf86OutputPtr	    output);
-} xf86OutputFuncsRec, *xf86OutputFuncsPtr;
-
-
-#define XF86_OUTPUT_VERSION 2
-
-struct _xf86Output {
-    /**
-     * ABI versioning
-     */
-    int version;
-
-    /**
-     * Associated ScrnInfo
-     */
-    ScrnInfoPtr		scrn;
-
-    /**
-     * Currently connected crtc (if any)
-     *
-     * If this output is not in use, this field will be NULL.
-     */
-    xf86CrtcPtr		crtc;
-
-    /**
-     * Possible CRTCs for this output as a mask of crtc indices
-     */
-    CARD32		possible_crtcs;
-
-    /**
-     * Possible outputs to share the same CRTC as a mask of output indices
-     */
-    CARD32		possible_clones;
-    
-    /**
-     * Whether this output can support interlaced modes
-     */
-    Bool		interlaceAllowed;
-
-    /**
-     * Whether this output can support double scan modes
-     */
-    Bool		doubleScanAllowed;
-
-    /**
-     * List of available modes on this output.
-     *
-     * This should be the list from get_modes(), plus perhaps additional
-     * compatible modes added later.
-     */
-    DisplayModePtr	probed_modes;
-
-    /**
-     * Options parsed from the related monitor section
-     */
-    OptionInfoPtr	options;
-    
-    /**
-     * Configured monitor section
-     */
-    XF86ConfMonitorPtr  conf_monitor;
-    
-    /**
-     * Desired initial position
-     */
-    int			initial_x, initial_y;
-
-    /**
-     * Desired initial rotation
-     */
-    Rotation		initial_rotation;
-
-    /**
-     * Current connection status
-     *
-     * This indicates whether a monitor is known to be connected
-     * to this output or not, or whether there is no way to tell
-     */
-    xf86OutputStatus	status;
-
-    /** EDID monitor information */
-    xf86MonPtr		MonInfo;
-
-    /** subpixel order */
-    int			subpixel_order;
-
-    /** Physical size of the currently attached output device. */
-    int			mm_width, mm_height;
-
-    /** Output name */
-    char		*name;
-
-    /** output-specific functions */
-    const xf86OutputFuncsRec *funcs;
-
-    /** driver private information */
-    void		*driver_private;
-    
-    /** Whether to use the old per-screen Monitor config section */
-    Bool		use_screen_monitor;
-
-#ifdef RANDR_12_INTERFACE
-    /**
-     * RandR 1.2 output structure.
-     *
-     * When RandR 1.2 is available, this points at the associated
-     * RandR output structure and is created when this output is created
-     */
-    RROutputPtr		randr_output;
-#else
-    void		*randr_output;
-#endif
-    /** 
-     * Desired initial panning
-     * Added in ABI version 2
-     */
-    BoxRec          initialTotalArea;
-    BoxRec          initialTrackingArea;
-    INT16           initialBorder[4];
-};
-
-typedef struct _xf86CrtcConfigFuncs {
-    /**
-     * Requests that the driver resize the screen.
-     *
-     * The driver is responsible for updating scrn->virtualX and scrn->virtualY.
-     * If the requested size cannot be set, the driver should leave those values
-     * alone and return FALSE.
-     *
-     * A naive driver that cannot reallocate the screen may simply change
-     * virtual[XY].  A more advanced driver will want to also change the
-     * devPrivate.ptr and devKind of the screen pixmap, update any offscreen
-     * pixmaps it may have moved, and change pScrn->displayWidth.
-     */
-    Bool
-    (*resize)(ScrnInfoPtr	scrn,
-	      int		width,
-	      int		height);
-} xf86CrtcConfigFuncsRec, *xf86CrtcConfigFuncsPtr;
-
-typedef void (*xf86_crtc_notify_proc_ptr) (ScreenPtr pScreen);
-
-typedef struct _xf86CrtcConfig {
-    int			num_output;
-    xf86OutputPtr	*output;
-    /**
-     * compat_output is used whenever we deal
-     * with legacy code that only understands a single
-     * output. pScrn->modes will be loaded from this output,
-     * adjust frame will whack this output, etc.
-     */
-    int			compat_output;
-
-    int			num_crtc;
-    xf86CrtcPtr		*crtc;
-
-    int			minWidth, minHeight;
-    int			maxWidth, maxHeight;
-    
-    /* For crtc-based rotation */
-    DamagePtr		rotation_damage;
-    Bool		rotation_damage_registered;
-
-    /* DGA */
-    unsigned int	dga_flags;
-    unsigned long	dga_address;
-    DGAModePtr		dga_modes;
-    int			dga_nmode;
-    int			dga_width, dga_height, dga_stride;
-    DisplayModePtr	dga_save_mode;
-
-    const xf86CrtcConfigFuncsRec *funcs;
-
-    CreateScreenResourcesProcPtr    CreateScreenResources;
-
-    CloseScreenProcPtr		    CloseScreen;
-
-    /* Cursor information */
-    xf86CursorInfoPtr	cursor_info;
-    CursorPtr		cursor;
-    CARD8		*cursor_image;
-    Bool		cursor_on;
-    CARD32		cursor_fg, cursor_bg;
-
-    /**
-     * Options parsed from the related device section
-     */
-    OptionInfoPtr	options;
-
-    Bool		debug_modes;
-
-    /* wrap screen BlockHandler for rotation */
-    ScreenBlockHandlerProcPtr	BlockHandler;
-
-    /* callback when crtc configuration changes */
-    xf86_crtc_notify_proc_ptr  xf86_crtc_notify;
-
-} xf86CrtcConfigRec, *xf86CrtcConfigPtr;
-
-extern _X_EXPORT int xf86CrtcConfigPrivateIndex;
-
-#define XF86_CRTC_CONFIG_PTR(p)	((xf86CrtcConfigPtr) ((p)->privates[xf86CrtcConfigPrivateIndex].ptr))
-
-static _X_INLINE xf86OutputPtr
-xf86CompatOutput(ScrnInfoPtr pScrn)
-{
-    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-    return config->output[config->compat_output];
-}
-
-static _X_INLINE xf86CrtcPtr
-xf86CompatCrtc(ScrnInfoPtr pScrn)
-{
-    xf86OutputPtr compat_output = xf86CompatOutput(pScrn);
-    if (!compat_output)
-	return NULL;
-    return compat_output->crtc;
-}
-
-static _X_INLINE RRCrtcPtr
-xf86CompatRRCrtc(ScrnInfoPtr pScrn)
-{
-    xf86CrtcPtr	compat_crtc = xf86CompatCrtc(pScrn);
-    if (!compat_crtc)
-	return NULL;
-    return compat_crtc->randr_crtc;
-}
-
-
-/*
- * Initialize xf86CrtcConfig structure
- */
-
-extern _X_EXPORT void
-xf86CrtcConfigInit (ScrnInfoPtr				scrn,
-		    const xf86CrtcConfigFuncsRec	*funcs);
-
-extern _X_EXPORT void
-xf86CrtcSetSizeRange (ScrnInfoPtr scrn,
-		      int minWidth, int minHeight,
-		      int maxWidth, int maxHeight);
-
-/*
- * Crtc functions
- */
-extern _X_EXPORT xf86CrtcPtr
-xf86CrtcCreate (ScrnInfoPtr		scrn,
-		const xf86CrtcFuncsRec	*funcs);
-
-extern _X_EXPORT void
-xf86CrtcDestroy (xf86CrtcPtr		crtc);
-
-
-/**
- * Sets the given video mode on the given crtc
- */
-
-extern _X_EXPORT Bool
-xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
-			  RRTransformPtr transform, int x, int y);
-
-extern _X_EXPORT Bool
-xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
-		 int x, int y);
-
-extern _X_EXPORT void
-xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);
-
-/*
- * Assign crtc rotation during mode set
- */
-extern _X_EXPORT Bool
-xf86CrtcRotate (xf86CrtcPtr crtc);
-
-/*
- * Clean up any rotation data, used when a crtc is turned off
- * as well as when rotation is disabled.
- */
-extern _X_EXPORT void
-xf86RotateDestroy (xf86CrtcPtr crtc);
-
-/*
- * free shadow memory allocated for all crtcs
- */
-extern _X_EXPORT void
-xf86RotateFreeShadow(ScrnInfoPtr pScrn);
-
-/*
- * Clean up rotation during CloseScreen
- */
-extern _X_EXPORT void
-xf86RotateCloseScreen (ScreenPtr pScreen);
-
-/**
- * Return whether any output is assigned to the crtc
- */
-extern _X_EXPORT Bool
-xf86CrtcInUse (xf86CrtcPtr crtc);
-
-/*
- * Output functions
- */
-extern _X_EXPORT xf86OutputPtr
-xf86OutputCreate (ScrnInfoPtr		    scrn,
-		  const xf86OutputFuncsRec  *funcs,
-		  const char		    *name);
-
-extern _X_EXPORT void
-xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor);
-
-extern _X_EXPORT Bool
-xf86OutputRename (xf86OutputPtr output, const char *name);
-
-extern _X_EXPORT void
-xf86OutputDestroy (xf86OutputPtr	output);
-
-extern _X_EXPORT void
-xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY);
-
-extern _X_EXPORT void
-xf86SetScrnInfoModes (ScrnInfoPtr pScrn);
-
-#ifdef RANDR_13_INTERFACE
-# define ScreenInitRetType	int
-#else
-# define ScreenInitRetType	Bool
-#endif
-
-extern _X_EXPORT ScreenInitRetType
-xf86CrtcScreenInit (ScreenPtr pScreen);
-
-extern _X_EXPORT Bool
-xf86InitialConfiguration (ScrnInfoPtr pScrn, Bool canGrow);
-
-extern _X_EXPORT void
-xf86DPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);
-    
-extern _X_EXPORT Bool
-xf86SaveScreen(ScreenPtr pScreen, int mode);
-
-extern _X_EXPORT void
-xf86DisableUnusedFunctions(ScrnInfoPtr pScrn);
-
-extern _X_EXPORT DisplayModePtr
-xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired);
-    
-extern _X_EXPORT Bool
-xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation);
-
-/**
- * Set the EDID information for the specified output
- */
-extern _X_EXPORT void
-xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon);
-
-/**
- * Return the list of modes supported by the EDID information
- * stored in 'output'
- */
-extern _X_EXPORT DisplayModePtr
-xf86OutputGetEDIDModes (xf86OutputPtr output);
-
-extern _X_EXPORT xf86MonPtr
-xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);
-
-/**
- * Initialize dga for this screen
- */
-
-#ifdef XFreeXDGA
-extern _X_EXPORT Bool
-xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);
-
-/* this is the real function, used only internally */
-_X_INTERNAL Bool
-_xf86_di_dga_init_internal (ScreenPtr pScreen);
-
-/**
- * Re-initialize dga for this screen (as when the set of modes changes)
- */
-
-extern _X_EXPORT Bool
-xf86DiDGAReInit (ScreenPtr pScreen);
-#endif
-
-/* This is the real function, used only internally */
-_X_INTERNAL Bool
-_xf86_di_dga_reinit_internal (ScreenPtr pScreen);
-
-/*
- * Set the subpixel order reported for the screen using
- * the information from the outputs
- */
-
-extern _X_EXPORT void
-xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen);
-
-/*
- * Get a standard string name for a connector type 
- */
-extern _X_EXPORT char *
-xf86ConnectorGetName(xf86ConnectorType connector);
-
-/*
- * Using the desired mode information in each crtc, set
- * modes (used in EnterVT functions, or at server startup)
- */
-
-extern _X_EXPORT Bool
-xf86SetDesiredModes (ScrnInfoPtr pScrn);
-
-/**
- * Initialize the CRTC-based cursor code. CRTC function vectors must
- * contain relevant cursor setting functions.
- *
- * Driver should call this from ScreenInit function
- */
-extern _X_EXPORT Bool
-xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags);
-
-/**
- * Called when anything on the screen is reconfigured.
- *
- * Reloads cursor images as needed, then adjusts cursor positions.
- * 
- * Driver should call this from crtc commit function.
- */
-extern _X_EXPORT void
-xf86_reload_cursors (ScreenPtr screen);
-
-/**
- * Called from EnterVT to turn the cursors back on
- */
-extern _X_EXPORT void
-xf86_show_cursors (ScrnInfoPtr scrn);
-
-/**
- * Called by the driver to turn cursors off
- */
-extern _X_EXPORT void
-xf86_hide_cursors (ScrnInfoPtr scrn);
-
-/**
- * Clean up CRTC-based cursor code. Driver must call this at CloseScreen time.
- */
-extern _X_EXPORT void
-xf86_cursors_fini (ScreenPtr screen);
-
-/*
- * For overlay video, compute the relevant CRTC and
- * clip video to that.
- * wraps xf86XVClipVideoHelper()
- */
-
-extern _X_EXPORT Bool
-xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
-			    xf86CrtcPtr *crtc_ret,
-			    xf86CrtcPtr desired_crtc,
-			    BoxPtr      dst,
-			    INT32	*xa,
-			    INT32	*xb,
-			    INT32	*ya,
-			    INT32	*yb,
-			    RegionPtr   reg,
-			    INT32	width,
-			    INT32	height);
-    
-extern _X_EXPORT xf86_crtc_notify_proc_ptr
-xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);
-
-extern _X_EXPORT void
-xf86_unwrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr old);
-
-extern _X_EXPORT void
-xf86_crtc_notify(ScreenPtr pScreen);
-
-/**
- * Gamma
- */
-
-extern _X_EXPORT Bool
-xf86_crtc_supports_gamma(ScrnInfoPtr pScrn);
-
-#endif /* _XF86CRTC_H_ */
+/*

+ * Copyright © 2006 Keith Packard

+ *

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

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

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

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

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

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

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

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

+ * is" without express or implied warranty.

+ *

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

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

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

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

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

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

+ * OF THIS SOFTWARE.

+ */

+#ifndef _XF86CRTC_H_

+#define _XF86CRTC_H_

+

+#include <edid.h>

+#include "randrstr.h"

+#if XF86_MODES_RENAME

+#include "xf86Rename.h"

+#endif

+#include "xf86Modes.h"

+#include "xf86Cursor.h"

+#include "xf86i2c.h"

+#include "damage.h"

+#include "picturestr.h"

+

+/* Compat definitions for older X Servers. */

+#ifndef M_T_PREFERRED

+#define M_T_PREFERRED	0x08

+#endif

+#ifndef M_T_DRIVER

+#define M_T_DRIVER	0x40

+#endif

+#ifndef M_T_USERPREF

+#define M_T_USERPREF	0x80

+#endif

+#ifndef HARDWARE_CURSOR_ARGB

+#define HARDWARE_CURSOR_ARGB				0x00004000

+#endif

+

+typedef struct _xf86Crtc xf86CrtcRec, *xf86CrtcPtr;

+typedef struct _xf86Output xf86OutputRec, *xf86OutputPtr;

+

+/* define a standard for connector types */

+typedef enum _xf86ConnectorType {

+   XF86ConnectorNone,

+   XF86ConnectorVGA,

+   XF86ConnectorDVI_I,

+   XF86ConnectorDVI_D,

+   XF86ConnectorDVI_A,

+   XF86ConnectorComposite,

+   XF86ConnectorSvideo,

+   XF86ConnectorComponent,

+   XF86ConnectorLFP,

+   XF86ConnectorProprietary,

+   XF86ConnectorHDMI,

+   XF86ConnectorDisplayPort,

+} xf86ConnectorType;

+

+typedef enum _xf86OutputStatus {

+   XF86OutputStatusConnected,

+   XF86OutputStatusDisconnected,

+   XF86OutputStatusUnknown

+} xf86OutputStatus;

+

+typedef enum _xf86CrtcSetFlags {

+    XF86CrtcSetMode = 1,		/* mode */

+    XF86CrtcSetOutput = 2,		/* outputs */

+    XF86CrtcSetOrigin = 4,		/* x/y */

+    XF86CrtcSetTransform = 8,		/* transform */

+    XF86CrtcSetRotation = 16,		/* rotation */

+    XF86CrtcSetProperty = 32,		/* output property */

+    XF86CrtcSetScanoutPixmap = 64,	/* scanout pixmap */

+} xf86CrtcSetFlags;

+

+typedef struct _xf86CrtcSet {

+    xf86CrtcSetFlags	flags;

+    DisplayModePtr	mode;

+    Rotation		rotation;

+    RRTransformPtr	transform;

+    int			x, y;

+    PixmapPtr		scanout_pixmap;

+} xf86CrtcSetRec;

+

+typedef struct _xf86CrtcFuncs {

+   /**

+    * Turns the crtc on/off, or sets intermediate power levels if available.

+    *

+    * Unsupported intermediate modes drop to the lower power setting.  If the

+    * mode is DPMSModeOff, the crtc must be disabled sufficiently for it to

+    * be safe to call mode_set.

+    */

+   void

+    (*dpms)(xf86CrtcPtr		crtc,

+	    int		    	mode);

+

+   /**

+    * Saves the crtc's state for restoration on VT switch.

+    */

+   void

+    (*save)(xf86CrtcPtr		crtc);

+

+   /**

+    * Restore's the crtc's state at VT switch.

+    */

+   void

+    (*restore)(xf86CrtcPtr	crtc);

+

+    /**

+     * Lock CRTC prior to mode setting, mostly for DRI.

+     * Returns whether unlock is needed

+     */

+    Bool

+    (*lock) (xf86CrtcPtr crtc);

+    

+    /**

+     * Unlock CRTC after mode setting, mostly for DRI

+     */

+    void

+    (*unlock) (xf86CrtcPtr crtc);

+    

+    /**

+     * Callback to adjust the mode to be set in the CRTC.

+     *

+     * This allows a CRTC to adjust the clock or even the entire set of

+     * timings, which is used for panels with fixed timings or for

+     * buses with clock limitations.

+     */

+    Bool

+    (*mode_fixup)(xf86CrtcPtr crtc,

+		  DisplayModePtr mode,

+		  DisplayModePtr adjusted_mode);

+

+    /**

+     * Prepare CRTC for an upcoming mode set.

+     */

+    void

+    (*prepare)(xf86CrtcPtr crtc);

+

+    /**

+     * Callback for setting up a video mode after fixups have been made.

+     */

+    void

+    (*mode_set)(xf86CrtcPtr crtc,

+		DisplayModePtr mode,

+		DisplayModePtr adjusted_mode,

+		int x, int y);

+

+    /**

+     * Commit mode changes to a CRTC

+     */

+    void

+    (*commit)(xf86CrtcPtr crtc);

+

+    /* Set the color ramps for the CRTC to the given values. */

+    void

+    (*gamma_set)(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,

+		 int size);

+

+    /**

+     * Allocate the shadow area, delay the pixmap creation until needed

+     */

+    void *

+    (*shadow_allocate) (xf86CrtcPtr crtc, int width, int height);

+    

+    /**

+     * Create shadow pixmap for rotation support

+     */

+    PixmapPtr

+    (*shadow_create) (xf86CrtcPtr crtc, void *data, int width, int height);

+    

+    /**

+     * Destroy shadow pixmap

+     */

+    void

+    (*shadow_destroy) (xf86CrtcPtr crtc, PixmapPtr pPixmap, void *data);

+

+    /**

+     * Set cursor colors

+     */

+    void

+    (*set_cursor_colors) (xf86CrtcPtr crtc, int bg, int fg);

+

+    /**

+     * Set cursor position

+     */

+    void

+    (*set_cursor_position) (xf86CrtcPtr crtc, int x, int y);

+

+    /**

+     * Show cursor

+     */

+    void

+    (*show_cursor) (xf86CrtcPtr crtc);

+

+    /**

+     * Hide cursor

+     */

+    void

+    (*hide_cursor) (xf86CrtcPtr crtc);

+

+    /**

+     * Load monochrome image

+     */

+    void

+    (*load_cursor_image) (xf86CrtcPtr crtc, CARD8 *image);

+

+    /**

+     * Load ARGB image

+     */

+     void

+     (*load_cursor_argb) (xf86CrtcPtr crtc, CARD32 *image);

+     

+    /**

+     * Clean up driver-specific bits of the crtc

+     */

+    void

+    (*destroy) (xf86CrtcPtr	crtc);

+

+    /**

+     * Less fine-grained mode setting entry point for kernel modesetting

+     */

+    Bool

+    (*set_mode_major)(xf86CrtcPtr crtc, DisplayModePtr mode,

+		      Rotation rotation, int x, int y);

+

+    /**

+     * Callback for panning. Doesn't change the mode.

+     * Added in ABI version 2

+     */

+    void

+    (*set_origin)(xf86CrtcPtr crtc, int x, int y);

+

+    /**

+     * General mode setting entry point that does everything

+     */

+    Bool

+    (*set)(xf86CrtcPtr crtc, xf86CrtcSetFlags flags);

+

+} xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;

+

+#define XF86_CRTC_VERSION 3

+

+struct _xf86Crtc {

+    /**

+     * ABI versioning

+     */

+    int version;

+

+    /**

+     * Associated ScrnInfo

+     */

+    ScrnInfoPtr	    scrn;

+    

+    /**

+     * Desired state of this CRTC

+     *

+     * Set when this CRTC should be driving one or more outputs 

+     */

+    Bool	    enabled;

+    

+    /**

+     * Active mode

+     *

+     * This reflects the mode as set in the CRTC currently

+     * It will be cleared when the VT is not active or

+     * during server startup

+     */

+    DisplayModeRec  mode;

+    Rotation	    rotation;

+    PixmapPtr	    rotatedPixmap;

+    void	    *rotatedData;

+    PixmapPtr	    scanoutPixmap;

+    

+    /**

+     * Position on screen

+     *

+     * Locates this CRTC within the frame buffer

+     */

+    int		    x, y;

+    

+    /**

+     * Desired mode

+     *

+     * This is set to the requested mode, independent of

+     * whether the VT is active. In particular, it receives

+     * the startup configured mode and saves the active mode

+     * on VT switch.

+     */

+    DisplayModeRec  desiredMode;

+    Rotation	    desiredRotation;

+    int		    desiredX, desiredY;

+    

+    /** crtc-specific functions */

+    const xf86CrtcFuncsRec *funcs;

+

+    /**

+     * Driver private

+     *

+     * Holds driver-private information

+     */

+    void	    *driver_private;

+

+#ifdef RANDR_12_INTERFACE

+    /**

+     * RandR crtc

+     *

+     * When RandR 1.2 is available, this

+     * points at the associated crtc object

+     */

+    RRCrtcPtr	    randr_crtc;

+#else

+    void	    *randr_crtc;

+#endif

+

+    /**

+     * Current cursor is ARGB

+     */

+    Bool	    cursor_argb;

+    /**

+     * Track whether cursor is within CRTC range 

+     */

+    Bool	    cursor_in_range;

+    /**

+     * Track state of cursor associated with this CRTC

+     */

+    Bool	    cursor_shown;

+

+    /**

+     * Current transformation matrix

+     */

+    PictTransform   crtc_to_framebuffer;

+    /* framebuffer_to_crtc was removed in ABI 2 */

+    struct pict_f_transform f_crtc_to_framebuffer; /* ABI 2 */

+    struct pict_f_transform f_framebuffer_to_crtc; /* ABI 2 */

+    PictFilterPtr   filter; /* ABI 2 */

+    xFixed	    *params; /* ABI 2 */

+    int		    nparams; /* ABI 2 */

+    int		    filter_width; /* ABI 2 */

+    int		    filter_height; /* ABI 2 */

+    Bool	    transform_in_use;

+    Bool	    sprite_transform_in_use;

+    RRTransformRec  transform; /* ABI 2 */

+    Bool	    transformPresent; /* ABI 2 */

+    RRTransformRec  desiredTransform; /* ABI 2 */

+    Bool	    desiredTransformPresent; /* ABI 2 */

+    /**

+     * Bounding box in screen space

+     */

+    BoxRec	    bounds;

+    /**

+     * Panning:

+     * TotalArea: total panning area, larger than CRTC's size

+     * TrackingArea: Area of the pointer for which the CRTC is panned

+     * border: Borders of the displayed CRTC area which induces panning if the pointer reaches them

+     * Added in ABI version 2

+     */

+    BoxRec          panningTotalArea;

+    BoxRec          panningTrackingArea;

+    INT16           panningBorder[4];

+

+    /**

+     * Current gamma, especially useful after initial config.

+     * Added in ABI version 3

+     */

+    CARD16 *gamma_red;

+    CARD16 *gamma_green;

+    CARD16 *gamma_blue;

+    int gamma_size;

+

+    /**

+     * Actual state of this CRTC

+     *

+     * Set to TRUE after modesetting, set to FALSE if no outputs are connected

+     * Added in ABI version 3

+     */

+    Bool	    active;

+    /**

+     * Clear the shadow

+     */

+    Bool	    shadowClear;

+

+    /**

+     * Sprite position transforms

+     */

+

+    /* Transform a screen coordinate to a crtc coordinate */

+    struct pixman_f_transform f_screen_to_crtc;

+

+    /* The user-specified portion of the screen to crtc conversion */

+    struct pixman_f_transform user_sprite_position_transform;

+

+    /* Transform a hardware cursor coordinate to a cursor coordinate */

+    struct pixman_f_transform f_crtc_to_cursor;

+

+    /* The user-specified portion of the cursor to hardware transform */

+    struct pixman_f_transform user_sprite_image_transform;

+};

+

+typedef struct _xf86OutputFuncs {

+    /**

+     * Called to allow the output a chance to create properties after the

+     * RandR objects have been created.

+     */

+    void

+    (*create_resources)(xf86OutputPtr output);

+

+    /**

+     * Turns the output on/off, or sets intermediate power levels if available.

+     *

+     * Unsupported intermediate modes drop to the lower power setting.  If the

+     * mode is DPMSModeOff, the output must be disabled, as the DPLL may be

+     * disabled afterwards.

+     */

+    void

+    (*dpms)(xf86OutputPtr	output,

+	    int			mode);

+

+    /**

+     * Saves the output's state for restoration on VT switch.

+     */

+    void

+    (*save)(xf86OutputPtr	output);

+

+    /**

+     * Restore's the output's state at VT switch.

+     */

+    void

+    (*restore)(xf86OutputPtr	output);

+

+    /**

+     * Callback for testing a video mode for a given output.

+     *

+     * This function should only check for cases where a mode can't be supported

+     * on the output specifically, and not represent generic CRTC limitations.

+     *

+     * \return MODE_OK if the mode is valid, or another MODE_* otherwise.

+     */

+    int

+    (*mode_valid)(xf86OutputPtr	    output,

+		  DisplayModePtr    pMode);

+

+    /**

+     * Callback to adjust the mode to be set in the CRTC.

+     *

+     * This allows an output to adjust the clock or even the entire set of

+     * timings, which is used for panels with fixed timings or for

+     * buses with clock limitations.

+     */

+    Bool

+    (*mode_fixup)(xf86OutputPtr output,

+		  DisplayModePtr mode,

+		  DisplayModePtr adjusted_mode);

+

+    /**

+     * Callback for preparing mode changes on an output

+     */

+    void

+    (*prepare)(xf86OutputPtr output);

+

+    /**

+     * Callback for committing mode changes on an output

+     */

+    void

+    (*commit)(xf86OutputPtr output);

+

+    /**

+     * Callback for setting up a video mode after fixups have been made.

+     *

+     * This is only called while the output is disabled.  The dpms callback

+     * must be all that's necessary for the output, to turn the output on

+     * after this function is called.

+     */

+    void

+    (*mode_set)(xf86OutputPtr  output,

+		DisplayModePtr mode,

+		DisplayModePtr adjusted_mode);

+

+    /**

+     * Probe for a connected output, and return detect_status.

+     */

+    xf86OutputStatus

+    (*detect)(xf86OutputPtr	    output);

+

+    /**

+     * Query the device for the modes it provides.

+     *

+     * This function may also update MonInfo, mm_width, and mm_height.

+     *

+     * \return singly-linked list of modes or NULL if no modes found.

+     */

+    DisplayModePtr

+    (*get_modes)(xf86OutputPtr	    output);

+

+#ifdef RANDR_12_INTERFACE

+    /**

+     * Callback when an output's property has changed.

+     */

+    Bool

+    (*set_property)(xf86OutputPtr output,

+		    Atom property,

+		    RRPropertyValuePtr value);

+#endif

+#ifdef RANDR_13_INTERFACE

+    /**

+     * Callback to get an updated property value

+     */

+    Bool

+    (*get_property)(xf86OutputPtr output,

+		    Atom property);

+#endif

+#ifdef RANDR_GET_CRTC_INTERFACE

+    /**

+     * Callback to get current CRTC for a given output

+     */

+    xf86CrtcPtr

+    (*get_crtc)(xf86OutputPtr output);

+#endif

+    /**

+     * Clean up driver-specific bits of the output

+     */

+    void

+    (*destroy) (xf86OutputPtr	    output);

+} xf86OutputFuncsRec, *xf86OutputFuncsPtr;

+

+

+#define XF86_OUTPUT_VERSION 2

+

+struct _xf86Output {

+    /**

+     * ABI versioning

+     */

+    int version;

+

+    /**

+     * Associated ScrnInfo

+     */

+    ScrnInfoPtr		scrn;

+

+    /**

+     * Currently connected crtc (if any)

+     *

+     * If this output is not in use, this field will be NULL.

+     */

+    xf86CrtcPtr		crtc;

+

+    /**

+     * Possible CRTCs for this output as a mask of crtc indices

+     */

+    CARD32		possible_crtcs;

+

+    /**

+     * Possible outputs to share the same CRTC as a mask of output indices

+     */

+    CARD32		possible_clones;

+    

+    /**

+     * Whether this output can support interlaced modes

+     */

+    Bool		interlaceAllowed;

+

+    /**

+     * Whether this output can support double scan modes

+     */

+    Bool		doubleScanAllowed;

+

+    /**

+     * List of available modes on this output.

+     *

+     * This should be the list from get_modes(), plus perhaps additional

+     * compatible modes added later.

+     */

+    DisplayModePtr	probed_modes;

+

+    /**

+     * Options parsed from the related monitor section

+     */

+    OptionInfoPtr	options;

+    

+    /**

+     * Configured monitor section

+     */

+    XF86ConfMonitorPtr  conf_monitor;

+    

+    /**

+     * Desired initial position

+     */

+    int			initial_x, initial_y;

+

+    /**

+     * Desired initial rotation

+     */

+    Rotation		initial_rotation;

+

+    /**

+     * Current connection status

+     *

+     * This indicates whether a monitor is known to be connected

+     * to this output or not, or whether there is no way to tell

+     */

+    xf86OutputStatus	status;

+

+    /** EDID monitor information */

+    xf86MonPtr		MonInfo;

+

+    /** subpixel order */

+    int			subpixel_order;

+

+    /** Physical size of the currently attached output device. */

+    int			mm_width, mm_height;

+

+    /** Output name */

+    char		*name;

+

+    /** output-specific functions */

+    const xf86OutputFuncsRec *funcs;

+

+    /** driver private information */

+    void		*driver_private;

+    

+    /** Whether to use the old per-screen Monitor config section */

+    Bool		use_screen_monitor;

+

+#ifdef RANDR_12_INTERFACE

+    /**

+     * RandR 1.2 output structure.

+     *

+     * When RandR 1.2 is available, this points at the associated

+     * RandR output structure and is created when this output is created

+     */

+    RROutputPtr		randr_output;

+#else

+    void		*randr_output;

+#endif

+    /** 

+     * Desired initial panning

+     * Added in ABI version 2

+     */

+    BoxRec          initialTotalArea;

+    BoxRec          initialTrackingArea;

+    INT16           initialBorder[4];

+};

+

+typedef enum _xf86SetConfigResponse {

+    xf86SetConfigFailed,		/* set_config failed */

+    xf86SetConfigChecked,		/* set_config validated the configuration */

+    xf86SetConfigDone,			/* set_config finished the work */

+} xf86SetConfigResponse;

+

+typedef struct _xf86CrtcSetConfig {

+    xf86CrtcPtr			crtc;

+    int				x, y;

+    DisplayModeRec		mode;

+    Rotation			rotation;

+    int				numOutputs;

+    xf86OutputPtr		*outputs;

+    struct pict_f_transform	sprite_position_transform;

+    struct pict_f_transform	sprite_image_transform;

+

+    /* Probably want some internal structure for the pixmap so that

+     * this can be set before the server is running

+     */

+    PixmapPtr			pixmap;

+    int				pixmap_x, pixmap_y;

+} xf86CrtcSetConfigRec, *xf86CrtcSetConfigPtr;

+

+typedef struct _xf86CrtcScanoutFormat {

+    int		    depth;

+    int		    bitsPerPixel;

+    int		    maxWidth, maxHeight;

+    Rotation	    rotations;

+    PictFormatShort format;

+} xf86CrtcScanoutFormat;

+

+typedef struct _xf86CrtcConfigFuncs {

+    /**

+     * Requests that the driver resize the screen.

+     *

+     * The driver is responsible for updating scrn->virtualX and scrn->virtualY.

+     * If the requested size cannot be set, the driver should leave those values

+     * alone and return FALSE.

+     *

+     * A naive driver that cannot reallocate the screen may simply change

+     * virtual[XY].  A more advanced driver will want to also change the

+     * devPrivate.ptr and devKind of the screen pixmap, update any offscreen

+     * pixmaps it may have moved, and change pScrn->displayWidth.

+     */

+    Bool

+    (*resize)(ScrnInfoPtr	scrn,

+	      int		width,

+	      int		height);

+

+    xf86SetConfigResponse

+    (*set_config) (ScrnInfoPtr		scrn,

+		   RRScreenConfigPtr	screen_config,

+		   xf86CrtcSetConfigPtr	crtc_configs,

+		   int			num_configs);

+

+    /**

+     * Create a scanout pixmap

+     */

+    PixmapPtr

+    (*create_scanout_pixmap)(ScrnInfoPtr		scrn,

+			     int			width,

+			     int			height,

+			     Rotation			rotations,

+			     xf86CrtcScanoutFormat	*format);

+

+} xf86CrtcConfigFuncsRec, *xf86CrtcConfigFuncsPtr;

+

+typedef void (*xf86_crtc_notify_proc_ptr) (ScreenPtr pScreen);

+

+typedef struct _xf86CrtcConfig {

+    int			num_output;

+    xf86OutputPtr	*output;

+    /**

+     * compat_output is used whenever we deal

+     * with legacy code that only understands a single

+     * output. pScrn->modes will be loaded from this output,

+     * adjust frame will whack this output, etc.

+     */

+    int			compat_output;

+

+    int			num_crtc;

+    xf86CrtcPtr		*crtc;

+

+    int			minWidth, minHeight;

+    int			maxWidth, maxHeight;

+    

+    /* For crtc-based rotation */

+    DamagePtr		rotation_damage;

+    Bool		rotation_damage_registered;

+

+    /* DGA */

+    unsigned int	dga_flags;

+    unsigned long	dga_address;

+    DGAModePtr		dga_modes;

+    int			dga_nmode;

+    int			dga_width, dga_height, dga_stride;

+    DisplayModePtr	dga_save_mode;

+

+    const xf86CrtcConfigFuncsRec *funcs;

+

+    CreateScreenResourcesProcPtr    CreateScreenResources;

+

+    CloseScreenProcPtr		    CloseScreen;

+

+    /* Cursor information */

+    xf86CursorInfoPtr	cursor_info;

+    CursorPtr		cursor;

+    CARD8		*cursor_image;

+    Bool		cursor_on;

+    CARD32		cursor_fg, cursor_bg;

+

+    /**

+     * Options parsed from the related device section

+     */

+    OptionInfoPtr	options;

+

+    Bool		debug_modes;

+

+    /* wrap screen BlockHandler for rotation */

+    ScreenBlockHandlerProcPtr	BlockHandler;

+

+    /* callback when crtc configuration changes */

+    xf86_crtc_notify_proc_ptr  xf86_crtc_notify;

+

+    /*

+     * Supported scanout pixmap formats

+     */

+    int			num_scanout_formats;

+    xf86CrtcScanoutFormat	*scanout_formats;

+} xf86CrtcConfigRec, *xf86CrtcConfigPtr;

+

+extern _X_EXPORT int xf86CrtcConfigPrivateIndex;

+

+#define XF86_CRTC_CONFIG_PTR(p)	((xf86CrtcConfigPtr) ((p)->privates[xf86CrtcConfigPrivateIndex].ptr))

+

+static _X_INLINE xf86OutputPtr

+xf86CompatOutput(ScrnInfoPtr pScrn)

+{

+    xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);

+    return config->output[config->compat_output];

+}

+

+static _X_INLINE xf86CrtcPtr

+xf86CompatCrtc(ScrnInfoPtr pScrn)

+{

+    xf86OutputPtr compat_output = xf86CompatOutput(pScrn);

+    if (!compat_output)

+	return NULL;

+    return compat_output->crtc;

+}

+

+static _X_INLINE RRCrtcPtr

+xf86CompatRRCrtc(ScrnInfoPtr pScrn)

+{

+    xf86CrtcPtr	compat_crtc = xf86CompatCrtc(pScrn);

+    if (!compat_crtc)

+	return NULL;

+    return compat_crtc->randr_crtc;

+}

+

+

+/*

+ * Initialize xf86CrtcConfig structure

+ */

+

+extern _X_EXPORT void

+xf86CrtcConfigInit (ScrnInfoPtr				scrn,

+		    const xf86CrtcConfigFuncsRec	*funcs);

+

+extern _X_EXPORT void

+xf86CrtcSetSizeRange (ScrnInfoPtr scrn,

+		      int minWidth, int minHeight,

+		      int maxWidth, int maxHeight);

+

+extern _X_EXPORT void

+xf86CrtcSetScanoutFormats (ScrnInfoPtr			scrn,

+			   int				num_formats,

+			   xf86CrtcScanoutFormat	*formats);

+

+/*

+ * Crtc functions

+ */

+extern _X_EXPORT xf86CrtcPtr

+xf86CrtcCreate (ScrnInfoPtr		scrn,

+		const xf86CrtcFuncsRec	*funcs);

+

+extern _X_EXPORT void

+xf86CrtcDestroy (xf86CrtcPtr		crtc);

+

+/**

+ * Change a crtc configuration (modes, outputs, etc)

+ */

+

+extern _X_EXPORT Bool

+xf86CrtcSet (xf86CrtcPtr crtc, xf86CrtcSetRec *set);

+

+extern _X_EXPORT void

+xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);

+

+/*

+ * Assign crtc rotation during mode set

+ */

+extern _X_EXPORT Bool

+xf86CrtcRotate (xf86CrtcPtr crtc);

+

+

+/*

+ * Update cursor transform matrices after user changes

+ * This is just the cursor subset of xf86CrtcRotate

+ */

+extern _X_EXPORT void

+xf86CrtcRotateCursor (xf86CrtcPtr crtc);

+

+/*

+ * Clean up any rotation data, used when a crtc is turned off

+ * as well as when rotation is disabled.

+ */

+extern _X_EXPORT void

+xf86RotateDestroy (xf86CrtcPtr crtc);

+

+/*

+ * free shadow memory allocated for all crtcs

+ */

+extern _X_EXPORT void

+xf86RotateFreeShadow(ScrnInfoPtr pScrn);

+

+/*

+ * Clean up rotation during CloseScreen

+ */

+extern _X_EXPORT void

+xf86RotateCloseScreen (ScreenPtr pScreen);

+

+/**

+ * Return whether any output is assigned to the crtc

+ */

+extern _X_EXPORT Bool

+xf86CrtcInUse (xf86CrtcPtr crtc);

+

+/*

+ * Output functions

+ */

+extern _X_EXPORT xf86OutputPtr

+xf86OutputCreate (ScrnInfoPtr		    scrn,

+		  const xf86OutputFuncsRec  *funcs,

+		  const char		    *name);

+

+extern _X_EXPORT void

+xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor);

+

+extern _X_EXPORT Bool

+xf86OutputRename (xf86OutputPtr output, const char *name);

+

+extern _X_EXPORT void

+xf86OutputDestroy (xf86OutputPtr	output);

+

+extern _X_EXPORT void

+xf86ProbeOutputModes (ScrnInfoPtr pScrn, int maxX, int maxY);

+

+extern _X_EXPORT void

+xf86SetScrnInfoModes (ScrnInfoPtr pScrn);

+

+#ifdef RANDR_13_INTERFACE

+# define ScreenInitRetType	int

+#else

+# define ScreenInitRetType	Bool

+#endif

+

+extern _X_EXPORT ScreenInitRetType

+xf86CrtcScreenInit (ScreenPtr pScreen);

+

+extern _X_EXPORT Bool

+xf86InitialConfiguration (ScrnInfoPtr pScrn, Bool canGrow);

+

+extern _X_EXPORT void

+xf86DPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags);

+    

+extern _X_EXPORT Bool

+xf86SaveScreen(ScreenPtr pScreen, int mode);

+

+extern _X_EXPORT void

+xf86DisableUnusedFunctions(ScrnInfoPtr pScrn);

+

+extern _X_EXPORT DisplayModePtr

+xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired);

+    

+extern _X_EXPORT Bool

+xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation);

+

+/**

+ * Set the EDID information for the specified output

+ */

+extern _X_EXPORT void

+xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon);

+

+/**

+ * Return the list of modes supported by the EDID information

+ * stored in 'output'

+ */

+extern _X_EXPORT DisplayModePtr

+xf86OutputGetEDIDModes (xf86OutputPtr output);

+

+extern _X_EXPORT xf86MonPtr

+xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);

+

+/**

+ * Initialize dga for this screen

+ */

+

+#ifdef XFreeXDGA

+extern _X_EXPORT Bool

+xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);

+

+/* this is the real function, used only internally */

+_X_INTERNAL Bool

+_xf86_di_dga_init_internal (ScreenPtr pScreen);

+

+/**

+ * Re-initialize dga for this screen (as when the set of modes changes)

+ */

+

+extern _X_EXPORT Bool

+xf86DiDGAReInit (ScreenPtr pScreen);

+#endif

+

+/* This is the real function, used only internally */

+_X_INTERNAL Bool

+_xf86_di_dga_reinit_internal (ScreenPtr pScreen);

+

+/*

+ * Set the subpixel order reported for the screen using

+ * the information from the outputs

+ */

+

+extern _X_EXPORT void

+xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen);

+

+/*

+ * Get a standard string name for a connector type 

+ */

+extern _X_EXPORT char *

+xf86ConnectorGetName(xf86ConnectorType connector);

+

+/*

+ * Using the desired mode information in each crtc, set

+ * modes (used in EnterVT functions, or at server startup)

+ */

+

+extern _X_EXPORT Bool

+xf86SetDesiredModes (ScrnInfoPtr pScrn);

+

+/**

+ * Initialize the CRTC-based cursor code. CRTC function vectors must

+ * contain relevant cursor setting functions.

+ *

+ * Driver should call this from ScreenInit function

+ */

+extern _X_EXPORT Bool

+xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags);

+

+/**

+ * Called when anything on the screen is reconfigured.

+ *

+ * Reloads cursor images as needed, then adjusts cursor positions.

+ * 

+ * Driver should call this from crtc commit function.

+ */

+extern _X_EXPORT void

+xf86_reload_cursors (ScreenPtr screen);

+

+/**

+ * Called from EnterVT to turn the cursors back on

+ */

+extern _X_EXPORT void

+xf86_show_cursors (ScrnInfoPtr scrn);

+

+/**

+ * Called by the driver to turn cursors off

+ */

+extern _X_EXPORT void

+xf86_hide_cursors (ScrnInfoPtr scrn);

+

+/**

+ * Clean up CRTC-based cursor code. Driver must call this at CloseScreen time.

+ */

+extern _X_EXPORT void

+xf86_cursors_fini (ScreenPtr screen);

+

+/*

+ * For overlay video, compute the relevant CRTC and

+ * clip video to that.

+ * wraps xf86XVClipVideoHelper()

+ */

+

+extern _X_EXPORT Bool

+xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,

+			    xf86CrtcPtr *crtc_ret,

+			    xf86CrtcPtr desired_crtc,

+			    BoxPtr      dst,

+			    INT32	*xa,

+			    INT32	*xb,

+			    INT32	*ya,

+			    INT32	*yb,

+			    RegionPtr   reg,

+			    INT32	width,

+			    INT32	height);

+    

+extern _X_EXPORT xf86_crtc_notify_proc_ptr

+xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);

+

+extern _X_EXPORT void

+xf86_unwrap_crtc_notify(ScreenPtr pScreen, xf86_crtc_notify_proc_ptr old);

+

+extern _X_EXPORT void

+xf86_crtc_notify(ScreenPtr pScreen);

+

+/**

+ * Gamma

+ */

+

+extern _X_EXPORT Bool

+xf86_crtc_supports_gamma(ScrnInfoPtr pScrn);

+

+#endif /* _XF86CRTC_H_ */

diff --git a/xorg-server/hw/xfree86/modes/xf86Cursors.c b/xorg-server/hw/xfree86/modes/xf86Cursors.c
index 5562f29cc..3c2958743 100644
--- a/xorg-server/hw/xfree86/modes/xf86Cursors.c
+++ b/xorg-server/hw/xfree86/modes/xf86Cursors.c
@@ -338,7 +338,7 @@ xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
     /*

      * Transform position of cursor on screen

      */

-    if (crtc->transform_in_use)

+    if (crtc->sprite_transform_in_use)

     {

 	ScreenPtr	screen = scrn->pScreen;

 	xf86CursorScreenPtr ScreenPriv =

@@ -349,7 +349,7 @@ xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
 	v.v[0] = (x + ScreenPriv->HotX) + 0.5;

 	v.v[1] = (y + ScreenPriv->HotY) + 0.5;

 	v.v[2] = 1;

-	pixman_f_transform_point (&crtc->f_framebuffer_to_crtc, &v);

+	pixman_f_transform_point (&crtc->f_screen_to_crtc, &v);

 	/* cursor will have 0.5 added to it already so floor is sufficent */

 	x = floor (v.v[0]);

 	y = floor (v.v[1]);

diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index 2b19d82ad..7bfb6fa47 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -180,14 +180,14 @@ xf86RandR13VerifyPanningArea (xf86CrtcPtr crtc, int screenWidth, int screenHeigh
  */

 

 static void

-xf86ComputeCrtcPan (Bool transform_in_use,

+xf86ComputeCrtcPan (Bool sprite_transform_in_use,

 		    struct pixman_f_transform *m,

 		    double screen_x, double screen_y,

 		    double crtc_x, double crtc_y,

 		    int old_pan_x, int old_pan_y,

 		    int *new_pan_x, int *new_pan_y)

 {

-    if (transform_in_use) {

+    if (sprite_transform_in_use) {

 	/*

 	 * Given the current transform, M, the current position

 	 * on the Screen, S, and the desired position on the CRTC,

@@ -374,8 +374,8 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
 	c.v[0] = x;

 	c.v[1] = y;

 	c.v[2] = 1.0;

-	if (crtc->transform_in_use) {

-	    pixman_f_transform_point(&crtc->f_framebuffer_to_crtc, &c);

+	if (crtc->sprite_transform_in_use) {

+	    pixman_f_transform_point(&crtc->f_screen_to_crtc, &c);

 	} else {

 	    c.v[0] -= crtc->x;

 	    c.v[1] -= crtc->y;

@@ -402,8 +402,8 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
 	    }

 	}

 	if (panned)

-	    xf86ComputeCrtcPan (crtc->transform_in_use,

-				&crtc->f_framebuffer_to_crtc,

+	    xf86ComputeCrtcPan (crtc->sprite_transform_in_use,

+				&crtc->f_screen_to_crtc,

 				x, y, c.v[0], c.v[1],

 				newX, newY, &newX, &newY);

     }

@@ -414,7 +414,7 @@ xf86RandR13Pan (xf86CrtcPtr crtc, int x, int y)
      * XXX This computation only works when we do not have a transform

      * in use.

      */

-    if (!crtc->transform_in_use)

+    if (!crtc->sprite_transform_in_use)

     {

 	/* Validate against [xy]1 after [xy]2, to be sure that results are > 0 for [xy]1 > 0 */

 	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1) {

@@ -659,10 +659,12 @@ xf86RandR12SetConfig (ScreenPtr		pScreen,
 

 static Bool

 xf86RandR12ScreenSetSize (ScreenPtr	pScreen,

-			CARD16		width,

-			CARD16		height,

-			CARD32		mmWidth,

-			CARD32		mmHeight)

+			  CARD16	width,

+			  CARD16	height,

+			  CARD16	pixWidth,

+			  CARD16	pixHeight,

+			  CARD32	mmWidth,

+			  CARD32	mmHeight)

 {

     XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);

     ScrnInfoPtr		pScrn = XF86SCRNINFO(pScreen);

@@ -670,6 +672,8 @@ xf86RandR12ScreenSetSize (ScreenPtr	pScreen,
     WindowPtr		pRoot = pScreen->root;

     PixmapPtr		pScrnPix;

     Bool		ret = FALSE;

+    Bool		pixSizeChanged = FALSE;

+    Bool		winSizeChanged = FALSE;

     int                 c;

 

     if (xf86RandR12Key) {

@@ -677,46 +681,85 @@ xf86RandR12ScreenSetSize (ScreenPtr	pScreen,
         {

 	    randrp->virtualX = pScrn->virtualX;

 	    randrp->virtualY = pScrn->virtualY;

+	    pixSizeChanged = TRUE;

         }

     }

-    if (pRoot && pScrn->vtSema)

-	(*pScrn->EnableDisableFBAccess) (pScreen->myNum, FALSE);

 

-    /* Let the driver update virtualX and virtualY */

-    if (!(*config->funcs->resize)(pScrn, width, height))

-	goto finish;

+    pScrnPix = (*pScreen->GetScreenPixmap)(pScreen);

+    if (pixWidth != pScrnPix->drawable.width ||

+	pixHeight != pScrnPix->drawable.height)

+	pixSizeChanged = TRUE;

+

+    if (width != pScreen->width || height != pScreen->height)

+	winSizeChanged = TRUE;

+

+    if (pixSizeChanged)

+    {

+	if (pRoot && pScrn->vtSema)

+	    (*pScrn->EnableDisableFBAccess) (pScreen->myNum, FALSE);

+

+	/* Let the driver update virtualX and virtualY */

+	if (!(*config->funcs->resize)(pScrn, pixWidth, pixHeight))

+	    goto finish;

+    }

 

     ret = TRUE;

-    /* Update panning information */

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

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

-	if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1 ||

-	    crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {

-	    if (crtc->panningTotalArea.x2 > crtc->panningTrackingArea.x1)

-		crtc->panningTotalArea.x2 += width  - pScreen->width;

-	    if (crtc->panningTotalArea.y2 > crtc->panningTrackingArea.y1)

-		crtc->panningTotalArea.y2 += height - pScreen->height;

-	    if (crtc->panningTrackingArea.x2 > crtc->panningTrackingArea.x1)

-		crtc->panningTrackingArea.x2 += width  - pScreen->width;

-	    if (crtc->panningTrackingArea.y2 > crtc->panningTrackingArea.y1)

-		crtc->panningTrackingArea.y2 += height - pScreen->height;

-	    xf86RandR13VerifyPanningArea (crtc, width, height);

-	    xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);

+

+    if (winSizeChanged)

+    {

+	/* Update panning information */

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

+	    xf86CrtcPtr crtc = config->crtc[c];

+	    if (crtc->panningTotalArea.x2 > crtc->panningTotalArea.x1 ||

+		crtc->panningTotalArea.y2 > crtc->panningTotalArea.y1) {

+		if (crtc->panningTotalArea.x2 > crtc->panningTrackingArea.x1)

+		    crtc->panningTotalArea.x2 += width  - pScreen->width;

+		if (crtc->panningTotalArea.y2 > crtc->panningTrackingArea.y1)

+		    crtc->panningTotalArea.y2 += height - pScreen->height;

+		if (crtc->panningTrackingArea.x2 > crtc->panningTrackingArea.x1)

+		    crtc->panningTrackingArea.x2 += width  - pScreen->width;

+		if (crtc->panningTrackingArea.y2 > crtc->panningTrackingArea.y1)

+		    crtc->panningTrackingArea.y2 += height - pScreen->height;

+		xf86RandR13VerifyPanningArea (crtc, width, height);

+		xf86RandR13Pan (crtc, randrp->pointerX, randrp->pointerY);

+	    }

 	}

     }

 

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

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

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

+    pScreen->width = width;

+    pScreen->height = height;

+    if (pRoot)

+    {

+	BoxRec	box;

+

+	pRoot->drawable.width = width;

+	pRoot->drawable.height = height;

+	box.x1 = 0;

+	box.y1 = 0;

+	box.x2 = width;

+	box.y2 = height;

+	RegionInit(&pRoot->winSize, &box, 1);

+	RegionInit(&pRoot->borderSize, &box, 1);

+    }

+    pScrnPix->drawable.width = pixWidth;

+    pScrnPix->drawable.height = pixHeight;

     randrp->mmWidth = pScreen->mmWidth = mmWidth;

     randrp->mmHeight = pScreen->mmHeight = mmHeight;

 

-    xf86SetViewport (pScreen, pScreen->width-1, pScreen->height-1);

-    xf86SetViewport (pScreen, 0, 0);

+    if (winSizeChanged)

+    {

+	xf86SetViewport (pScreen, pScreen->width-1, pScreen->height-1);

+	xf86SetViewport (pScreen, 0, 0);

+    }

 

 finish:

-    if (pRoot && pScrn->vtSema)

-	(*pScrn->EnableDisableFBAccess) (pScreen->myNum, TRUE);

+    if (pixSizeChanged)

+    {

+	if (pRoot && pScrn->vtSema)

+	    (*pScrn->EnableDisableFBAccess) (pScreen->myNum, TRUE);

+    }

+

 #if RANDR_12_INTERFACE

     if (xf86RandR12Key && pScreen->root && ret)

 	RRScreenSizeNotify (pScreen);

@@ -758,7 +801,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 	xf86CrtcPtr crtc = config->crtc[c];

 	int	    crtc_width = crtc->x + xf86ModeWidth (&crtc->mode, crtc->rotation);

 	int	    crtc_height = crtc->y + xf86ModeHeight (&crtc->mode, crtc->rotation);

-	

+

 	if (crtc->enabled) {

 	    if (crtc_width > width)

 		width = crtc_width;

@@ -770,13 +813,13 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 		height = crtc->panningTotalArea.y2;

 	}

     }

-    

+

     if (width && height)

     {

 	/*

 	 * Compute physical size of screen

 	 */

-	if (monitorResolution) 

+	if (monitorResolution)

 	{

 	    mmWidth = width * 25.4 / monitorResolution;

 	    mmHeight = height * 25.4 / monitorResolution;

@@ -818,6 +861,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
 	xf86RandR12ScreenSetSize (pScreen,

 				  width,

 				  height,

+				  width,

+				  height,

 				  mmWidth,

 				  mmHeight);

     }

@@ -1007,7 +1052,7 @@ xf86RandRModeMatches (RRModePtr		randr_mode,
 	if (memcmp (randr_mode->name, mode->name, len) != 0)	return FALSE;

     }

 #endif

-    

+

     /* check for same timings */

     if (randr_mode->mode.dotClock / 1000 != mode->Clock)    return FALSE;

     if (randr_mode->mode.width        != mode->HDisplay)    return FALSE;

@@ -1019,11 +1064,11 @@ xf86RandRModeMatches (RRModePtr		randr_mode,
     if (randr_mode->mode.vSyncStart   != mode->VSyncStart)  return FALSE;

     if (randr_mode->mode.vSyncEnd     != mode->VSyncEnd)    return FALSE;

     if (randr_mode->mode.vTotal       != mode->VTotal)	    return FALSE;

-    

+

     /* check for same flags (using only the XF86 valid flag bits) */

     if ((randr_mode->mode.modeFlags & FLAG_BITS) != (mode->Flags & FLAG_BITS))

 	return FALSE;

-    

+

     /* everything matches */

     return TRUE;

 }

@@ -1063,7 +1108,7 @@ xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)
 	    randr_output = output->randr_output;

 	    randr_outputs[numOutputs++] = randr_output;

 	    /*

-	     * We make copies of modes, so pointer equality 

+	     * We make copies of modes, so pointer equality

 	     * isn't sufficient

 	     */

 	    for (j = 0; j < randr_output->numModes + randr_output->numUserModes; j++)

@@ -1071,7 +1116,7 @@ xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)
 		RRModePtr   m = (j < randr_output->numModes ?

 				 randr_output->modes[j] :

 				 randr_output->userModes[j-randr_output->numModes]);

-					 

+

 		if (xf86RandRModeMatches (m, mode))

 		{

 		    randr_mode = m;

@@ -1081,9 +1126,9 @@ xf86RandR12CrtcNotify (RRCrtcPtr	randr_crtc)
 	}

     }

     ret = RRCrtcNotify (randr_crtc, randr_mode, x, y,

-			rotation, 

+			rotation,

 			crtc->transformPresent ? &crtc->transform : NULL,

-			numOutputs, randr_outputs);

+			numOutputs, randr_outputs, crtc->scanoutPixmap);

     free(randr_outputs);

     return ret;

 }

@@ -1100,13 +1145,13 @@ xf86RandRModeConvert (ScrnInfoPtr	scrn,
     mode->status = MODE_OK;

 

     mode->Clock = randr_mode->mode.dotClock / 1000;

-    

+

     mode->HDisplay = randr_mode->mode.width;

     mode->HSyncStart = randr_mode->mode.hSyncStart;

     mode->HSyncEnd = randr_mode->mode.hSyncEnd;

     mode->HTotal = randr_mode->mode.hTotal;

     mode->HSkew = randr_mode->mode.hSkew;

-    

+

     mode->VDisplay = randr_mode->mode.height;

     mode->VSyncStart = randr_mode->mode.vSyncStart;

     mode->VSyncEnd = randr_mode->mode.vSyncEnd;

@@ -1126,14 +1171,15 @@ xf86RandR12CrtcSet (ScreenPtr	    pScreen,
 		    int		    y,

 		    Rotation	    rotation,

 		    int		    num_randr_outputs,

-		    RROutputPtr	    *randr_outputs)

+		    RROutputPtr	    *randr_outputs,

+		    PixmapPtr	    scanout_pixmap)

 {

     XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);

     ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];

     xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

     xf86CrtcPtr		crtc = randr_crtc->devPrivate;

     RRTransformPtr	transform;

-    Bool		changed = FALSE;

+    xf86CrtcSetFlags	flags = 0;

     int			o, ro;

     xf86CrtcPtr		*save_crtcs;

     Bool		save_enabled = crtc->enabled;

@@ -1143,34 +1189,37 @@ xf86RandR12CrtcSet (ScreenPtr	    pScreen,
 

     save_crtcs = malloc(config->num_output * sizeof (xf86CrtcPtr));

     if ((randr_mode != NULL) != crtc->enabled)

-	changed = TRUE;

+	flags |= XF86CrtcSetMode;

     else if (randr_mode && !xf86RandRModeMatches (randr_mode, &crtc->mode))

-	changed = TRUE;

-    

+	flags |= XF86CrtcSetMode;

+

     if (rotation != crtc->rotation)

-	changed = TRUE;

+	flags |= XF86CrtcSetRotation;

 

     transform = RRCrtcGetTransform (randr_crtc);

     if ((transform != NULL) != crtc->transformPresent)

-	changed = TRUE;

+	flags |= XF86CrtcSetTransform;

     else if (transform && memcmp (&transform->transform, &crtc->transform.transform,

 				  sizeof (transform->transform)) != 0)

-	changed = TRUE;

+	flags |= XF86CrtcSetTransform;

+

+    if (scanout_pixmap != crtc->scanoutPixmap)

+	flags |= XF86CrtcSetScanoutPixmap;

 

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

-	changed = TRUE;

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

+	flags |= XF86CrtcSetOrigin;

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

     {

 	xf86OutputPtr  output = config->output[o];

 	xf86CrtcPtr    new_crtc;

 

 	save_crtcs[o] = output->crtc;

-	

+

 	if (output->crtc == crtc)

 	    new_crtc = NULL;

 	else

 	    new_crtc = output->crtc;

-	for (ro = 0; ro < num_randr_outputs; ro++) 

+	for (ro = 0; ro < num_randr_outputs; ro++)

 	    if (output->randr_output == randr_outputs[ro])

 	    {

 		new_crtc = crtc;

@@ -1178,16 +1227,16 @@ xf86RandR12CrtcSet (ScreenPtr	    pScreen,
 	    }

 	if (new_crtc != output->crtc)

 	{

-	    changed = TRUE;

+	    flags |= XF86CrtcSetOutput;

 	    output->crtc = new_crtc;

 	}

     }

-    for (ro = 0; ro < num_randr_outputs; ro++) 

+    for (ro = 0; ro < num_randr_outputs; ro++)

         if (randr_outputs[ro]->pendingProperties)

-	    changed = TRUE;

+	    flags |= XF86CrtcSetProperty;

 

     /* XXX need device-independent mode setting code through an API */

-    if (changed)

+    if (flags)

     {

 	crtc->enabled = randr_mode != NULL;

 

@@ -1195,9 +1244,17 @@ xf86RandR12CrtcSet (ScreenPtr	    pScreen,
 	{

 	    DisplayModeRec  mode;

 	    RRTransformPtr  transform = RRCrtcGetTransform (randr_crtc);

+	    xf86CrtcSetRec  set;

 

 	    xf86RandRModeConvert (pScrn, randr_mode, &mode);

-	    if (!xf86CrtcSetModeTransform (crtc, &mode, rotation, transform, x, y))

+	    set.mode = &mode;

+	    set.rotation = rotation;

+	    set.transform = transform;

+	    set.x = x;

+	    set.y = y;

+	    set.scanout_pixmap = scanout_pixmap;

+	    set.flags = flags;

+	    if (!xf86CrtcSet(crtc, &set))

 	    {

 		crtc->enabled = save_enabled;

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

@@ -1378,7 +1435,7 @@ xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)
 

     if (nmode) {

 	rrmodes = malloc(nmode * sizeof (RRModePtr));

-	

+

 	if (!rrmodes)

 	    return FALSE;

 	nmode = 0;

@@ -1388,7 +1445,7 @@ xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)
 		if ((pref != 0) == ((mode->type & M_T_PREFERRED) != 0)) {

 		    xRRModeInfo		modeInfo;

 		    RRModePtr		rrmode;

-		    

+

 		    modeInfo.nameLength = strlen (mode->name);

 		    modeInfo.width = mode->HDisplay;

 		    modeInfo.dotClock = mode->Clock * 1000;

@@ -1412,7 +1469,7 @@ xf86RROutputSetModes (RROutputPtr randr_output, DisplayModePtr modes)
 	    }

 	}

     }

-    

+

     ret = RROutputSetModes (randr_output, rrmodes, nmode, npreferred);

     free(rrmodes);

     return ret;

@@ -1432,13 +1489,13 @@ xf86RandR12SetInfo12 (ScreenPtr pScreen)
     int			o, c, l;

     RRCrtcPtr		randr_crtc;

     int			nclone;

-    

+

     clones = malloc(config->num_output * sizeof (RROutputPtr));

     crtcs = malloc(config->num_crtc * sizeof (RRCrtcPtr));

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

     {

 	xf86OutputPtr	output = config->output[o];

-	

+

 	ncrtc = 0;

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

 	    if (output->possible_crtcs & (1 << c))

@@ -1456,7 +1513,7 @@ xf86RandR12SetInfo12 (ScreenPtr pScreen)
 	    return FALSE;

 	}

 

-	RROutputSetPhysicalSize(output->randr_output, 

+	RROutputSetPhysicalSize(output->randr_output,

 				output->mm_width,

 				output->mm_height);

 	xf86RROutputSetModes (output->randr_output, output->probed_modes);

@@ -1482,7 +1539,7 @@ xf86RandR12SetInfo12 (ScreenPtr pScreen)
 	for (l = 0; l < config->num_output; l++)

 	{

 	    xf86OutputPtr	    clone = config->output[l];

-	    

+

 	    if (l != o && (output->possible_clones & (1 << l)))

 		clones[nclone++] = clone->randr_output;

 	}

@@ -1523,7 +1580,7 @@ xf86RandR12CreateObjects12 (ScreenPtr pScreen)
     xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);

     int			c;

     int			o;

-    

+

     if (!RRInit ())

 	return FALSE;

 

@@ -1533,7 +1590,7 @@ xf86RandR12CreateObjects12 (ScreenPtr pScreen)
     for (c = 0; c < config->num_crtc; c++)

     {

 	xf86CrtcPtr    crtc = config->crtc[c];

-	

+

 	crtc->randr_crtc = RRCrtcCreate (pScreen, crtc);

 	RRCrtcGammaSetSize (crtc->randr_crtc, 256);

     }

@@ -1544,7 +1601,7 @@ xf86RandR12CreateObjects12 (ScreenPtr pScreen)
     {

 	xf86OutputPtr	output = config->output[o];

 

-	output->randr_output = RROutputCreate (pScreen, output->name, 

+	output->randr_output = RROutputCreate (pScreen, output->name,

 					       strlen (output->name),

 					       output);

 

@@ -1567,7 +1624,7 @@ xf86RandR12CreateScreenResources12 (ScreenPtr pScreen)
 

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

         xf86RandR12CrtcNotify (config->crtc[c]->randr_crtc);

-    

+

     RRScreenSetSizeRange (pScreen, config->minWidth, config->minHeight,

 			  config->maxWidth, config->maxHeight);

     return TRUE;

@@ -1725,6 +1782,174 @@ xf86RandR12ChangeGamma(int scrnIndex, Gamma gamma)
     return Success;

 }

 

+static RRScanoutPixmapInfo *

+xf86RRQueryScanoutPixmaps(ScreenPtr screen, int *n_info)

+{

+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

+    RRScanoutPixmapInfo	*info;

+    int			f;

+

+    info = calloc(config->num_scanout_formats, sizeof (RRScanoutPixmapInfo));

+    if (config->num_scanout_formats && !info) {

+	*n_info = 0;

+	return NULL;

+    }

+    for (f = 0; f < config->num_scanout_formats; f++) {

+	info[f].maxWidth = config->scanout_formats[f].maxWidth;

+	info[f].maxHeight = config->scanout_formats[f].maxHeight;

+	info[f].depth = config->scanout_formats[f].depth;

+	info[f].rotations = config->scanout_formats[f].rotations;

+	info[f].format = PictureMatchFormat (screen, info[f].depth,

+					     config->scanout_formats[f].format);

+    }

+    *n_info = config->num_scanout_formats;

+    return info;

+}

+

+static PixmapPtr

+xf86RRCreateScanoutPixmap(ScreenPtr screen,

+			  int width, int height, int depth,

+			  Rotation rotations,

+			  PictFormatPtr format)

+{

+    ScrnInfoPtr		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(scrn);

+    int			f;

+

+    if (!config->funcs->create_scanout_pixmap)

+	return NullPixmap;

+

+    for (f = 0; f < config->num_scanout_formats; f++)

+	if (config->scanout_formats[f].depth == depth &&

+	    (config->scanout_formats[f].format & 0xffffff) == format->format) {

+	    return (*config->funcs->create_scanout_pixmap) (scrn, width, height,

+							    rotations,

+							    &config->scanout_formats[f]);

+	}

+    return NullPixmap;

+}

+

+static void

+xf86RandR14SetCrtcSpriteTransform(ScreenPtr		pScreen,

+				  RRCrtcPtr		randr_crtc,

+				  struct pixman_f_transform *f_position_transform,

+				  struct pixman_f_transform *f_image_transform)

+{

+    xf86CrtcPtr		crtc = randr_crtc->devPrivate;

+

+    crtc->user_sprite_position_transform = *f_position_transform;

+    crtc->user_sprite_image_transform = *f_image_transform;

+    xf86CrtcRotateCursor(crtc);

+    xf86_reload_cursors(pScreen);

+}

+

+static Bool

+xf86RRConvertCrtcConfig(xf86CrtcSetConfigPtr	xf86_config,

+			RRCrtcConfigPtr		rr_config)

+{

+    RRCrtcPtr		rr_crtc = rr_config->crtc;

+    xf86CrtcPtr		crtc = rr_crtc->devPrivate;

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

+    int			o;

+

+    xf86_config->crtc = crtc;

+    xf86_config->x = rr_config->x;

+    xf86_config->y = rr_config->y;

+    xf86RandRModeConvert(scrn, rr_config->mode, &xf86_config->mode);

+    xf86_config->rotation = rr_config->rotation;

+    xf86_config->numOutputs = rr_config->numOutputs;

+    xf86_config->outputs = calloc(rr_config->numOutputs, sizeof (xf86OutputPtr));

+    if (!xf86_config->outputs)

+	return FALSE;

+    for (o = 0; o < rr_config->numOutputs; o++)

+	xf86_config->outputs[o] = rr_config->outputs[o]->devPrivate;

+    xf86_config->sprite_position_transform = rr_config->sprite_position_f_transform;

+    xf86_config->sprite_image_transform = rr_config->sprite_image_f_transform;

+    xf86_config->pixmap = rr_config->pixmap;

+    xf86_config->pixmap_x = rr_config->pixmap_x;

+    xf86_config->pixmap_y = rr_config->pixmap_y;

+    return TRUE;

+}

+

+static void

+xf86FreeCrtcSetConfigs(xf86CrtcSetConfigPtr xf86_crtc_configs, int num_configs)

+{

+    int	i;

+

+    for (i = 0; i < num_configs; i++)

+	free(xf86_crtc_configs[i].outputs);

+    free(xf86_crtc_configs);

+}

+

+static Bool

+xf86RRSetCrtcConfigs(ScreenPtr screen,

+		     RRScreenConfigPtr screen_config,

+		     RRCrtcConfigPtr crtc_configs,

+		     int num_configs)

+{

+    ScrnInfoPtr	     		scrn = xf86Screens[screen->myNum];

+    xf86CrtcConfigPtr		config = XF86_CRTC_CONFIG_PTR(scrn);

+

+    if (config->funcs->set_config) {

+	xf86CrtcSetConfigPtr	xf86_crtc_configs;

+	int			i;

+	xf86SetConfigResponse	response;

+

+	/*

+	 * Convert RRCrtcConfigRecs to xf86CrtcSetConfigs

+	 */

+	xf86_crtc_configs = calloc(num_configs, sizeof (xf86CrtcSetConfigRec));

+	if (!xf86_crtc_configs)

+	    return FALSE;

+	for (i = 0; i < num_configs; i++)

+	    if (!xf86RRConvertCrtcConfig(&xf86_crtc_configs[i], &crtc_configs[i])) {

+		xf86FreeCrtcSetConfigs(xf86_crtc_configs, num_configs);

+		return FALSE;

+	    }

+

+	/*

+	 * Ask the driver to set the configuration

+	 */

+	response = (*config->funcs->set_config)(scrn,

+						screen_config,

+						xf86_crtc_configs,

+						num_configs);

+	xf86FreeCrtcSetConfigs(xf86_crtc_configs, num_configs);

+

+	/*

+	 * The driver is allowed to answer with one of three

+	 * responses:

+	 */

+	switch (response) {

+	case xf86SetConfigFailed:

+

+	    /* The configuration isn't usable, or some error

+	     * occurred while setting it. Everything has been

+	     * cleaned up and we're ready to return an error

+	     * back to the client

+	     */

+	    return FALSE;

+	case xf86SetConfigDone:

+

+	    /* The configuration was acceptable, and the whole

+	     * mode setting experience is over. Nothing more to do

+	     * here.

+	     */

+	    return TRUE;

+	case xf86SetConfigChecked:

+

+	    /* The configuration was acceptable, but the driver

+	     * didn't actually do anything. Go ask the DIX code

+	     * to do the mode setting operation using the simpler

+	     * interfaces

+	     */

+	    break;

+	}

+    }

+    return miRRSetCrtcConfigs(screen, screen_config, crtc_configs, num_configs);

+}

+

 static Bool

 xf86RandR12EnterVT (int screen_index, int flags)

 {

@@ -1733,6 +1958,7 @@ xf86RandR12EnterVT (int screen_index, int flags)
     XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);

     rrScrPrivPtr     rp = rrGetScrPriv(pScreen);

     Bool	     ret;

+    int i;

 

     if (randrp->orig_EnterVT) {

 	pScrn->EnterVT = randrp->orig_EnterVT;

@@ -1744,7 +1970,6 @@ xf86RandR12EnterVT (int screen_index, int flags)
     }

 

     /* reload gamma */

-    int i;

     for (i = 0; i < rp->numCrtcs; i++)

 	xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]);

 

@@ -1766,15 +1991,17 @@ xf86RandR12Init12 (ScreenPtr pScreen)
     rp->rrCrtcGetGamma = xf86RandR12CrtcGetGamma;

     rp->rrOutputSetProperty = xf86RandR12OutputSetProperty;

     rp->rrOutputValidateMode = xf86RandR12OutputValidateMode;

-#if RANDR_13_INTERFACE

     rp->rrOutputGetProperty = xf86RandR13OutputGetProperty;

     rp->rrGetPanning = xf86RandR13GetPanning;

     rp->rrSetPanning = xf86RandR13SetPanning;

-#endif

     rp->rrModeDestroy = xf86RandR12ModeDestroy;

     rp->rrSetConfig = NULL;

     pScrn->PointerMoved = xf86RandR12PointerMoved;

     pScrn->ChangeGamma = xf86RandR12ChangeGamma;

+    rp->rrSetCrtcSpriteTransform = xf86RandR14SetCrtcSpriteTransform;

+    rp->rrSetCrtcConfigs = xf86RRSetCrtcConfigs;

+    rp->rrQueryScanoutPixmaps = xf86RRQueryScanoutPixmaps;

+    rp->rrCreateScanoutPixmap = xf86RRCreateScanoutPixmap;

 

     randrp->orig_EnterVT = pScrn->EnterVT;

     pScrn->EnterVT = xf86RandR12EnterVT;

diff --git a/xorg-server/hw/xfree86/modes/xf86Rotate.c b/xorg-server/hw/xfree86/modes/xf86Rotate.c
index 655857597..0181bc381 100644
--- a/xorg-server/hw/xfree86/modes/xf86Rotate.c
+++ b/xorg-server/hw/xfree86/modes/xf86Rotate.c
@@ -369,6 +369,39 @@ xf86CrtcFitsScreen (xf86CrtcPtr crtc, struct pict_f_transform *crtc_to_fb)
 	    0 <= b.y1 && b.y2 <= pScrn->virtualY);

 }

 

+/*

+ * A subset of xf86CrtcRotate that just deals with

+ * cursor image/position transforms. Used when changing

+ * the cursor transform

+ */

+void

+xf86CrtcRotateCursor (xf86CrtcPtr crtc)

+{

+    /* if this is called during ScreenInit() we don't have pScrn->pScreen yet */

+    RRTransformPtr	transform = NULL;

+    PictTransform	crtc_to_fb;

+    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc, f_screen_to_crtc, f_crtc_to_cursor;

+

+    if (crtc->transformPresent)

+	transform = &crtc->transform;

+

+    (void) RRTransformCompute (crtc->x, crtc->y,

+			       crtc->mode.HDisplay, crtc->mode.VDisplay,

+			       crtc->rotation,

+			       transform,

+			       &crtc->user_sprite_position_transform,

+			       &crtc->user_sprite_image_transform,

+

+			       &crtc_to_fb,

+			       &f_crtc_to_fb,

+			       &f_fb_to_crtc,

+			       &f_screen_to_crtc,

+			       &f_crtc_to_cursor,

+			       &crtc->sprite_transform_in_use);

+    crtc->f_screen_to_crtc = f_screen_to_crtc;

+    crtc->f_crtc_to_cursor = f_crtc_to_cursor;

+}

+

 Bool

 xf86CrtcRotate (xf86CrtcPtr crtc)

 {

@@ -377,7 +410,7 @@ xf86CrtcRotate (xf86CrtcPtr crtc)
     /* if this is called during ScreenInit() we don't have pScrn->pScreen yet */

     ScreenPtr		pScreen = screenInfo.screens[pScrn->scrnIndex];

     PictTransform	crtc_to_fb;

-    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc;

+    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc, f_screen_to_crtc, f_crtc_to_cursor;

     xFixed		*new_params = NULL;

     int			new_nparams = 0;

     PictFilterPtr	new_filter = NULL;

@@ -393,10 +426,15 @@ xf86CrtcRotate (xf86CrtcPtr crtc)
 			     crtc->mode.HDisplay, crtc->mode.VDisplay,

 			     crtc->rotation,

 			     transform,

+			     &crtc->user_sprite_position_transform,

+			     &crtc->user_sprite_image_transform,

 

 			     &crtc_to_fb,

 			     &f_crtc_to_fb,

-			     &f_fb_to_crtc) &&

+			     &f_fb_to_crtc,

+			     &f_screen_to_crtc,

+			     &f_crtc_to_cursor,

+			     &crtc->sprite_transform_in_use) &&

 	xf86CrtcFitsScreen (crtc, &f_crtc_to_fb))

     {

 	/*

@@ -505,6 +543,8 @@ xf86CrtcRotate (xf86CrtcPtr crtc)
     crtc->crtc_to_framebuffer = crtc_to_fb;

     crtc->f_crtc_to_framebuffer = f_crtc_to_fb;

     crtc->f_framebuffer_to_crtc = f_fb_to_crtc;

+    crtc->f_screen_to_crtc = f_screen_to_crtc;

+    crtc->f_crtc_to_cursor = f_crtc_to_cursor;

     free(crtc->params);

     crtc->params = new_params;

     crtc->nparams = new_nparams;

diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_agp.c b/xorg-server/hw/xfree86/os-support/solaris/sun_agp.c
index b85a3c86b..99c3abde5 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_agp.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_agp.c
@@ -318,7 +318,7 @@ xf86EnableAGP(int screenNum, CARD32 mode)
 	if (ioctl(gartFd, AGPIOC_SETUP, &setup) != 0) {

 		xf86DrvMsg(screenNum, X_WARNING, "xf86EnableAGP: "

 		    "AGPIOC_SETUP with mode %x failed (%s)\n",

-		    mode, strerror(errno));

+		    (unsigned int) mode, strerror(errno));

 		return FALSE;

 	}

 

diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_init.c b/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
index 4716da93e..ae9adee4b 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_init.c
@@ -71,7 +71,6 @@ xf86OpenConsole(void)
     int fd;

     struct vt_mode VT;

     struct vt_stat vtinfo;

-    int FreeVTslot;

     MessageType from = X_PROBED;

 #endif

 

@@ -95,8 +94,8 @@ xf86OpenConsole(void)
 	    }

 	    else

 	    {

-		if ((int)mmap(0, 0x1000, PROT_NONE,

-			      MAP_FIXED | MAP_SHARED, fd, 0) == -1)

+		if (mmap(0, 0x1000, PROT_NONE,

+			 MAP_FIXED | MAP_SHARED, fd, 0) == MAP_FAILED)

 		    xf86Msg(X_WARNING,

 			"xf86OpenConsole: failed to protect page 0 (%s)\n",

 			strerror(errno));

@@ -413,7 +412,7 @@ xf86ProcessArgument(int argc, char **argv, int i)
     return 0;

 }

 

-void xf86UseMsg()

+void xf86UseMsg(void)

 {

 #ifdef HAS_USL_VTS

     ErrorF("vtX                    Use the specified VT number\n");

diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c b/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c
index 5089ae74d..1991289fd 100644
--- a/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/xorg-server/hw/xfree86/os-support/solaris/sun_vid.c
@@ -1,259 +1,258 @@
-/*
- * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany
- * Copyright 1993 by David Wexelblat <dwex@goblin.org>
- * Copyright 1999 by David Holland <davidh@iquest.net>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the names of 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.
- *
- */
-/* Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <sys/types.h> /* get __x86 definition if not set by compiler */
-
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-# define _NEED_SYSI86
-#endif
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86_OSlib.h"
-#include "xf86OSpriv.h"
-#include <sys/mman.h>
-
-/***************************************************************************/
-/* Video Memory Mapping section 					   */
-/***************************************************************************/
-
-static char *apertureDevName = NULL;
-static int apertureDevFD_ro = -1;
-static int apertureDevFD_rw = -1;
-
-static Bool
-solOpenAperture(void)
-{
-    if (apertureDevName == NULL)
-    {
-	apertureDevName = "/dev/xsvc";
-	if ((apertureDevFD_rw = open(apertureDevName, O_RDWR)) < 0)
-	{
-	    xf86MsgVerb(X_WARNING, 0,
-			"solOpenAperture: failed to open %s (%s)\n",
-			apertureDevName, strerror(errno));
-	    apertureDevName = "/dev/fbs/aperture";
-	    apertureDevFD_rw = open(apertureDevName, O_RDWR);
-	}
-	apertureDevFD_ro = open(apertureDevName, O_RDONLY);
-
-	if ((apertureDevFD_rw < 0) || (apertureDevFD_ro < 0))
-	{
-	    xf86MsgVerb(X_WARNING, 0,
-			"solOpenAperture: failed to open %s (%s)\n",
-			apertureDevName, strerror(errno));
-	    xf86MsgVerb(X_WARNING, 0,
-			"solOpenAperture: either /dev/fbs/aperture"
-			" or /dev/xsvc required\n");
-
-	    apertureDevName = NULL;
-
-	    if (apertureDevFD_rw >= 0)
-	    {
-		close(apertureDevFD_rw);
-	    }
-	    apertureDevFD_rw = -1;
-
-	    if (apertureDevFD_ro >= 0)
-	    {
-		close(apertureDevFD_ro);
-	    }
-	    apertureDevFD_ro = -1;
-
-	    return FALSE;
-	}
-    }
-    return TRUE;
-}
-
-static pointer
-solMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
-{
-    pointer base;
-    int fd;
-    int prot;
-
-    if (Flags & VIDMEM_READONLY)
-    {
-	fd = apertureDevFD_ro;
-	prot = PROT_READ;
-    }
-    else
-    {
-	fd = apertureDevFD_rw;
-	prot = PROT_READ | PROT_WRITE;
-    }
-
-    if (fd < 0)
-    {
-	xf86DrvMsg(ScreenNum, X_ERROR,
-		   "solMapVidMem: failed to open %s (%s)\n",
-		   apertureDevName, strerror(errno));
-	return NULL;
-    }
-
-    base = mmap(NULL, Size, prot, MAP_SHARED, fd, (off_t)Base);
-
-    if (base == MAP_FAILED) {
-        xf86DrvMsg(ScreenNum, X_ERROR,
-		   "solMapVidMem: failed to mmap %s (0x%08lx,0x%lx) (%s)\n",
-		   apertureDevName, Base, Size, strerror(errno));
-	return NULL;
-    }
-
-    return base;
-}
-
-/* ARGSUSED */
-static void
-solUnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
-{
-    if (munmap(Base, Size) != 0) {
-	xf86DrvMsgVerb(ScreenNum, X_WARNING, 0,
-		       "solUnMapVidMem: failed to unmap %s"
-		       " (0x%08lx,0x%lx) (%s)\n",
-		       apertureDevName, Base, Size,
-		       strerror(errno));
-    }
-}
-
-_X_HIDDEN void
-xf86OSInitVidMem(VidMemInfoPtr pVidMem)
-{
-    pVidMem->linearSupported = solOpenAperture();
-    if (pVidMem->linearSupported) {
-	pVidMem->mapMem = solMapVidMem;
-	pVidMem->unmapMem = solUnMapVidMem;
-    } else {
-	xf86MsgVerb(X_WARNING, 0,
-		    "xf86OSInitVidMem: linear memory access disabled\n");
-    }
-    pVidMem->initialised = TRUE;
-}
-
-/*
- * Read BIOS via mmap()ing physical memory.
- */
-int
-xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
-	     int Len)
-{
-    unsigned char *ptr;
-    int psize;
-    int mlen;
-
-    psize = getpagesize();
-    Offset += Base & (psize - 1);
-    Base &= ~(psize - 1);
-    mlen = (Offset + Len + psize - 1) & ~(psize - 1);
-
-    if (solOpenAperture() == FALSE)
-    {
-	xf86Msg(X_WARNING,
-		"xf86ReadBIOS: Failed to open aperture to read BIOS\n");
-	return -1;
-    }
-
-    ptr = (unsigned char *)mmap(NULL, mlen, PROT_READ,
-				MAP_SHARED, apertureDevFD_ro, (off_t)Base);
-    if (ptr == MAP_FAILED)
-    {
-	xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed [0x%08lx, 0x%04x]\n",
-		apertureDevName, Base, mlen);
-	return -1;
-    }
-
-    (void)memcpy(Buf, (void *)(ptr + Offset), Len);
-    if (munmap((caddr_t)ptr, mlen) != 0) {
-	xf86MsgVerb(X_WARNING, 0,
-		    "solUnMapVidMem: failed to unmap %s"
-		    " (0x%08lx,0x%lx) (%s)\n",
-		    apertureDevName, ptr, mlen, strerror(errno));
-    }
-
-    return Len;
-}
-
-
-/***************************************************************************/
-/* I/O Permissions section						   */
-/***************************************************************************/
-
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-static Bool ExtendedEnabled = FALSE;
-#endif
-
-Bool
-xf86EnableIO(void)
-{
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-    if (ExtendedEnabled)
-	return TRUE;
-
-    if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {
-	xf86Msg(X_WARNING, "xf86EnableIOPorts: Failed to set IOPL for I/O\n");
-	return FALSE;
-    }
-    ExtendedEnabled = TRUE;
-#endif /* i386 */
-    return TRUE;
-}
-
-void
-xf86DisableIO(void)
-{
-#if defined(__i386__) || defined(__i386) || defined(__x86)
-    if(!ExtendedEnabled)
-	return;
-
-    sysi86(SI86V86, V86SC_IOPL, 0);
-
-    ExtendedEnabled = FALSE;
-#endif /* i386 */
-}
+/*

+ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany

+ * Copyright 1993 by David Wexelblat <dwex@goblin.org>

+ * Copyright 1999 by David Holland <davidh@iquest.net>

+ *

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

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

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

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

+ * that the names of 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.

+ *

+ */

+/* Copyright 2008 Sun Microsystems, Inc.  All rights reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) shall be included in all copies or substantial portions of the

+ * Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

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

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

+ * DEALINGS IN THE SOFTWARE.

+ */

+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include <sys/types.h> /* get __x86 definition if not set by compiler */

+

+#if defined(__i386__) || defined(__i386) || defined(__x86)

+# define _NEED_SYSI86

+#endif

+#include "xf86.h"

+#include "xf86Priv.h"

+#include "xf86_OSlib.h"

+#include "xf86OSpriv.h"

+#include <sys/mman.h>

+

+/***************************************************************************/

+/* Video Memory Mapping section 					   */

+/***************************************************************************/

+

+static char *apertureDevName = NULL;

+static int apertureDevFD_ro = -1;

+static int apertureDevFD_rw = -1;

+

+static Bool

+solOpenAperture(void)

+{

+    if (apertureDevName == NULL)

+    {

+	apertureDevName = "/dev/xsvc";

+	if ((apertureDevFD_rw = open(apertureDevName, O_RDWR)) < 0)

+	{

+	    xf86MsgVerb(X_WARNING, 0,

+			"solOpenAperture: failed to open %s (%s)\n",

+			apertureDevName, strerror(errno));

+	    apertureDevName = "/dev/fbs/aperture";

+	    apertureDevFD_rw = open(apertureDevName, O_RDWR);

+	}

+	apertureDevFD_ro = open(apertureDevName, O_RDONLY);

+

+	if ((apertureDevFD_rw < 0) || (apertureDevFD_ro < 0))

+	{

+	    xf86MsgVerb(X_WARNING, 0,

+			"solOpenAperture: failed to open %s (%s)\n",

+			apertureDevName, strerror(errno));

+	    xf86MsgVerb(X_WARNING, 0,

+			"solOpenAperture: either /dev/fbs/aperture"

+			" or /dev/xsvc required\n");

+

+	    apertureDevName = NULL;

+

+	    if (apertureDevFD_rw >= 0)

+	    {

+		close(apertureDevFD_rw);

+	    }

+	    apertureDevFD_rw = -1;

+

+	    if (apertureDevFD_ro >= 0)

+	    {

+		close(apertureDevFD_ro);

+	    }

+	    apertureDevFD_ro = -1;

+

+	    return FALSE;

+	}

+    }

+    return TRUE;

+}

+

+static pointer

+solMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)

+{

+    pointer base;

+    int fd;

+    int prot;

+

+    if (Flags & VIDMEM_READONLY)

+    {

+	fd = apertureDevFD_ro;

+	prot = PROT_READ;

+    }

+    else

+    {

+	fd = apertureDevFD_rw;

+	prot = PROT_READ | PROT_WRITE;

+    }

+

+    if (fd < 0)

+    {

+	xf86DrvMsg(ScreenNum, X_ERROR,

+		   "solMapVidMem: failed to open %s (%s)\n",

+		   apertureDevName, strerror(errno));

+	return NULL;

+    }

+

+    base = mmap(NULL, Size, prot, MAP_SHARED, fd, (off_t)Base);

+

+    if (base == MAP_FAILED) {

+        xf86DrvMsg(ScreenNum, X_ERROR,

+		   "solMapVidMem: failed to mmap %s (0x%08lx,0x%lx) (%s)\n",

+		   apertureDevName, Base, Size, strerror(errno));

+	return NULL;

+    }

+

+    return base;

+}

+

+/* ARGSUSED */

+static void

+solUnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)

+{

+    if (munmap(Base, Size) != 0) {

+	xf86DrvMsgVerb(ScreenNum, X_WARNING, 0,

+		       "solUnMapVidMem: failed to unmap %s"

+		       " (0x%p,0x%lx) (%s)\n",

+		       apertureDevName, Base, Size,

+		       strerror(errno));

+    }

+}

+

+_X_HIDDEN void

+xf86OSInitVidMem(VidMemInfoPtr pVidMem)

+{

+    pVidMem->linearSupported = solOpenAperture();

+    if (pVidMem->linearSupported) {

+	pVidMem->mapMem = solMapVidMem;

+	pVidMem->unmapMem = solUnMapVidMem;

+    } else {

+	xf86MsgVerb(X_WARNING, 0,

+		    "xf86OSInitVidMem: linear memory access disabled\n");

+    }

+    pVidMem->initialised = TRUE;

+}

+

+/*

+ * Read BIOS via mmap()ing physical memory.

+ */

+int

+xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,

+	     int Len)

+{

+    unsigned char *ptr;

+    int psize;

+    int mlen;

+

+    psize = getpagesize();

+    Offset += Base & (psize - 1);

+    Base &= ~(psize - 1);

+    mlen = (Offset + Len + psize - 1) & ~(psize - 1);

+

+    if (solOpenAperture() == FALSE)

+    {

+	xf86Msg(X_WARNING,

+		"xf86ReadBIOS: Failed to open aperture to read BIOS\n");

+	return -1;

+    }

+

+    ptr = (unsigned char *)mmap(NULL, mlen, PROT_READ,

+				MAP_SHARED, apertureDevFD_ro, (off_t)Base);

+    if (ptr == MAP_FAILED)

+    {

+	xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed [0x%08lx, 0x%04x]\n",

+		apertureDevName, Base, mlen);

+	return -1;

+    }

+

+    (void)memcpy(Buf, (void *)(ptr + Offset), Len);

+    if (munmap((caddr_t)ptr, mlen) != 0) {

+	xf86MsgVerb(X_WARNING, 0,

+		    "xf86ReadBIOS: failed to unmap %s (0x%p,0x%x) (%s)\n",

+		    apertureDevName, ptr, mlen, strerror(errno));

+    }

+

+    return Len;

+}

+

+

+/***************************************************************************/

+/* I/O Permissions section						   */

+/***************************************************************************/

+

+#if defined(__i386__) || defined(__i386) || defined(__x86)

+static Bool ExtendedEnabled = FALSE;

+#endif

+

+Bool

+xf86EnableIO(void)

+{

+#if defined(__i386__) || defined(__i386) || defined(__x86)

+    if (ExtendedEnabled)

+	return TRUE;

+

+    if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) < 0) {

+	xf86Msg(X_WARNING, "xf86EnableIOPorts: Failed to set IOPL for I/O\n");

+	return FALSE;

+    }

+    ExtendedEnabled = TRUE;

+#endif /* i386 */

+    return TRUE;

+}

+

+void

+xf86DisableIO(void)

+{

+#if defined(__i386__) || defined(__i386) || defined(__x86)

+    if(!ExtendedEnabled)

+	return;

+

+    sysi86(SI86V86, V86SC_IOPL, 0);

+

+    ExtendedEnabled = FALSE;

+#endif /* i386 */

+}

diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index 4dbe74b97..56021ed0a 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -792,7 +792,7 @@ xf86SetRootClip (ScreenPtr pScreen, int enable)
     WindowPtr	pChild;

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

     Bool	anyMarked = TRUE;

-    RegionPtr	pOldClip = NULL, bsExposed;

+    RegionPtr	pOldClip = NULL;

     WindowPtr   pLayerWin;

     BoxRec	box;

 

diff --git a/xorg-server/hw/xquartz/mach-startup/bundle-main.c b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
index e6386dc3a..aaff1c625 100644
--- a/xorg-server/hw/xquartz/mach-startup/bundle-main.c
+++ b/xorg-server/hw/xquartz/mach-startup/bundle-main.c
@@ -74,7 +74,7 @@ extern int noPanoramiXExtension;
 #endif

 

 static char __crashreporter_info_buff__[4096] = {0};

-static const char *__crashreporter_info__ = &__crashreporter_info_buff__[0];

+static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0];

 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050

 // This is actually a toolchain requirement, but I'm not sure the correct check,

 // but it should be fine to just only include it for Leopard and later.  This line

diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index 7a92755c7..aed063489 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -62,6 +62,7 @@
 #include <sys/stat.h>

 #include <fcntl.h>

 #include <IOKit/pwr_mgt/IOPMLib.h>

+#include <pthread.h>

 

 #include <rootlessCommon.h>

 #include <Xplugin.h>

@@ -246,6 +247,40 @@ void QuartzUpdateScreens(void) {
     quartzProcs->UpdateScreen(pScreen);

 }

 

+static void pokeActivityCallback(CFRunLoopTimerRef timer, void *info) {

+    UpdateSystemActivity(OverallAct);

+}

+

+static void QuartzScreenSaver(int state) {

+    static CFRunLoopTimerRef pokeActivityTimer = NULL;

+    static CFRunLoopTimerContext pokeActivityContext = { 0, NULL, NULL, NULL, NULL };

+    static pthread_mutex_t pokeActivityMutex = PTHREAD_MUTEX_INITIALIZER;

+

+    pthread_mutex_lock(&pokeActivityMutex);

+    

+    if(state) {

+        if(pokeActivityTimer == NULL)

+            goto QuartzScreenSaverEnd;

+

+        CFRunLoopTimerInvalidate(pokeActivityTimer);

+        CFRelease(pokeActivityTimer);

+        pokeActivityTimer = NULL;

+    } else {

+        if(pokeActivityTimer != NULL)

+            goto QuartzScreenSaverEnd;

+        

+        pokeActivityTimer = CFRunLoopTimerCreate(NULL, CFAbsoluteTimeGetCurrent(), 30, 0, 0, pokeActivityCallback, &pokeActivityContext);

+        if(pokeActivityTimer == NULL) {

+            ErrorF("Unable to create pokeActivityTimer.\n");

+            goto QuartzScreenSaverEnd;

+        }

+

+        CFRunLoopAddTimer(CFRunLoopGetMain(), pokeActivityTimer, kCFRunLoopCommonModes);

+    }

+QuartzScreenSaverEnd:

+    pthread_mutex_unlock(&pokeActivityMutex);

+}

+

 void QuartzShowFullscreen(int state) {

     int i;

     

@@ -256,6 +291,8 @@ void QuartzShowFullscreen(int state) {
         return;

     }

     

+    QuartzScreenSaver(!state);

+    

     if(XQuartzFullscreenVisible == state)

         return;

     

diff --git a/xorg-server/hw/xquartz/quartzRandR.c b/xorg-server/hw/xquartz/quartzRandR.c
index bc58e2341..64ad72d84 100644
--- a/xorg-server/hw/xquartz/quartzRandR.c
+++ b/xorg-server/hw/xquartz/quartzRandR.c
@@ -438,18 +438,16 @@ static Bool QuartzRandRSetConfig (ScreenPtr           pScreen,
 static Bool _QuartzRandRUpdateFakeModes (ScreenPtr pScreen) {

     QuartzScreenPtr pQuartzScreen = QUARTZ_PRIV(pScreen);

 

-    if (pQuartzScreen->displayCount == 1) {

-        if(pQuartzScreen->fullscreenMode.ref)

-            CFRelease(pQuartzScreen->fullscreenMode.ref);

-        if(pQuartzScreen->currentMode.ref)

-            CFRelease(pQuartzScreen->currentMode.ref);

+    if(pQuartzScreen->fullscreenMode.ref)

+        CFRelease(pQuartzScreen->fullscreenMode.ref);

+    if(pQuartzScreen->currentMode.ref)

+        CFRelease(pQuartzScreen->currentMode.ref);

         

-        if (!QuartzRandRCopyCurrentModeInfo(pQuartzScreen->displayIDs[0],

-                                            &pQuartzScreen->fullscreenMode))

-            return FALSE;

+    if (!QuartzRandRCopyCurrentModeInfo(pQuartzScreen->displayIDs[0],

+                                        &pQuartzScreen->fullscreenMode))

+        return FALSE;

 

-        CFRetain(pQuartzScreen->fullscreenMode.ref);  /* This extra retain is for currentMode's copy */

-    } else {

+    if (pQuartzScreen->displayCount > 1) {

         pQuartzScreen->fullscreenMode.width = pScreen->width;

         pQuartzScreen->fullscreenMode.height = pScreen->height;

         if(XQuartzIsRootless)

@@ -467,6 +465,11 @@ static Bool _QuartzRandRUpdateFakeModes (ScreenPtr pScreen) {
     } else {

         pQuartzScreen->currentMode = pQuartzScreen->fullscreenMode;

     }

+

+    /* This extra retain is for currentMode's copy.

+     * fullscreen and rootless share a retain.

+     */

+    CFRetain(pQuartzScreen->currentMode.ref);

     

     DEBUG_LOG("rootlessMode: %d x %d\n", (int)pQuartzScreen->rootlessMode.width, (int)pQuartzScreen->rootlessMode.height);

     DEBUG_LOG("fullscreenMode: %d x %d\n", (int)pQuartzScreen->fullscreenMode.width, (int)pQuartzScreen->fullscreenMode.height);