AVIVO: save/restore regs by block

Save/Restore the entire block for each output.
This should fix VT switch problems.

1 files changed, 13 insertions, 25 deletions

diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index 909a5da4..c399cc2e 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -312,22 +312,6 @@ struct avivo_grph_state {
     CARD32 viewport_size;
 };
 
-struct avivo_dac_state {
-    CARD32 enable;
-    CARD32 source_select;
-    CARD32 force_output_cntl;
-    CARD32 powerdown;
-};
-
-struct avivo_dig_state {
-    CARD32 cntl;
-    CARD32 bit_depth_cntl;
-    CARD32 data_sync;
-    CARD32 transmitter_enable;
-    CARD32 transmitter_cntl;
-    CARD32 source_select;
-};
-
 struct avivo_state
 {
     CARD32 hdp_fb_location;
@@ -341,9 +325,6 @@ struct avivo_state
     CARD32 crtc_master_en;
     CARD32 crtc_tv_control;
 
-    CARD32 lvtma_pwrseq_cntl;
-    CARD32 lvtma_pwrseq_state;
-
     struct avivo_pll_state pll1;
     struct avivo_pll_state pll2;
 
@@ -353,12 +334,6 @@ struct avivo_state
     struct avivo_grph_state grph1;
     struct avivo_grph_state grph2;
 
-    struct avivo_dac_state daca;
-    struct avivo_dac_state dacb;
-
-    struct avivo_dig_state tmds1;
-    struct avivo_dig_state tmds2;
-
     /* DDIA block on RS6xx chips */
     CARD32 ddia[37];
 
@@ -367,6 +342,19 @@ struct avivo_state
     CARD32 d2scl[40];
     CARD32 dxscl[6+2];
 
+    /* dac regs */
+    CARD32 daca[23];
+    CARD32 dacb[23];
+
+    /* tmdsa */
+    CARD32 tmdsa[31];
+
+    /* lvtma */
+    CARD32 lvtma[39];
+
+    /* dvoa */
+    CARD32 dvoa[16];
+
 };
 
 /*