diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-02-26 12:10:08 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-02-26 12:10:08 -0500 |
| commit | 4fc978f3d83ef6370c9715e7ca5350640ccbfe10 (patch) | |
| tree | cac69f01b7df17952597948f8b292e20d5d4fce5 | |
| parent | 000756e052a291230e5c95e48b69a5aa9c4fab0e (diff) | |
R6xx/R7xx: use shadowfb if DRI is disabled
| -rw-r--r-- | src/radeon_driver.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 1171de48..62fa3aa2 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -1915,16 +1915,6 @@ static Bool RADEONPreInitChipType(ScrnInfoPtr pScrn) info->Chipset != PCI_CHIP_RN50_5969); #endif -#if 0 - if (info->ChipFamily >= CHIP_FAMILY_R600) { - info->r600_shadow_fb = TRUE; - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "using shadow framebuffer\n"); - if (!xf86LoadSubModule(pScrn, "shadow")) - return FALSE; - } -#endif - return TRUE; } @@ -2166,7 +2156,15 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn) "and may cause instability or lockups\n"); } else { xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Direct rendering not officially supported on RN50/RS600/R600\n"); + "Direct rendering not officially supported on RN50/R600\n"); + + if (info->ChipFamily >= CHIP_FAMILY_R600) { + info->r600_shadow_fb = TRUE; + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "using shadow framebuffer\n"); + if (!xf86LoadSubModule(pScrn, "shadow")) + info->r600_shadow_fb = FALSE; + } return FALSE; } } |