xserver: Branch 'server-1.5-branch'

[Aaron Plattner]

 hw/xfree86/common/xf86RandR.c |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

New commits:
commit 75b5e999f045524e2b362e848a0104e1a4217061
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Mon Jun 30 17:29:35 2008 -0700

    Work around the DIX losing mmWidth/mmHeight for RandR 1.1 DDXen.
    
    RandR 1.1 has a physical size for each mode.  It used to be that the DIX would
    remember these modes and pass them back up to the DDX when changing the screen
    configuration.  The DDX uses RR_GET_MODE_MM to query the driver for the physical
    dimensions of the screen, allowing it to preserve the DPI.
    
    With RandR 1.2, the physical dimensions are stored as part of the output, rather
    than per mode.  The DIX only uses the sizes passed in from the DDX to select the
    mode pool for the "default" output, and forgets the physical sizes.  Then, when
    reconfiguring the screen, it makes up a new RRScreenSizeRec using the dimensions
    from the output, screwing up the DPI.
    
    This change works around this problem by ignoring the DIX and querying the real
    size from the driver.
    (cherry picked from commit 2e8daee05343b2853b677acf4554def0ceeada00)

diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index 4432ad9..4ee0d8b 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -170,6 +170,25 @@ xf86RandRSetMode (ScreenPtr	    pScreen,
 	scrp->virtualX = mode->HDisplay;
 	scrp->virtualY = mode->VDisplay;
     }
+
+    /*
+     * The DIX forgets the physical dimensions we passed into RRRegisterSize, so
+     * reconstruct them if possible.
+     */
+    if(scrp->DriverFunc) {
+	xorgRRModeMM RRModeMM;
+
+	RRModeMM.mode = mode;
+	RRModeMM.virtX = scrp->virtualX;
+	RRModeMM.virtY = scrp->virtualY;
+	RRModeMM.mmWidth = mmWidth;
+	RRModeMM.mmHeight = mmHeight;
+
+	(*scrp->DriverFunc)(scrp, RR_GET_MODE_MM, &RRModeMM);
+
+	mmWidth = RRModeMM.mmWidth;
+	mmHeight = RRModeMM.mmHeight;
+    }
     if(randrp->rotation & (RR_Rotate_90 | RR_Rotate_270))
     {
 	/* If the screen is rotated 90 or 270 degrees, swap the sizes. */