diff options
author | George Wu <geo@ocf.berkeley.edu> | 2007-12-02 15:25:09 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-12-02 15:25:09 +1000 |
commit | 48e31cdaa0caa21573879af5b9267773fe89176a (patch) | |
tree | 7e01b97b97bdd3a2bc4d894f98a86aba7884a3a2 /src/radeon_driver.c | |
parent | 1e029fef5fe264f2ced445b80bf6070abcb84b82 (diff) |
RADEON/R600: small code cleanup
Diffstat (limited to 'src/radeon_driver.c')
-rw-r--r-- | src/radeon_driver.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 6e98913f..ba4c1115 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -1349,15 +1349,13 @@ static void RADEONInitMemoryMap(ScrnInfoPtr pScrn) /* We shouldn't use info->videoRam here which might have been clipped * but the real video RAM instead */ - if (info->ChipFamily >= CHIP_FAMILY_R600) + if (info->ChipFamily >= CHIP_FAMILY_R600) { mem_size = INREG(R600_CONFIG_MEMSIZE); - else - mem_size = INREG(RADEON_CONFIG_MEMSIZE); - - if (info->ChipFamily >= CHIP_FAMILY_R600) aper_size = INREG(R600_CONFIG_APER_SIZE); - else + } else { + mem_size = INREG(RADEON_CONFIG_MEMSIZE); aper_size = INREG(RADEON_CONFIG_APER_SIZE); + } if (mem_size == 0) mem_size = 0x800000; |