diff options
Diffstat (limited to 'meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch')
-rw-r--r-- | meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch b/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch deleted file mode 100644 index 2c4078a00..000000000 --- a/meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.2/50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | From 50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd Mon Sep 17 00:00:00 2001 | ||
2 | From: Aaron Plattner <aplattner@nvidia.com> | ||
3 | Date: Tue, 24 May 2011 23:02:42 +0000 | ||
4 | Subject: randr: check rotated virtual size limits correctly | ||
5 | |||
6 | Commit d1107918d4626268803b54033a07405122278e7f introduced checks to | ||
7 | the RandR path that cause RRSetScreenConfig requests to fail if the | ||
8 | size is too large. Unfortunately, when RandR 1.1 rotation is enabled | ||
9 | it compares the rotated screen dimensions to the unrotated limits, | ||
10 | which causes 90- and 270-degree rotation to fail unless your screen | ||
11 | happens to be square: | ||
12 | |||
13 | X Error of failed request: BadValue (integer parameter out of range for operation) | ||
14 | Major opcode of failed request: 153 (RANDR) | ||
15 | Minor opcode of failed request: 2 (RRSetScreenConfig) | ||
16 | Value in failed request: 0x780 | ||
17 | Serial number of failed request: 14 | ||
18 | Current serial number in output stream: 14 | ||
19 | |||
20 | Fix this by moving the check above the code that swaps the dimensions | ||
21 | based on the rotation. | ||
22 | |||
23 | Signed-off-by: Aaron Plattner <aplattner@nvidia.com> | ||
24 | Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> | ||
25 | Tested-by: Robert Hooker <robert.hooker@canonical.com> | ||
26 | Tested-by: Kent Baxley <kent.baxley@canonical.com> | ||
27 | Signed-off-by: Keith Packard <keithp@keithp.com> | ||
28 | (cherry picked from commit b6c7b9b2f39e970cedb6bc1e073f901e28cb0fa3) | ||
29 | --- | ||
30 | diff --git a/randr/rrscreen.c b/randr/rrscreen.c | ||
31 | index 1bc1a9e..da6d48d 100644 | ||
32 | --- a/randr/rrscreen.c | ||
33 | +++ b/randr/rrscreen.c | ||
34 | @@ -910,12 +910,6 @@ ProcRRSetScreenConfig (ClientPtr client) | ||
35 | */ | ||
36 | width = mode->mode.width; | ||
37 | height = mode->mode.height; | ||
38 | - if (rotation & (RR_Rotate_90|RR_Rotate_270)) | ||
39 | - { | ||
40 | - width = mode->mode.height; | ||
41 | - height = mode->mode.width; | ||
42 | - } | ||
43 | - | ||
44 | if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) { | ||
45 | client->errorValue = width; | ||
46 | free(pData); | ||
47 | @@ -927,6 +921,12 @@ ProcRRSetScreenConfig (ClientPtr client) | ||
48 | return BadValue; | ||
49 | } | ||
50 | |||
51 | + if (rotation & (RR_Rotate_90|RR_Rotate_270)) | ||
52 | + { | ||
53 | + width = mode->mode.height; | ||
54 | + height = mode->mode.width; | ||
55 | + } | ||
56 | + | ||
57 | if (width != pScreen->width || height != pScreen->height) | ||
58 | { | ||
59 | int c; | ||
60 | -- | ||
61 | cgit v0.8.3-6-g21f6 | ||