xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_driver.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 307bd65a25ee425d8359dd30572b002ce2338f91
Author: Michael Babej <mbabej at redhat.com>
Date:   Tue May 27 19:13:49 2008 +1000

    r600: fix vt switch issue
    
    RH BZ 441492

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 83e0f85..7124b11 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");