xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_driver.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 87e66ce76430890ab4939ffcd42f72b9288eb598
Author: Avi Rozen <avi.rozen at gmail.com>
Date:   Mon May 12 08:33:38 2008 -0400

    RADEON: fix lockup on start
    
    see debian bug 480312

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 2acc1e9..b04e48f 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);