diff options
| author | tsi <tsi> | 2008-04-24 20:54:52 +0000 |
|---|---|---|
| committer | tsi <tsi> | 2008-04-24 20:54:52 +0000 |
| commit | 149f96f6b3a73ce262ef7c434cc7aaf431946d69 (patch) | |
| tree | 2fc750748cdae6704f1c6e1e400ca0ac25bd3331 | |
| parent | 111d402d1ae163848d5401d1322df120ac4415e5 (diff) | |
40. Rework the handling of unassigned PCI resources in the server to ensure
they are reassigned while the server is running and restore them to their
unassigned state on server exit (Marc La France).
| -rw-r--r-- | programs/Xserver/hw/xfree86/CHANGELOG | 5 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/os-support/bus/Pci.c | 9 | ||||
| -rw-r--r-- | programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h | 3 |
3 files changed, 6 insertions, 11 deletions
diff --git a/programs/Xserver/hw/xfree86/CHANGELOG b/programs/Xserver/hw/xfree86/CHANGELOG index 491628e06..5134e0d6b 100644 --- a/programs/Xserver/hw/xfree86/CHANGELOG +++ b/programs/Xserver/hw/xfree86/CHANGELOG @@ -1,4 +1,7 @@ XFree86 4.7.99.17 (xx May 2008) + 40. Rework the handling of unassigned PCI resources in the server to ensure + they are reassigned while the server is running and restore them to their + unassigned state on server exit (Marc La France). 39. Change the scanpci and pcitweak utilities to simulate a completed master abort instead of reading PCI register 0xb8 of Sun's Simba PCI-to-PCI bridges, as reads of this register cause a PCI interrupt acknowledge @@ -20725,4 +20728,4 @@ XFree86 3.0a (28 April 1994) XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3949 2008/04/24 19:41:05 tsi Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3950 2008/04/24 20:10:08 tsi Exp $ diff --git a/programs/Xserver/hw/xfree86/os-support/bus/Pci.c b/programs/Xserver/hw/xfree86/os-support/bus/Pci.c index 45870ded3..72c0fb5d8 100644 --- a/programs/Xserver/hw/xfree86/os-support/bus/Pci.c +++ b/programs/Xserver/hw/xfree86/os-support/bus/Pci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v 1.100 2008/03/26 18:57:50 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v 1.101tsi Exp $ */ /* * Pci.c - New server PCI access functions * @@ -1552,13 +1552,6 @@ xf86scanpci(int flags) return pci_devp; } -CARD32 -pciCheckForBrokenBase(PCITAG Tag,int basereg) -{ - pciWriteLong(Tag, PCI_MAP_REG_START + (basereg << 2), 0xffffffff); - return pciReadLong(Tag, PCI_MAP_REG_START + (basereg << 2)); -} - #if defined(INCLUDE_XF86_MAP_PCI_MEM) pointer diff --git a/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h b/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h index 512e01b00..30f42fd63 100644 --- a/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h +++ b/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v 1.48tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v 1.49tsi Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * @@ -990,7 +990,6 @@ ADDRESS pciHostAddrToBusAddr(PCITAG tag, PciAddrType type, ADDRESS addr); PCITAG pciTag(int busnum, int devnum, int funcnum); int pciGetBaseSize(pciConfigPtr device, int indx, Bool destructive, int *min); -CARD32 pciCheckForBrokenBase(PCITAG tag,int basereg); Bool xf86LocatePciMemoryArea(PCITAG tag, char **devName, unsigned int *devOffset, unsigned int *fbSize, |