diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2013-01-20 15:06:46 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2013-01-20 15:06:46 +0000 |
| commit | 0f219fcf0035ac2bc91c65a58edd58c75953855a (patch) | |
| tree | b149a62dbbcffb9af5850f59312c0ebfab2168b0 | |
| parent | 6c6601caf73bacbfb3f7cff07273bf75c35288d3 (diff) | |
Stop the radeon driver from trying to restore text mode on PALM and newer
chip generations. The driver is currently unable to restore text mode on
these chips, and attempting to restore text mode anyway results in the
display not being restored properly when switching back to X. The only way
of restoring the display after restarting X was to reboot the machine.
ok mpi@
| -rw-r--r-- | driver/xf86-video-ati/src/radeon_driver.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/driver/xf86-video-ati/src/radeon_driver.c b/driver/xf86-video-ati/src/radeon_driver.c index 78a074dd0..2ed9ebf01 100644 --- a/driver/xf86-video-ati/src/radeon_driver.c +++ b/driver/xf86-video-ati/src/radeon_driver.c @@ -5840,7 +5840,14 @@ static void RADEONRestore(ScrnInfoPtr pScrn) RADEONBlank(pScrn); - if (IS_DCE4_VARIANT) { + if (IS_DCE41_VARIANT) { + /* + * XXX Don't restore text mode. The driver is unable to do so, + * and furthermore it makes switching back to X is impossible. + * Requires KMS or equivalent UMS code for proper operation. + */ + return; + } else if (IS_DCE4_VARIANT) { RADEONRestoreMemMapRegisters(pScrn, restore); dce4_restore(pScrn, restore); //XXX |