diff options
author | Dave Airlie <airlied@redhat.com> | 2010-11-15 11:59:58 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-11-15 12:20:09 +1000 |
commit | beb7fecd0191e38fb238134ba612985062cf9770 (patch) | |
tree | 61164585d09f8080e147ac8ffbb59d3747a78870 /src/radeon_probe.h | |
parent | 51e51f864a691e51b5193d102398ced667e0beb1 (diff) |
dce4: improve the VT switching code.
add in lots more blocks of regs to save/restore
Diffstat (limited to 'src/radeon_probe.h')
-rw-r--r-- | src/radeon_probe.h | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/src/radeon_probe.h b/src/radeon_probe.h index 2b78a1f1..d97bb06d 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h @@ -363,6 +363,37 @@ struct avivo_grph_state { uint32_t mode_data_format; }; +struct dce4_main_block_state { + struct avivo_grph_state grph; + uint32_t scl[6]; + uint32_t crtc[15]; + uint32_t fmt[10]; + uint32_t dig[20]; +}; + +struct dce4_state +{ + + uint32_t vga1_cntl; + uint32_t vga2_cntl; + uint32_t vga3_cntl; + uint32_t vga4_cntl; + uint32_t vga5_cntl; + uint32_t vga6_cntl; + uint32_t vga_render_control; + + struct dce4_main_block_state block[6]; + + uint32_t vga_pll[3][3]; + uint32_t pll[2][15]; + uint32_t pll_route[6]; + + uint32_t dac[2][26]; + uint32_t uniphy[6][10]; + + uint32_t dig[20]; +}; + struct avivo_state { uint32_t hdp_fb_location; @@ -390,9 +421,7 @@ struct avivo_state struct avivo_crtc_state crtc[2]; - uint32_t eg_crtc[6][15]; - - struct avivo_grph_state grph[6]; + struct avivo_grph_state grph[2]; /* DDIA block on RS6xx chips */ uint32_t ddia[37]; @@ -446,6 +475,7 @@ struct avivo_state typedef struct { struct avivo_state avivo; + struct dce4_state dce4; /* Common registers */ uint32_t ovr_clr; |