xf86-video-ati: Branch 'pci-rework'

[George Sapountzis]

 src/atimode.c    |    1 +
 src/atipreinit.c |    5 +----
 src/atiprobe.c   |    6 ++----
 3 files changed, 4 insertions(+), 8 deletions(-)

New commits:
diff-tree 246005c80e1e3e9e4fe67bbda3c3b9f1169500d4 (from 5021e6ae0ab2351baf2105c17776e75a8e406e90)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date:   Thu Mar 15 17:30:23 2007 +0200

    [mach64] Drop checking that BAR base + size fits in 32 bit.
    
    I can't see how these tests could fail on 32-bit. OTOH they are potentially
    problematic with 64-bit PCI addresses.

diff --git a/src/atimode.c b/src/atimode.c
index 2b5d823..a2ac64f 100644
--- a/src/atimode.c
+++ b/src/atimode.c
@@ -958,6 +958,7 @@ ATIModeSet
                     outr(CRTC_H_SYNC_STRT_WID, pATIHW->crtc_h_sync_strt_wid);
                     outr(CRTC_V_TOTAL_DISP, pATIHW->crtc_v_total_disp);
                     outr(CRTC_V_SYNC_STRT_WID, pATIHW->crtc_v_sync_strt_wid);
+
                     outr(CRTC_OFF_PITCH, pATIHW->crtc_off_pitch);
 
                     if (pATI->Chip >= ATI_CHIP_264VTB)
diff --git a/src/atipreinit.c b/src/atipreinit.c
index 0e5b48c..7cc9908 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -1772,10 +1772,7 @@ ATIPreInit
                 /* Set MMIO address from PCI configuration space, if available */
                 if ((pATI->Block0Base = pVideo->memBase[2]))
                 {
-                    if (pATI->Block0Base >= (CARD32)(-1 << pVideo->size[2]))
-                        pATI->Block0Base = 0;
-                    else
-                        pATI->Block0Base += 0x0400U;
+                    pATI->Block0Base += 0x0400U;
                 }
 
                 /*
diff --git a/src/atiprobe.c b/src/atiprobe.c
index dcbcd27..1a55d9e 100644
--- a/src/atiprobe.c
+++ b/src/atiprobe.c
@@ -223,8 +223,7 @@ ATIMach64Probe
          * further.
          */
         if ((pVideo->size[2] >= 12) &&
-            (pATI->Block0Base = pVideo->memBase[2]) &&
-            (pATI->Block0Base < (CARD32)(-1 << pVideo->size[2])))
+            (pATI->Block0Base = pVideo->memBase[2]))
         {
             pATI->Block0Base += 0x00000400U;
             if (ATIMach64Detect(pATI, ChipType, Chip))
@@ -275,8 +274,7 @@ ATIMach64Probe
     CARD16 ChipType = pVideo->chipType;
 
         if ((pATI->CPIODecoding == BLOCK_IO) &&
-            ((pVideo->size[1] < 8) ||
-             (pATI->CPIOBase >= (CARD32)(-1 << pVideo->size[1]))))
+            (pVideo->size[1] < 8))
             return NULL;
 
     if (!ATIMach64Detect(pATI, ChipType, Chip))