diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-07-01 07:44:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-07-01 07:44:49 +1000 |
| commit | beea4d086252ff9256aebd522a781b0026023714 (patch) | |
| tree | 5590258bcef1b91e6c4aa8e952dfc10d31006757 /avivotool.c | |
| parent | 7ff2e6cfea2aa8f5fd67968cf297c9e96be38ba5 (diff) | |
add tv + cursor 2
Diffstat (limited to 'avivotool.c')
| -rw-r--r-- | avivotool.c | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/avivotool.c b/avivotool.c index 4918e73..08a86bf 100644 --- a/avivotool.c +++ b/avivotool.c @@ -889,11 +889,13 @@ void radeon_cmd_regs(const char *type) int show_tmds2 = (show_all || strstr(type, "tmds2")); int show_lvds = (show_all || strstr(type, "lvds")); int show_cur1 = (show_all || strstr(type, "cur1")); + int show_cur2 = (show_all || strstr(type, "cur2")); int show_i2c = (show_all || strstr(type, "i2c")); int show_vga = (show_all || strstr(type, "vga")); int show_vga_pll = (show_all || strstr(type, "vgapll")); int show_pll1 = (show_all || strstr(type, "pll1")); int show_pll2 = (show_all || strstr(type, "pll2")); + int show_tv = (show_all || strstr(type, "tv")); int shut_up = 1; int tmp; /* may be stomped at any moment. */ unsigned long i; @@ -918,6 +920,12 @@ void radeon_cmd_regs(const char *type) show_lvds = 1; if (GET_REG(AVIVO_D1CUR_CONTROL) & AVIVO_D1CURSOR_EN) show_cur1 = 1; + if (GET_REG(AVIVO_D2CUR_CONTROL) & AVIVO_D1CURSOR_EN) + show_cur2 = 1; + if (GET_REG(AVIVO_DACA_SOURCE_SELECT) == 0x2) + show_tv = 1; + if (GET_REG(AVIVO_DACB_SOURCE_SELECT) == 0x2) + show_tv = 1; } if (strcmp(type, "dynamic") == 0) { @@ -1220,6 +1228,7 @@ void radeon_cmd_regs(const char *type) printf("\nLVDS disabled\n"); } + if (show_cur1) { printf("\nCursor 1:\n"); SHOW_REG_BITS(AVIVO_D1CUR_CONTROL, 0, 0, "Enable", 8, 9, "Format (ABGR/ARGB)", 0, 0, NULL); @@ -1232,6 +1241,17 @@ void radeon_cmd_regs(const char *type) printf("\nCursor 1 disabled\n"); } + if (show_cur2) { + printf("\nCursor 2:\n"); + SHOW_REG_BITS(AVIVO_D2CUR_CONTROL, 0, 0, "Enable", 8, 9, "Format (ABGR/ARGB)", 0, 0, NULL); + SHOW_REG_BITS(AVIVO_D2CUR_POSITION, 16, 31, "DECIMALx", 0, 15, "DECIMALy", 0, 0, NULL); + SHOW_REG(AVIVO_D2CUR_SURFACE_ADDRESS); + SHOW_REG_BITS(AVIVO_D2CUR_SIZE, 16, 31, "DECIMALx", 0, 15, "DECIMALy", 0, 0, NULL); + } + else { + if (!shut_up) + printf("\nCursor 2 disabled\n"); + } if (show_i2c) { SHOW_REG(0x7e30); SHOW_REG(0x7e34); @@ -1288,6 +1308,23 @@ void radeon_cmd_regs(const char *type) SHOW_REG(0x33c); } + if (show_tv) { + SHOW_REG(SD1_MAIN_CNTL); + SHOW_REG(SD1_MAIN_CNTL2); + SHOW_REG(SD1_TIMING_H_TOTAL); + SHOW_REG(SD1_TIMING_V_F_TOTAL); + SHOW_REG(SD1_TIMING_H_HSYNC); + SHOW_REG(SD1_TIMING_H_BURST); + SHOW_REG(SD1_TIMING_H_SETUP1); + SHOW_REG(SD1_TIMING_H_SETUP2); + SHOW_REG(SD1_TIMING_H_ADV_ACTIVE); + SHOW_REG(SD1_VIDOUT_MUX_CNTL); + SHOW_REG(SD1_FORCE_DAC_DATA); + SHOW_REG(SD1_CHROMA_MOD_CNTL); + SHOW_REG(SD1_UPSAMPLE_MODE); + SHOW_REG(SD1_CRTC_HV_START); + SHOW_REG(SD1_CRTC_TV_FRAMESTART_CNTL); + } } |