summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-xorg
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-06-09 15:20:10 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:16 +0100
commit62136c0e819fb2cb90b44d5f1029b8b09f287300 (patch)
tree89edcf4700b1e0b091515cf7eaed2d1487857272 /meta/recipes-graphics/xorg-xserver/xserver-xorg
parentc929827695745cfc847485118d35ee89a5f76fa4 (diff)
downloadpoky-62136c0e819fb2cb90b44d5f1029b8b09f287300.tar.gz
xorg: fix VESA int10 error
When falling back to the VESA server, X fails to start due to an error reading the int10 vec. We cherry-pick the following commit to fix the error: commit 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Author: Jürg Billeter <j@bitron.ch> Date: Sat Feb 7 18:13:21 2015 +0100 int10: Fix error check for pci_device_map_legacy pci_device_map_legacy returns 0 on success. Signed-off-by: Jürg Billeter <j@bitron.ch> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (From OE-Core rev: e1570e12f92bf359ef34d0e2998b09981bcece18) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
new file mode 100644
index 0000000000..28b3218a30
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
@@ -0,0 +1,50 @@
1From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
3Date: Sat, 7 Feb 2015 18:13:21 +0100
4Subject: [PATCH] int10: Fix error check for pci_device_map_legacy
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9pci_device_map_legacy returns 0 on success.
10
11Upstream-status: backport 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56
12
13Signed-off-by: Jürg Billeter <j@bitron.ch>
14Reviewed-by: Adam Jackson <ajax@redhat.com>
15Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
16Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
17---
18 hw/xfree86/int10/generic.c | 2 +-
19 hw/xfree86/os-support/linux/int10/linux.c | 2 +-
20 2 files changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
23index 012d194..8d5c4da 100644
24--- a/hw/xfree86/int10/generic.c
25+++ b/hw/xfree86/int10/generic.c
26@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len)
27 {
28 void *map;
29
30- if (!pci_device_map_legacy(dev, 0, len, 0, &map))
31+ if (pci_device_map_legacy(dev, 0, len, 0, &map))
32 return FALSE;
33
34 memcpy(buf, map, len);
35diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
36index 79b9a88..6ca118f 100644
37--- a/hw/xfree86/os-support/linux/int10/linux.c
38+++ b/hw/xfree86/os-support/linux/int10/linux.c
39@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len)
40 {
41 void *map;
42
43- if (!pci_device_map_legacy(dev, base, len, 0, &map))
44+ if (pci_device_map_legacy(dev, base, len, 0, &map))
45 return FALSE;
46
47 memcpy(buf, map, len);
48--
492.1.4
50