diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-02-19 18:58:40 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-02-19 18:58:40 -0500 |
| commit | ca22390c8a5256bbc8eeff775d5eebf0e892d890 (patch) | |
| tree | dc9652025d67e471f56b31db40bdfba51279d146 /src/radeon_driver.c | |
| parent | cadae2a8d9979b2d61eae7d1f7a9ab8f5eb28e83 (diff) | |
R6xx/R7xx: fix up a few more paths
Diffstat (limited to 'src/radeon_driver.c')
| -rw-r--r-- | src/radeon_driver.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 8591b3c9..709a7893 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -1508,6 +1508,9 @@ static uint32_t RADEONGetAccessibleVRAM(ScrnInfoPtr pScrn) info->dri->newMemoryMap = TRUE; #endif /* XF86DRI */ + if (info->ChipFamily >= CHIP_FAMILY_R600) + return aper_size; + /* Set HDP_APER_CNTL only on cards that are known not to be broken, * that is has the 2nd generation multifunction PCI interface */ @@ -1516,7 +1519,7 @@ static uint32_t RADEONGetAccessibleVRAM(ScrnInfoPtr pScrn) info->ChipFamily == CHIP_FAMILY_RV380 || info->ChipFamily == CHIP_FAMILY_R420 || info->ChipFamily == CHIP_FAMILY_RV410 || - IS_AVIVO_VARIANT) { + IS_AVIVO_VARIANT) { OUTREGP (RADEON_HOST_PATH_CNTL, RADEON_HDP_APER_CNTL, ~RADEON_HDP_APER_CNTL); xf86DrvMsg(pScrn->scrnIndex, X_INFO, @@ -1593,9 +1596,10 @@ static Bool RADEONPreInitVRAM(ScrnInfoPtr pScrn) if (pScrn->videoRam > accessible) pScrn->videoRam = accessible; - if (!IS_AVIVO_VARIANT) + if (!IS_AVIVO_VARIANT) { info->MemCntl = INREG(RADEON_SDRAM_MODE_REG); - info->BusCntl = INREG(RADEON_BUS_CNTL); + info->BusCntl = INREG(RADEON_BUS_CNTL); + } RADEONGetVRamType(pScrn); |