From a659b7235332e19659c56cc9d7af362bd8885a29 Mon Sep 17 00:00:00 2001
From: George Sapountzis <gsap7@yahoo.gr>
Date: Sun, 4 Feb 2007 11:28:54 +0200
Subject: Cleanup checks for pATI->PCIInfo.

Fixes a bug where shadowfb would not be enabled by default in the non-accel
case because pATI->PCIInfo is now set after ATIProcessOptions() is called.
---
 src/aticonfig.c | 10 +---------
 src/atiprint.c  | 17 +++--------------
 2 files changed, 4 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/aticonfig.c b/src/aticonfig.c
index 988edfd..37cc9cd 100644
--- a/src/aticonfig.c
+++ b/src/aticonfig.c
@@ -168,15 +168,7 @@ ATIProcessOptions
 
     ReferenceClock = ((double)157500000.0) / ((double)11.0);
 
-#ifndef AVOID_CPIO
-
-    if (pATI->PCIInfo)
-
-#endif /* AVOID_CPIO */
-
-    {
-        ShadowFB = TRUE;
-    }
+    ShadowFB = TRUE;
 
     Blend = PanelDisplay = TRUE;
 #ifdef XF86DRI_DEVEL
diff --git a/src/atiprint.c b/src/atiprint.c
index 243dcf5..d435e21 100644
--- a/src/atiprint.c
+++ b/src/atiprint.c
@@ -355,8 +355,8 @@ ATIPrintRegisters
     ATIPtr pATI
 )
 {
-    pciVideoPtr  pVideo;
-    pciConfigPtr pPCI;
+    pciVideoPtr  pVideo = pATI->PCIInfo;
+    pciConfigPtr pPCI = pVideo->thisCard;
     int          Index;
     CARD32       lcd_index, tv_out_index, lcd_gen_ctrl;
     CARD8        dac_read, dac_mask, dac_write;
@@ -638,9 +638,7 @@ ATIPrintRegisters
 
 #endif /* AVOID_CPIO */
 
-    if ((pVideo = pATI->PCIInfo))
     {
-        pPCI = pVideo->thisCard;
         xf86ErrorFVerb(4, "\n\n PCI configuration register values:");
         for (Index = 0;  Index < 256;  Index+= 4)
         {
@@ -661,18 +659,9 @@ ATIPrintRegisters
     else
         xf86ErrorFVerb(4, "\n No banked aperture.");
 
-    if (pATI->pMemory == pATI->pBank)
-    {
-        xf86ErrorFVerb(4, "\n No linear aperture.\n");
-    }
-    else
-
-#else /* AVOID_CPIO */
-
-    if (pATI->pMemory)
-
 #endif /* AVOID_CPIO */
 
+    if (pATI->pMemory)
     {
         xf86ErrorFVerb(4, "\n Linear aperture at %p.\n", pATI->pMemory);
     }
-- 
cgit v1.2.3