diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-01-18 20:11:57 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-01-18 20:11:57 +1000 |
| commit | eaf425436008092abe81208321a2b3b6698a5d79 (patch) | |
| tree | a7441ac29931dcfe59d4d17856e2e357203103fa | |
| parent | 2a89a31481d71a56a9930073cf99d3ae7b4290e1 (diff) | |
fixup register 6594 save/restore
| -rw-r--r-- | src/radeon_driver.c | 5 | ||||
| -rw-r--r-- | src/radeon_probe.h | 1 | ||||
| -rw-r--r-- | src/radeon_reg.h | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 98b8c684..23ab7928 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -4053,6 +4053,7 @@ avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save) state->grph1.viewport_start = INREG(AVIVO_D1MODE_VIEWPORT_START); state->grph1.viewport_size = INREG(AVIVO_D1MODE_VIEWPORT_SIZE); state->grph1.scl_enable = INREG(AVIVO_D1SCL_SCALER_ENABLE); + state->grph1.scl_tap_control = INREG(AVIVO_D1SCL_SCALER_TAP_CONTROL); state->crtc2.pll_source = INREG(AVIVO_PCLK_CRTC2_CNTL); @@ -4093,6 +4094,7 @@ avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save) state->grph2.viewport_start = INREG(AVIVO_D2MODE_VIEWPORT_START); state->grph2.viewport_size = INREG(AVIVO_D2MODE_VIEWPORT_SIZE); state->grph2.scl_enable = INREG(AVIVO_D2SCL_SCALER_ENABLE); + state->grph2.scl_tap_control = INREG(AVIVO_D2SCL_SCALER_TAP_CONTROL); state->daca.enable = INREG(AVIVO_DACA_ENABLE); state->daca.source_select = INREG(AVIVO_DACA_SOURCE_SELECT); @@ -4207,6 +4209,7 @@ avivo_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore) OUTREG(AVIVO_D1MODE_VIEWPORT_START, state->grph1.viewport_start); OUTREG(AVIVO_D1MODE_VIEWPORT_SIZE, state->grph1.viewport_size); OUTREG(AVIVO_D1SCL_SCALER_ENABLE, state->grph1.scl_enable); + OUTREG(AVIVO_D1SCL_SCALER_TAP_CONTROL, state->grph1.scl_tap_control); OUTREG(AVIVO_PCLK_CRTC2_CNTL, state->crtc2.pll_source); @@ -4246,7 +4249,7 @@ avivo_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore) OUTREG(AVIVO_D2MODE_VIEWPORT_START, state->grph2.viewport_start); OUTREG(AVIVO_D2MODE_VIEWPORT_SIZE, state->grph2.viewport_size); OUTREG(AVIVO_D2SCL_SCALER_ENABLE, state->grph2.scl_enable); - + OUTREG(AVIVO_D2SCL_SCALER_TAP_CONTROL, state->grph2.scl_tap_control); OUTREG(AVIVO_DACA_ENABLE, state->daca.enable); OUTREG(AVIVO_DACA_SOURCE_SELECT, state->daca.source_select); diff --git a/src/radeon_probe.h b/src/radeon_probe.h index 37cd6e65..ef4ddbcf 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h @@ -289,6 +289,7 @@ struct avivo_grph_state { CARD32 viewport_start; CARD32 viewport_size; CARD32 scl_enable; + CARD32 scl_tap_control; }; struct avivo_dac_state { diff --git a/src/radeon_reg.h b/src/radeon_reg.h index 174fda4a..ea1cebfe 100644 --- a/src/radeon_reg.h +++ b/src/radeon_reg.h @@ -3439,6 +3439,7 @@ #define AVIVO_D1MODE_EXT_OVERSCAN_TOP_BOTTOM 0x658c #define AVIVO_D1SCL_SCALER_ENABLE 0x6590 +#define AVIVO_D1SCL_SCALER_TAP_CONTROL 0x6594 #define AVIVO_D1SCL_UPDATE 0x65cc # define AVIVO_D1SCL_UPDATE_LOCK (1<<16) @@ -3489,6 +3490,7 @@ #define AVIVO_D2MODE_EXT_OVERSCAN_TOP_BOTTOM 0x6d8c #define AVIVO_D2SCL_SCALER_ENABLE 0x6d90 +#define AVIVO_D2SCL_SCALER_TAP_CONTROL 0x6d94 #define AVIVO_DACA_ENABLE 0x7800 # define AVIVO_DAC_ENABLE (1 << 0) |