Attachment 71067 Details for Bug 151644

[patch] additional fix

diff.mappciBIOS_add (text/plain), 2.72 KB, created by Egbert Eich on 2006-03-02 19:30:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2006-03-02 19:30:57 UTC

Size: 2.72 KB

patch

obsolete

>Index: programs/Xserver/hw/xfree86/os-support/bus/Pci.c
>===================================================================
>RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v
>retrieving revision 1.1.1.60
>diff -u -r1.1.1.60 Pci.c
>--- programs/Xserver/hw/xfree86/os-support/bus/Pci.c	25 Nov 2005 10:05:28 -0000	1.1.1.60
>+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.c	2 Mar 2006 19:00:56 -0000
>@@ -1068,6 +1068,20 @@
>     return pci_devp;
> }
> 
>+pciConfigPtr
>+xf86GetPciConfigFromTag(PCITAG Tag)
>+{
>+    pciConfigPtr pDev;
>+    int i = 0;
>+
>+    for (i = 0 ; (pDev = pci_devp[i]) && i <= MAX_PCI_DEVICES; i++) {
>+	if (Tag == pDev->tag)
>+	    return pDev;
>+    }
>+
>+    return NULL;	/* Bad data */
>+}
>+
> CARD32
> pciCheckForBrokenBase(PCITAG Tag,int basereg)
> {
>Index: programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h
>===================================================================
>RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v
>retrieving revision 1.1.1.33
>diff -u -r1.1.1.33 xf86Pci.h
>--- programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h	27 Apr 2005 16:00:07 -0000	1.1.1.33
>+++ programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h	2 Mar 2006 19:00:56 -0000
>@@ -780,6 +780,7 @@
> int	      xf86GetAvailablePciBIOSTypes(PCITAG Tag, int basereg,
> 					   PciBiosType *Buf);
> pciConfigPtr *xf86scanpci(int flags);
>+pciConfigPtr xf86GetPciConfigFromTag(PCITAG Tag);
> 
> extern int pciNumBuses;
> 
>Index: programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c
>===================================================================
>RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v
>retrieving revision 1.1.1.10
>diff -u -r1.1.1.10 lnx_pci.c
>--- programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c	25 Nov 2005 10:05:30 -0000	1.1.1.10
>+++ programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c	2 Mar 2006 19:00:56 -0000
>@@ -201,6 +201,8 @@
>             fn = devfn & 0x7;
>             if (tag == pciTag(bus,dev,fn)) {
>                 /* ok now look through all the BAR values of this device */
>+		pciConfigPtr pDev = xf86GetPciConfigFromTag(tag);
>+
>                 for (ndx=0; ndx<7; ndx++) {
>                     unsigned long savePtr;
>                     /*
>@@ -208,11 +210,9 @@
> 		     * memory attributes
> 		     */
> 		    if (ndx == 6) 
>-			savePtr = (0xFFFFFFF0) & 
>-			    pciReadLong(tag, PCI_CMD_BIOS_REG);
>+			savePtr = PCIGETROM(pDev->pci_baserom);
> 		    else /* this the ROM bar */
>-			savePtr = (0xFFFFFFF0) & 
>-			    pciReadLong(tag, PCI_CMD_BASE_REG + (0x4 * ndx));
>+			savePtr = (0xFFFFFFF0) & (&pDev->pci_base0)[ndx];
> 
>                     /* find the index of the incoming base */
>                     if (base >= savePtr && base <= (savePtr + size[ndx])) {

Actions: View | Diff

Attachments on bug 151644: 68925 | 68926 | 70926 | 70927 | 71067 | 71094 | 71095