summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralanh <alanh>2000-10-11 03:23:51 +0000
committeralanh <alanh>2000-10-11 03:23:51 +0000
commitc329755dc8b65d5f7aabfcc0f555babbfdb75dec (patch)
tree473528d1881c3f732b2995d14595168ec5fff161
parentd4420dce6c94bae6bb623192d7008ea2438552c3 (diff)
Don't do PreferConvert32to24. 24bpp is slow....
-rw-r--r--xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c
index d7110f1b9..e39828343 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/r128/r128_driver.c
@@ -542,6 +542,7 @@ static Bool R128GetPLLParameters(ScrnInfoPtr pScrn)
CARD16 bios_header;
CARD16 pll_info_block;
+
if (!info->VBIOS) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Video BIOS not detected, using default PLL parameters!\n");
@@ -673,7 +674,6 @@ static Bool R128PreInitVisual(ScrnInfoPtr pScrn)
if (!xf86SetDepthBpp(pScrn, 8, 8, 8, (Support24bppFb
| Support32bppFb
| SupportConvert32to24
- | PreferConvert32to24
)))
return FALSE;
@@ -876,6 +876,7 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn)
else
pScrn->videoRam = INREG(R128_CONFIG_MEMSIZE) / 1024;
info->MemCntl = INREG(R128_MEM_CNTL);
+
info->BusCntl = INREG(R128_BUS_CNTL);
R128MMIO = NULL;
R128UnmapMMIO(pScrn);