xf86-video-ati: Branch 'atombios-support'

[Alex Deucher]

 src/radeon.h        |    1 +
 src/radeon_driver.c |    8 ++++++++
 2 files changed, 9 insertions(+)

New commits:
commit d5d83411e8a884154d671aad440524507cce313e
Author: Alex Deucher <alex at botch2.(none)>
Date:   Fri Nov 30 20:11:42 2007 -0500

    RADEON: save/restore avivo crtc cursor control
    
    this should prevent the cursor from showing up on in text
    mode or vesafb etc. after running the driver.

diff --git a/src/radeon.h b/src/radeon.h
index 586a1fc..76dcec7 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -227,6 +227,7 @@ struct avivo_crtc_state {
     CARD32 blank_control;
     CARD32 interlace_control;
     CARD32 stereo_control;
+    CARD32 cursor_control;
 };
 
 struct avivo_grph_state {
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 73e192a..6e98913 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5445,6 +5445,8 @@ void avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save)
     state->crtc1.interlace_control = INREG(AVIVO_D1CRTC_INTERLACE_CONTROL);
     state->crtc1.stereo_control = INREG(AVIVO_D1CRTC_STEREO_CONTROL);
 
+    state->crtc1.cursor_control = INREG(AVIVO_D1CUR_CONTROL);
+
     state->grph1.enable = INREG(AVIVO_D1GRPH_ENABLE);
     state->grph1.control = INREG(AVIVO_D1GRPH_CONTROL);
     state->grph1.control = INREG(AVIVO_D1GRPH_CONTROL);
@@ -5483,6 +5485,8 @@ void avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save)
     state->crtc2.interlace_control = INREG(AVIVO_D2CRTC_INTERLACE_CONTROL);
     state->crtc2.stereo_control = INREG(AVIVO_D2CRTC_STEREO_CONTROL);
 
+    state->crtc2.cursor_control = INREG(AVIVO_D2CUR_CONTROL);
+
     state->grph2.enable = INREG(AVIVO_D2GRPH_ENABLE);
     state->grph2.control = INREG(AVIVO_D2GRPH_CONTROL);
     state->grph2.control = INREG(AVIVO_D2GRPH_CONTROL);
@@ -5588,6 +5592,8 @@ void avivo_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore)
     OUTREG(AVIVO_D1CRTC_INTERLACE_CONTROL, state->crtc1.interlace_control);
     OUTREG(AVIVO_D1CRTC_STEREO_CONTROL, state->crtc1.stereo_control);
 
+    OUTREG(AVIVO_D1CUR_CONTROL, state->crtc1.cursor_control);
+
     OUTREG(AVIVO_D1GRPH_ENABLE, state->grph1.enable);
     OUTREG(AVIVO_D1GRPH_CONTROL, state->grph1.control);
     OUTREG(AVIVO_D1GRPH_PRIMARY_SURFACE_ADDRESS, state->grph1.prim_surf_addr);
@@ -5625,6 +5631,8 @@ void avivo_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore)
     OUTREG(AVIVO_D2CRTC_INTERLACE_CONTROL, state->crtc2.interlace_control);
     OUTREG(AVIVO_D2CRTC_STEREO_CONTROL, state->crtc2.stereo_control);
 
+    OUTREG(AVIVO_D2CUR_CONTROL, state->crtc2.cursor_control);
+
     OUTREG(AVIVO_D2GRPH_ENABLE, state->grph2.enable);
     OUTREG(AVIVO_D2GRPH_CONTROL, state->grph2.control);
     OUTREG(AVIVO_D2GRPH_PRIMARY_SURFACE_ADDRESS, state->grph2.prim_surf_addr);