xorg-server: patch from upstream to make xf86-video-vesa work again.
This commit is contained in:
parent
acbf733af1
commit
588fb238b0
|
@ -0,0 +1,43 @@
|
|||
From 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
|
||||
Date: Sat, 7 Feb 2015 18:13:21 +0100
|
||||
Subject: int10: Fix error check for pci_device_map_legacy
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
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>
|
||||
|
||||
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
|
||||
index 012d194..8d5c4da 100644
|
||||
--- hw/xfree86/int10/generic.c
|
||||
+++ hw/xfree86/int10/generic.c
|
||||
@@ -104,7 +104,7 @@ readIntVec(struct pci_device *dev, unsigned char *buf, int len)
|
||||
{
|
||||
void *map;
|
||||
|
||||
- if (!pci_device_map_legacy(dev, 0, len, 0, &map))
|
||||
+ if (pci_device_map_legacy(dev, 0, len, 0, &map))
|
||||
return FALSE;
|
||||
|
||||
memcpy(buf, map, len);
|
||||
diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
|
||||
index 79b9a88..6ca118f 100644
|
||||
--- hw/xfree86/os-support/linux/int10/linux.c
|
||||
+++ hw/xfree86/os-support/linux/int10/linux.c
|
||||
@@ -75,7 +75,7 @@ readLegacy(struct pci_device *dev, unsigned char *buf, int base, int len)
|
||||
{
|
||||
void *map;
|
||||
|
||||
- if (!pci_device_map_legacy(dev, base, len, 0, &map))
|
||||
+ if (pci_device_map_legacy(dev, base, len, 0, &map))
|
||||
return FALSE;
|
||||
|
||||
memcpy(buf, map, len);
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template build file for 'xorg-server'.
|
||||
pkgname=xorg-server
|
||||
version=1.17.1
|
||||
revision=3
|
||||
revision=4
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
|
||||
--enable-xnest --enable-xephyr --enable-composite --enable-xvfb
|
||||
|
|
Loading…
Reference in New Issue