From 80eee856938756e1222526b6c39cee8b5252b409 Mon Sep 17 00:00:00 2001
From: Matthieu Herb <>
Date: Tue, 9 Oct 2007 16:17:50 -0400
Subject: RADEON: fix console restore on netbsd

  Include the mode restore bugfix from monolithic Xorg, that is derived
  from the version in xsrc which in turn was provided by Matthieu Herb
  over 3 years ago on the XFree86 lists. Suggested by various
  developers, hold-back due to the working state in xorg-server 1.1.1.
  Tracing down the exact change showed that the changed default color
  depth made this issue a lot more prominent again. Discussed with Eric
  Anholt.
---
 src/radeon_driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index ffd48a5c..7149b120 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5326,7 +5326,7 @@ static void RADEONSave(ScrnInfoPtr pScrn)
 	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */
 # else
 	/* Save mode * & fonts & cmap */
-	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS);
+	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL);
 # endif
 	vgaHWLock(hwp);
     }
@@ -5418,7 +5418,7 @@ void RADEONRestore(ScrnInfoPtr pScrn)
 	*/
        vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE );
 # else
-       vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
+       vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_ALL );
 # endif
        vgaHWLock(hwp);
     }
-- 
cgit v1.2.3