diff options
| author | Michael Babej <mbabej@redhat.com> | 2008-05-27 19:13:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-05-27 19:13:49 +1000 |
| commit | 307bd65a25ee425d8359dd30572b002ce2338f91 (patch) | |
| tree | 740ddbf7b878be231b193a946cf82c523f31ab0b | |
| parent | bf48c9eb8ec592515be9d1732d60283af715674d (diff) | |
r600: fix vt switch issue
RH BZ 441492
| -rw-r--r-- | src/radeon_driver.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 83e0f851..7124b11d 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -5231,11 +5231,15 @@ Bool RADEONEnterVT(int scrnIndex, int flags) ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; RADEONInfoPtr info = RADEONPTR(pScrn); unsigned char *RADEONMMIO = info->MMIO; + uint32_t mem_size; xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "RADEONEnterVT\n"); - - if ((INREG(RADEON_CONFIG_MEMSIZE)) == 0) { /* Softboot V_BIOS */ + if (info->ChipFamily >= CHIP_FAMILY_R600) + mem_size = INREG(R600_CONFIG_MEMSIZE); + else + mem_size = INREG(RADEON_CONFIG_MEMSIZE); + if (mem_size == 0) { /* Softboot V_BIOS */ xf86Int10InfoPtr pInt; xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "zero MEMSIZE, probably at D3cold. Re-POSTing via int10.\n"); |