summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Rozen <avi.rozen@gmail.com>2008-05-12 08:33:38 -0400
committerAlex Deucher <alex@cube.(none)>2008-05-12 08:33:38 -0400
commit87e66ce76430890ab4939ffcd42f72b9288eb598 (patch)
treeecacffddc82367d39121f334b00470f716f44d37
parent94bf8f01bd43cb103fffecfe04d04a214f892baf (diff)
RADEON: fix lockup on start
see debian bug 480312
-rw-r--r--src/radeon_driver.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 2acc1e91..b04e48fc 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4739,6 +4739,9 @@ static void RADEONSave(ScrnInfoPtr pScrn)
* setup in the card at all !!
*/
vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */
+# elif defined(__linux__)
+ /* Save only mode * & fonts */
+ vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
# else
/* Save mode * & fonts & cmap */
vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL);
@@ -4860,7 +4863,9 @@ static void RADEONRestore(ScrnInfoPtr pScrn)
* write VGA fonts, will find a better solution in the future
*/
vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE );
-# else
+# elif defined(__linux__)
+ vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
+# else
vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_ALL );
# endif
vgaHWLock(hwp);