xorg-server: Changes to 'debian-squeeze'

[Cyril Brulebois <kibi@alioth.debian.org>]

 debian/changelog |    3 +++
 randr/rrscreen.c |   12 ------------
 2 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 5fea0ae92d7a9d28c41f1baa065ef3f44f0dcb2d
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Feb 9 11:16:49 2011 +0100

    Document the merge to fix #611619.

diff --git a/debian/changelog b/debian/changelog
index 5815ac3..cc53af8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ xorg-server (2:1.7.7-13) UNRELEASED; urgency=low
   * bug script: Report KMS configuration files and their contents.
   * bug script: Keep only one lspci call (with proper filtering), which
     makes PCI IDs come back.
+  * Merge from server-1.7-branch, fixing broken rotation with nvidia
+    driver (Closes: #611619):
+    - Revert "randr: check for virtual size limits before set crtc"
 
  -- Cyril Brulebois <kibi@debian.org>  Wed, 09 Feb 2011 10:24:10 +0100
 

commit d77ffa918b2aaa3ca1deb17ed0145199d0f863da
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Jan 31 14:14:47 2011 +0100

    Revert "randr: check for virtual size limits before set crtc"
    
    Apparently these checks break rotation with the nvidia drivers:
    https://bbs.archlinux.org/viewtopic.php?pid=877761
    http://bugs.debian.org/611619
    Let's not do that in a stable branch.
    
    This reverts commit 6a6d907e77777057cadbd80572119c09732385cd.
    
    Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index 0fee1f5..630ff57 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -921,18 +921,6 @@ ProcRRSetScreenConfig (ClientPtr client)
 	width = mode->mode.height;
 	height = mode->mode.width;
     }
-
-    if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) {
-	client->errorValue = width;
-	free(pData);
-	return BadValue;
-    }
-    if (height < pScrPriv->minHeight || pScrPriv->maxHeight < height) {
-	client->errorValue = height;
-	free(pData);
-	return BadValue;
-    }
-
     if (width != pScreen->width || height != pScreen->height)
     {
 	int	c;

commit 5549d99acbc38c8a1f12d649c42f044392ec7af0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Fri Sep 3 11:54:41 2010 +1000

    mi: handle DGA subtypes when determining the master device.
    
    The subtype in the DGA event is the core type and all ET_ event types (where
    applicable) are identical to the core types. Thus the switch statement below
    will work as required and assign the right master device.
    
    Fixes a crasher bug on keyboard devices with valuators. If a device sends a
    motion event while grabbed and a DGA client is active (but has not selected
    input through DGA), the valuator event is posted through the VCK and
    eventually results in a NULL-pointer dereference on dev->valuator.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit 31ab9f8860848504df18a8be9d19b817b191e0df)
    (cherry picked from commit faecab3b13bbaecf4f35f49b833d1b79a5fb647d)

diff --git a/mi/mieq.c b/mi/mieq.c
index 9b6d0c9..97f4afc 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -320,6 +320,7 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
 {
     DeviceIntPtr mdev;
     int len = original->any.length;
+    int type = original->any.type;
 
     CHECKEVENT(original);
 
@@ -327,7 +328,12 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
     if (!sdev || !sdev->u.master)
         return NULL;
 
-    switch(original->any.type)
+#if XFreeXDGA
+    if (type == ET_DGAEvent)
+        type = original->dga_event.subtype;
+#endif
+
+    switch(type)
     {
         case ET_KeyPress:
         case ET_KeyRelease: