summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2005-01-25 02:52:42 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2005-01-25 02:52:42 +0000
commitfb9fb8ead9aa58ce9559b8645849227f364e664c (patch)
tree6a47ca218c628e21184c63caa736955129d29499
parente1f4b3fea8d81c78f6de13ff6bf75cfc277f3fca (diff)
//freedesktop.org/bugzilla/show_bug.cgi?id=2322) attachment #1709XORG-6_8_1_903
(https://bugs.freedesktop.org/attachment.cgi?id=1709): Fix corruption of PCI config BAR1 of native PCI-Express boards on 64-bit platforms. Patch by Michael Yaroslavtsev <mike.work@besm6.org>.
-rw-r--r--hw/xfree86/common/xf86pciBus.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index ec55f6360..7e569900d 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -304,7 +304,7 @@ FindPCIVideoInfo(void)
mem64 = TRUE;
#if defined(LONG64) || defined(WORD64)
info->memBase[0] |=
- (memType)PCIGETMEMORY64HIGH(pcrp->pci_base1) << 32;
+ (memType)PCIGETMEMORY64HIGH(pcrp->pci_base0) << 32;
#else
if (pcrp->pci_base1)
info->memBase[0] = 0;
@@ -324,7 +324,7 @@ FindPCIVideoInfo(void)
mem64 = TRUE;
#if defined(LONG64) || defined(WORD64)
info->memBase[1] |=
- (memType)PCIGETMEMORY64HIGH(pcrp->pci_base2) << 32;
+ (memType)PCIGETMEMORY64HIGH(pcrp->pci_base1) << 32;
#else
if (pcrp->pci_base2)
info->memBase[1] = 0;
@@ -345,7 +345,7 @@ FindPCIVideoInfo(void)
mem64 = TRUE;
#if defined(LONG64) || defined(WORD64)
info->memBase[2] |=
- (memType)PCIGETMEMORY64HIGH(pcrp->pci_base3) << 32;
+ (memType)PCIGETMEMORY64HIGH(pcrp->pci_base2) << 32;
#else
if (pcrp->pci_base3)
info->memBase[2] = 0;
@@ -366,7 +366,7 @@ FindPCIVideoInfo(void)
mem64 = TRUE;
#if defined(LONG64) || defined(WORD64)
info->memBase[3] |=
- (memType)PCIGETMEMORY64HIGH(pcrp->pci_base4) << 32;
+ (memType)PCIGETMEMORY64HIGH(pcrp->pci_base3) << 32;
#else
if (pcrp->pci_base4)
info->memBase[3] = 0;
@@ -387,7 +387,7 @@ FindPCIVideoInfo(void)
mem64 = TRUE;
#if defined(LONG64) || defined(WORD64)
info->memBase[4] |=
- (memType)PCIGETMEMORY64HIGH(pcrp->pci_base5) << 32;
+ (memType)PCIGETMEMORY64HIGH(pcrp->pci_base4) << 32;
#else
if (pcrp->pci_base5)
info->memBase[4] = 0;