diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-08-23 18:46:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-08-23 19:20:17 +1000 |
| commit | 5cb20c2dc5eca9d7d7d78e9924ea1b90076e7253 (patch) | |
| tree | fcfc2b687538f81ca25cb950da29e485e008d34b | |
| parent | 9d6261c024c697a211da4b6300420153eb72a264 (diff) | |
radeon: bug 11899 + debian 435040 - test for usefbdev before calling int10
(cherry picked from commit 3334c247540b113f9c4a5ce1879d8648a45a959a)
| -rw-r--r-- | src/radeon_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 1f4d0c25..1d5cc362 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -5852,7 +5852,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags) 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"); |