xserver: Branch 'master'
Matthias Hopf
mhopf at kemper.freedesktop.org
Thu May 10 06:26:24 PDT 2007
hw/xfree86/os-support/bus/Pci.h | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
New commits:
diff-tree ebaa6c920c82401952a0ccc991b94574306449bd (from 86c4941727f7c673ae6bb88c67443fa25935c7f5)
Author: Matthias Hopf <mhopf at suse.de>
Date: Thu May 10 15:25:31 2007 +0200
Disable Simba PCI bridge routing code (Bug #8020).
The code in hw/xfree86/os-support/bus/sparcPci.c:simbaCheckBus()
is trying to mimmick VGA routing by disabling I/O space responses
behind the Simba PCI-PCI controller.
Unfortunately, doing this also happens to disable access to the
IDE controller I/O space registers, thus crashing the system. The
granularity of the I/O disabling in the Simba controller is not
fine enough to disable VGA without also disabling the IDE controller
registers.
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index 7cc882d..f0cb916 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -327,7 +327,7 @@
# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
-# if !defined(__FreeBSD__)
+# if !defined(__FreeBSD__) && !defined(linux)
# define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
# endif
#elif defined(__amd64__) || defined(__amd64)
More information about the xorg-commit
mailing list