rpms/xorg-x11/FC-4 xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch, 1.5, 1.6 xorg-x11.spec, 1.210, 1.211
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Sep 13 18:37:15 UTC 2005
- Previous message (by thread): rpms/xorg-x11/FC-3 xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch, 1.2, 1.3 xorg-x11.spec, 1.80, 1.81
- Next message (by thread): rpms/firstboot/devel .cvsignore, 1.30, 1.31 firstboot.spec, 1.45, 1.46 sources, 1.45, 1.46
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sandmann
Update of /cvs/dist/rpms/xorg-x11/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv17157
Modified Files:
xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch
xorg-x11.spec
Log Message:
* Tue Sep 13 2005 Soren Sandmann <sandmann at redhat.com>
- Update linux-native-pciscan patch to not spew debug info.
xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch:
int10/helper_exec.c | 104 +++++++++++++++++++++++++++++++++++++++-------
os-support/bus/Pci.c | 61 +++++++++++++++++++++-----
os-support/bus/Pci.h | 8 +++
os-support/bus/linuxPci.c | 70 ++++++++++++++++++++++++++++++
4 files changed, 215 insertions(+), 28 deletions(-)
Index: xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/FC-4/xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch 13 Sep 2005 17:34:06 -0000 1.5
+++ xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch 13 Sep 2005 18:37:11 -0000 1.6
@@ -1,5 +1,5 @@
--- xc/programs/Xserver/hw/xfree86/int10/helper_exec.c.use-linux-native-pciscan-by-default 2004-04-23 15:54:06.000000000 -0400
-+++ xc/programs/Xserver/hw/xfree86/int10/helper_exec.c 2005-09-13 11:13:09.711709256 -0400
++++ xc/programs/Xserver/hw/xfree86/int10/helper_exec.c 2005-09-13 14:00:13.131077360 -0400
@@ -23,10 +23,12 @@
#include "int10Defines.h"
#include "xf86int10.h"
@@ -87,23 +87,7 @@
static CARD32 PciCfg1Addr = 0;
#define TAG(Cfg1Addr) (Cfg1Addr & 0xffff00)
-@@ -468,6 +469,8 @@
- static int
- pciCfg1in(CARD16 addr, CARD32 *val)
- {
-+ ErrorF ("inl: addr=0x%04x\n", addr);
-+
- if (addr == 0xCF8) {
- *val = PciCfg1Addr;
- return 1;
-@@ -482,17 +485,100 @@
- static int
- pciCfg1out(CARD16 addr, CARD32 val)
- {
-+ ErrorF ("outl: addr=0x%04x, val=0x%08x\n", addr, val);
-+
- if (addr == 0xCF8) {
- PciCfg1Addr = val;
+@@ -487,12 +488,85 @@
return 1;
}
if (addr == 0xCFC) {
@@ -119,8 +103,6 @@
+{
+ int offset, shift;
+
-+ ErrorF ("inw: addr=0x%04x\n", addr);
-+
+ if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
+ shift = (addr - 0xCF8) * 8;
+ *val = (PciCfg1Addr >> shift) & 0xffff;
@@ -139,8 +121,6 @@
+{
+ int offset, shift;
+
-+ ErrorF ("outw: addr=0x%04x, val=0x%04x\n", addr, val);
-+
+ if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
+ shift = (addr - 0xCF8) * 8;
+ PciCfg1Addr &= ~(0xffff << shift);
@@ -160,8 +140,6 @@
+{
+ int offset, shift;
+
-+ ErrorF ("inb: addr=0x%04x\n", addr);
-+
+ if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
+ shift = (addr - 0xCF8) * 8;
+ *val = (PciCfg1Addr >> shift) & 0xff;
@@ -180,8 +158,6 @@
+{
+ int offset, shift;
+
-+ ErrorF ("outb: addr=0x%04x, val=0x%02x\n", addr, val);
-+
+ if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
+ shift = (addr - 0xCF8) * 8;
+ PciCfg1Addr &= ~(0xff << shift);
@@ -199,8 +175,8 @@
CARD8
bios_checksum(CARD8 *start, int size)
---- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h.use-linux-native-pciscan-by-default 2005-09-13 11:13:09.634720960 -0400
-+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h 2005-09-13 11:13:09.711709256 -0400
+--- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h.use-linux-native-pciscan-by-default 2005-09-13 13:59:11.113505464 -0400
++++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h 2005-09-13 13:59:11.191493608 -0400
@@ -379,6 +379,14 @@
void (*pciGetBridgeBuses)(int, int *, int *, int *);
/* Use pointer's to avoid #include recursion */
@@ -217,7 +193,7 @@
/*
--- xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c.use-linux-native-pciscan-by-default 2004-12-15 00:48:20.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 2005-09-13 11:13:09.712709104 -0400
++++ xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 2005-09-13 13:59:11.192493456 -0400
@@ -60,12 +60,28 @@
static void linuxPciCfgWrite(PCITAG, int off, CARD32 val);
static void linuxPciCfgSetBits(PCITAG tag, int off, CARD32 mask, CARD32 bits);
@@ -308,7 +284,7 @@
/*
--- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c.use-linux-native-pciscan-by-default 2004-12-15 00:52:16.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c 2005-09-13 11:37:30.426646832 -0400
++++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c 2005-09-13 13:59:11.193493304 -0400
@@ -322,14 +322,24 @@
CARD32 tmp;
int shift = (offset & 3) * 8;
Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/FC-4/xorg-x11.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- xorg-x11.spec 13 Sep 2005 17:34:06 -0000 1.210
+++ xorg-x11.spec 13 Sep 2005 18:37:12 -0000 1.211
@@ -3596,6 +3596,9 @@
%changelog
* Tue Sep 13 2005 Soren Sandmann <sandmann at redhat.com>
+- Update linux-native-pciscan patch to not spew debug info.
+
+* Tue Sep 13 2005 Soren Sandmann <sandmann at redhat.com>
- Update linux-native-pciscan patch to correctly handle byte accesses
to PCI space
- Plug leak in shadow framebuffer (-shadow-framebuffer-leak.patch).
- Previous message (by thread): rpms/xorg-x11/FC-3 xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch, 1.2, 1.3 xorg-x11.spec, 1.80, 1.81
- Next message (by thread): rpms/firstboot/devel .cvsignore, 1.30, 1.31 firstboot.spec, 1.45, 1.46 sources, 1.45, 1.46
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list