OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=43

p_pci-domain.diff

@@ -1,11 +0,0 @@
---- hw/xfree86/os-support/bus/xf86Pci.h.p_pci-domain.diff	2006-11-13 19:59:23.000000000 +0100
-+++ hw/xfree86/os-support/bus/xf86Pci.h	2006-11-14 05:39:22.000000000 +0100
-@@ -767,6 +767,8 @@
- ADDRESS	      pciHostAddrToBusAddr(PCITAG tag, PciAddrType type, ADDRESS addr);
- PCITAG	      pciTag(int busnum, int devnum, int funcnum);
- PCITAG	      pciDomTag(int domnum, int busnum, int devnum, int funcnum);
-+void	      pciInfoFromTag(PCITAG tag, int *domainnum,
-+				int *busnum, int *devnum, int *funcnum);
- int	      pciGetBaseSize(PCITAG tag, int indx, Bool destructive, Bool *min);
- CARD32	      pciCheckForBrokenBase(PCITAG tag,int basereg);
- pointer	      xf86MapPciMem(int ScreenNum, int Flags, PCITAG Tag,

p_pci-off-by-one.diff

@@ -1,11 +1,60 @@
---- hw/xfree86/os-support/bus/linuxPci.c.orig	2006-11-20 22:04:35.000000000 +0100
+--- hw/xfree86/os-support/bus/linuxPci.c
-+++ hw/xfree86/os-support/bus/linuxPci.c	2006-11-20 22:06:08.000000000 +0100
++++ hw/xfree86/os-support/bus/linuxPci.c
-@@ -547,7 +547,7 @@
+@@ -550,7 +550,7 @@ xf86GetPciDomain(PCITAG Tag)
-     pPCI = xf86GetPciHostConfigFromTag(Tag);
+ 	return result;
- 
-     if (pPCI && (result = PCI_DOM_FROM_BUS(pPCI->busnum)))
--	return result;
-+	return result + 1;
  
      if (!pPCI || pPCI->fakeDevice)
- 	return 1;		/* Domain 0 is reserved */
+-	return 1;		/* Domain 0 is reserved */
++	return 0;
+ 
+     if ((fd = linuxPciOpenFile(pPCI ? pPCI->tag : 0,FALSE)) < 0)
+ 	return 0;
+@@ -558,7 +558,7 @@ xf86GetPciDomain(PCITAG Tag)
+     if ((result = ioctl(fd, PCIIOC_CONTROLLER, 0)) < 0)
+ 	return 0;
+ 
+-    return result + 1;		/* Domain 0 is reserved */
++    return result;
+ }
+ 
+ static pointer
+@@ -628,7 +628,7 @@ linuxMapPci(int ScreenNum, int Flags, PC
+     return NULL;
+ }
+ 
+-#define MAX_DOMAINS 257
++#define MAX_DOMAINS 256
+ static pointer DomainMmappedIO[MAX_DOMAINS];
+ 
+ static int
+@@ -649,11 +649,10 @@ linuxOpenLegacy(PCITAG Tag, char *name)
+ 	domain = xf86GetPciDomain(Tag);
+ 	bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(Tag));
+ 
+-	/* Domain 0 is reserved -- see xf86GetPciDomain() */
+-	if ((domain <= 0) || (domain >= MAX_DOMAINS))
++	if ((domain < 0) || (domain >= MAX_DOMAINS))
+ 	    FatalError("linuxOpenLegacy():  domain out of range\n");
+ 
+-	sprintf(path, PREFIX, domain - 1, bus, name);
++	sprintf(path, PREFIX, domain, bus, name);
+ 	fd = open(path, O_RDWR);
+ 	if (fd >= 0) {
+ 	    xfree(path);
+@@ -685,7 +684,6 @@ _X_EXPORT pointer
+ xf86MapDomainMemory(int ScreenNum, int Flags, PCITAG Tag,
+ 		    ADDRESS Base, unsigned long Size)
+ {
+-    int domain = xf86GetPciDomain(Tag);
+     int fd;
+     pointer addr;
+ 
+@@ -733,7 +731,7 @@ xf86MapDomainIO(int ScreenNum, int Flags
+     int domain = xf86GetPciDomain(Tag);
+     int fd;
+ 
+-    if ((domain <= 0) || (domain >= MAX_DOMAINS))
++    if ((domain < 0) || (domain >= MAX_DOMAINS))
+ 	FatalError("xf86MapDomainIO():  domain out of range\n");
+ 
+     if (DomainMmappedIO[domain])

xorg-x11-server.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep  7 23:16:06 CEST 2007 - schwab@suse.de
+
+- Update off-by-one patch.
+- Remove empty patch.
+
 -------------------------------------------------------------------
 Mon Sep  3 23:08:42 CEST 2007 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 URL:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.2
-Release:        131
+Release:        134
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -100,7 +100,6 @@ Patch74:        randr12-b4193a2eee80895c5641e77488df0e72a73a3d99.diff
 Patch75:        randr12-b2dcfbca2441ca8c561f86a78a76ab59ecbb40e4.diff
 Patch76:        randr12-2926cf1da7e4ed63573bfaecdd7e19beb3057d9b.diff
 Patch77:        fbdevhw.diff
-Patch334:       p_pci-domain.diff
 Patch357:       p_pci-ce-x.diff
 
 %description
@@ -188,7 +187,6 @@ popd
 %patch28
 %patch29
 ### Bug 197572: X.Org PCI/IA64 patches
-%patch334 -p0 -b .p_pci-domain.diff
 %patch357 -p0 -b .p_pci-ce-x.diff
 %patch30
 %patch32 -p1
@@ -555,6 +553,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Sep 07 2007 - schwab@suse.de
+- Update off-by-one patch.
+- Remove empty patch.
 * Mon Sep 03 2007 - sndirsch@suse.de
 - fbdevhw.diff:
   * ignore pixclock set to 0 by Xen kernel (Bug #285523)