Attachment 148126 Details for Bug 227851 – Second patch to xorg-x11-server package

[patch] Second patch to xorg-x11-server package

xorg-x11-server-2.patch (text/plain), 1.94 KB, created by Kevin R. Page on 2007-02-15 17:51:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin R. Page

Created: 2007-02-15 17:51:34 UTC

Size: 1.94 KB

patch

obsolete

>--- xserver/xorg/hw/xfree86/os-support/bus/Pci.c.orig	2007-02-15 11:55:39.000000000 +0000
>+++ xserver/xorg/hw/xfree86/os-support/bus/Pci.c	2007-02-15 11:56:24.000000000 +0000
>@@ -1169,17 +1169,21 @@
> 	    b_reg = i;
> 	}
> 
>-	if (!(newbase = getValidBIOSBase(Tag, b_reg)))
>+	if (!(newbase = getValidBIOSBase(Tag, b_reg))) {
>+	  xf86MsgVerb(X_INFO,2,"xf86ReadPciBios: PCI:%i:%i:%i b_reg=%i"
>+		      " no valid address\n", 
>+		      (int)PCI_BUS_FROM_TAG(Tag), (int)PCI_DEV_FROM_TAG(Tag),
>+		      (int)PCI_FUNC_FROM_TAG(Tag), b_reg);
> 	    continue;  /* no valid address found */
>-
>+	}
> 	romaddr = PCIGETROM(newbase);
> 
> 	/* if we use a mem base save it and move it out of the way */
> 	if (b_reg >= 0 && b_reg <= 5) {
> 	    memType emptybase;
> 	    savebase = pciReadLong(Tag, PCI_MAP_REG_START+(b_reg<<2));
>-	    xf86MsgVerb(X_INFO,5,"xf86ReadPciBios: modifying membase[%i]"
>-			" for device %i:%i:%i\n", basereg,
>+	    xf86MsgVerb(X_INFO,2,"xf86ReadPciBios: modifying membase[%i]"
>+			" for device %i:%i:%i\n", b_reg,
> 			(int)PCI_BUS_FROM_TAG(Tag), (int)PCI_DEV_FROM_TAG(Tag),
> 			(int)PCI_FUNC_FROM_TAG(Tag));
> 	    if (!(emptybase = getEmptyPciRange(Tag,b_reg))) {
>@@ -1193,7 +1197,7 @@
> 	pciWriteLong(Tag, PCI_MAP_ROM_REG, romaddr
> 		     | PCI_MAP_ROM_DECODE_ENABLE);
> 
>-	hostbase = pciBusAddrToHostAddr(Tag, PCI_MEM, PCIGETROM(romaddr));
>+	hostbase = pciBusAddrToHostAddr(Tag, PCI_MEM, romaddr);
> 
> 	if ((xf86ReadDomainMemory(Tag, hostbase, sizeof(tmp), tmp) !=
> 	     sizeof(tmp)) ||
>@@ -1203,6 +1207,12 @@
> 	    if (savebase) pciWriteLong(Tag, PCI_MAP_REG_START + (b_reg << 2),
> 				       (CARD32) savebase);
> 
>+	  xf86MsgVerb(X_INFO,2,"xf86ReadPciBios: %i:%i:%i br=%i at"
>+		      " 0x%08lx 0x%08lx bad signature %02x %02x\n", 
>+		      (int)PCI_BUS_FROM_TAG(Tag), (int)PCI_DEV_FROM_TAG(Tag),
>+		      (int)PCI_FUNC_FROM_TAG(Tag), b_reg, romaddr, hostbase, 
>+		      (unsigned )tmp[0], (unsigned )tmp[1]);
>+
> 	    /* No BIOS found: try another address */
> 	    continue;
> 	}

Actions: View | Diff

Attachments on bug 227851: 147662 | 147663 | 147759 | 148123 | 148124 | 148126 | 148127 | 148128 | 148129 | 158938 | 158939 | 158941 | 158942