Merge lp:~chalet16/ubuntu/natty/xorg-server/fix-for-518132 into lp:ubuntu/natty/xorg-server

[chalet16]

This branch will fix #518132 bug which make Ubuntu with nvidia proprietary driver unable to rotate screen using xrandr -o.

This bug has also fixed in upstream Debian package which can located at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=611619

[Chris Halse Rogers (raof)]

This commit is not on the 1.10 stable branch. It looks to me like the packages in natty-updates should fix this bug also, by fixing the checks to take into account rotation.

review: Needs Fixing

Unmerged revisions

216. By chalet16 on 2011-05-08

Revert "randr: check for virtual size limits before set crtc", fixing
broken rotation with nvidia driver (LP: #518132)

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-19 16:12:14 +0000
+++ debian/changelog	2011-05-08 05:57:30 +0000
@@ -1,3 +1,10 @@
+xorg-server (2:1.10.1-1ubuntu2) natty; urgency=low
+
+  * Revert "randr: check for virtual size limits before set crtc", fixing 
+    broken rotation with nvidia driver (LP: #518132)
+
+ -- Witchakorn Kamolpornwijit <[e-mail]>  Sun, 08 May 2011 12:00:21 +0700
+
 xorg-server (2:1.10.1-1ubuntu1) natty; urgency=low
 
   * Merge from Debian experimental (LP: #757972)

=== added file 'debian/patches/503_revert_randr_check_virtual_size_limits.patch'
--- debian/patches/503_revert_randr_check_virtual_size_limits.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/503_revert_randr_check_virtual_size_limits.patch	2011-05-08 05:57:30 +0000
@@ -0,0 +1,25 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: xorg-server/randr/rrscreen.c
+===================================================================
+--- xorg-server.orig/randr/rrscreen.c	2011-05-08 12:00:15.326691052 +0700
++++ xorg-server/randr/rrscreen.c	2011-05-08 12:00:07.156691052 +0700
+@@ -916,17 +916,6 @@
+ 	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;

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-11 09:51:56 +0000
+++ debian/patches/series	2011-05-08 05:57:30 +0000
@@ -35,3 +35,4 @@
 500_xi2.1.patch
 501_xf86CoordinatesToWindow.patch
 502_gestures-extension.patch
+503_revert_randr_check_virtual_size_limits.patch