diff options
| author | Alex Deucher <alex@botch2.(none)> | 2007-11-30 14:30:55 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2007-11-30 14:30:55 -0500 |
| commit | e1945f1f25a34310bd58ce128c8ff27ecc985618 (patch) | |
| tree | d78faa7f21b10d0134d530f54718d0974807b1f8 /src | |
| parent | b368b0f22cd1d7ef9b4c65d82929c76f3b82d573 (diff) | |
| parent | df7777bff40c1feabcc12d2148ad6ac5213efbb3 (diff) | |
Merge branch 'atombios-support' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon.h | 3 | ||||
| -rw-r--r-- | src/radeon_driver.c | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/radeon.h b/src/radeon.h index ed99be71..b814b10a 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -276,6 +276,9 @@ 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; diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 2e49d81b..507b700b 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -5520,6 +5520,9 @@ void avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save) state->tmds2.transmitter_enable = INREG(AVIVO_LVTMA_TRANSMITTER_ENABLE); state->tmds2.transmitter_cntl = INREG(AVIVO_LVTMA_TRANSMITTER_CONTROL); + state->lvtma_pwrseq_cntl = INREG(AVIVO_LVTMA_PWRSEQ_CNTL); + state->lvtma_pwrseq_state = INREG(AVIVO_LVTMA_PWRSEQ_STATE); + if (state->crtc1.control & AVIVO_CRTC_EN) info->crtc_on = TRUE; @@ -5658,6 +5661,9 @@ void avivo_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore) OUTREG(AVIVO_LVTMA_TRANSMITTER_ENABLE, state->tmds2.transmitter_enable); OUTREG(AVIVO_LVTMA_TRANSMITTER_CONTROL, state->tmds2.transmitter_cntl); OUTREG(AVIVO_LVTMA_SOURCE_SELECT, state->tmds2.source_select); + + OUTREG(AVIVO_LVTMA_PWRSEQ_CNTL, state->lvtma_pwrseq_cntl); + OUTREG(AVIVO_LVTMA_PWRSEQ_STATE, state->lvtma_pwrseq_state); OUTREG(AVIVO_D1VGA_CONTROL, state->vga1_cntl); OUTREG(AVIVO_D2VGA_CONTROL, state->vga2_cntl); |