xf86-video-ati: Branch 'ati-6.7-branch'

[Dave Airlie]

 src/radeon_driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 3334c247540b113f9c4a5ce1879d8648a45a959a (from 8e3a6f83016cd8c4cfd43ceee4cbf0a8dc018b2a)
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Aug 23 18:46:41 2007 +1000

    radeon: bug 11899 + debian 435040 - test for usefbdev before calling int10

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 74323c9..466fd46 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -6871,7 +6871,7 @@ Bool RADEONEnterVT(int scrnIndex, int fl
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
 		   "RADEONEnterVT\n");
 
-    if (INREG(RADEON_CONFIG_MEMSIZE) == 0) { /* Softboot V_BIOS */
+    if (!info->FBDev && (INREG(RADEON_CONFIG_MEMSIZE) == 0)) { /* Softboot V_BIOS */
        xf86Int10InfoPtr pInt;
        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
                   "zero MEMSIZE, probably at D3cold. Re-POSTing via int10.\n");