diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2007-02-04 11:28:54 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2007-02-05 19:28:54 +0200 |
| commit | a659b7235332e19659c56cc9d7af362bd8885a29 (patch) | |
| tree | 1e53fca416618b98e2f3b96304f8a494bd61390d | |
| parent | 9d77aabdff919360f0c9333105436c31f1f5749a (diff) | |
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.
| -rw-r--r-- | src/aticonfig.c | 10 | ||||
| -rw-r--r-- | src/atiprint.c | 17 |
2 files changed, 4 insertions, 23 deletions
diff --git a/src/aticonfig.c b/src/aticonfig.c index 988edfda..37cc9cd0 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 243dcf50..d435e215 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); } |