Ubuntu

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

Proposed by chalet16 on 2011-05-08
Status: Work in progress
Proposed branch: lp:~chalet16/ubuntu/natty/xorg-server/fix-for-518132
Merge into: lp:ubuntu/natty/xorg-server
Diff against target: 53 lines (+33/-0) 3 files modified
To merge this branch: bzr merge lp:~chalet16/ubuntu/natty/xorg-server/fix-for-518132
Reviewer Review Type Date Requested Status
Chris Halse Rogers Needs Fixing on 2011-05-31
Ubuntu branches 2011-05-08 Pending
Review via email: mp+60297@code.launchpad.net

Description of the Change

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

To post a comment you must log in.
Chris Halse Rogers (raof) wrote :

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)

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-04-19 16:12:14 +0000
3+++ debian/changelog 2011-05-08 05:57:30 +0000
4@@ -1,3 +1,10 @@
5+xorg-server (2:1.10.1-1ubuntu2) natty; urgency=low
6+
7+ * Revert "randr: check for virtual size limits before set crtc", fixing
8+ broken rotation with nvidia driver (LP: #518132)
9+
10+ -- Witchakorn Kamolpornwijit <chalet16@gmail.com> Sun, 08 May 2011 12:00:21 +0700
11+
12 xorg-server (2:1.10.1-1ubuntu1) natty; urgency=low
13
14 * Merge from Debian experimental (LP: #757972)
15
16=== added file 'debian/patches/503_revert_randr_check_virtual_size_limits.patch'
17--- debian/patches/503_revert_randr_check_virtual_size_limits.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/503_revert_randr_check_virtual_size_limits.patch 2011-05-08 05:57:30 +0000
19@@ -0,0 +1,25 @@
20+## Description: add some description
21+## Origin/Author: add some origin or author
22+## Bug: bug URL
23+Index: xorg-server/randr/rrscreen.c
24+===================================================================
25+--- xorg-server.orig/randr/rrscreen.c 2011-05-08 12:00:15.326691052 +0700
26++++ xorg-server/randr/rrscreen.c 2011-05-08 12:00:07.156691052 +0700
27+@@ -916,17 +916,6 @@
28+ height = mode->mode.width;
29+ }
30+
31+- if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) {
32+- client->errorValue = width;
33+- free(pData);
34+- return BadValue;
35+- }
36+- if (height < pScrPriv->minHeight || pScrPriv->maxHeight < height) {
37+- client->errorValue = height;
38+- free(pData);
39+- return BadValue;
40+- }
41+-
42+ if (width != pScreen->width || height != pScreen->height)
43+ {
44+ int c;
45
46=== modified file 'debian/patches/series'
47--- debian/patches/series 2011-04-11 09:51:56 +0000
48+++ debian/patches/series 2011-05-08 05:57:30 +0000
49@@ -35,3 +35,4 @@
50 500_xi2.1.patch
51 501_xf86CoordinatesToWindow.patch
52 502_gestures-extension.patch
53+503_revert_randr_check_virtual_size_limits.patch

Subscribers

People subscribed via source and target branches

to all changes: