diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-01-07 11:22:32 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-01-07 11:22:32 +1100 |
| commit | f2e1673d8635be09f951fb638f7292b25c5d25e4 (patch) | |
| tree | b9d86af60d4b327d5a027f4d2d5de3661fba133a | |
| parent | 895a8dbdf358d05962ba6b53d7b13f611a4e80d8 (diff) | |
add more output regs
| -rw-r--r-- | nouveau_reg.h | 4 | ||||
| -rw-r--r-- | radeontool.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/nouveau_reg.h b/nouveau_reg.h index 7f1793b..e788521 100644 --- a/nouveau_reg.h +++ b/nouveau_reg.h @@ -275,7 +275,7 @@ #define NV_RAMDAC_GENERAL_CONTROL 0x600 -#define NV_RAMDAC_0404 0x404 +#define NV_RAMDAC_OUTPUT 0x404 #define NV_RAMDAC_NVPLL 0x500 #define NV_RAMDAC_MPLL 0x504 @@ -296,5 +296,7 @@ #define NV_RAMDAC_FP_CONTROL 0x848 +#define NV_RAMDAC_FP_DEBUG_0 0x880 + #define NV_RAMDAC_FP_TMDS_DATA 0x8b0 #define NV_RAMDAC_FP_TMDS_LVDS 0x8b4 diff --git a/radeontool.c b/radeontool.c index 35057cd..d6009d9 100644 --- a/radeontool.c +++ b/radeontool.c @@ -220,8 +220,8 @@ void radeon_cmd_regs(void) SHOW_REG(NV_PFIFO_RAMFC); SHOW_REG(NV40_PFIFO_RAMFC); -#define SHOW_CRTC0_REG(r) printf("%s\t%08x\n", #r, radeon_get32(NV_PCRTC0_OFFSET+r, #r)) -#define SHOW_CRTC1_REG(r) printf("%s\t%08x\n", #r, radeon_get32(NV_PCRTC0_OFFSET+0x2000+r, #r)) +#define SHOW_CRTC0_REG(r) printf("%s0\t%08x\n", #r, radeon_get32(NV_PCRTC0_OFFSET+r, #r)) +#define SHOW_CRTC1_REG(r) printf("%s1\t%08x\n", #r, radeon_get32(NV_PCRTC0_OFFSET+0x2000+r, #r)) SHOW_CRTC0_REG(NV_CRTC_START); SHOW_CRTC0_REG(NV_CRTC_CURSOR_CONFIG); @@ -245,9 +245,10 @@ void radeon_cmd_regs(void) SHOW_RAMDAC_REG(NV_RAMDAC_CURSOR_CTRL); SHOW_RAMDAC_REG(NV_RAMDAC_CURSOR_DATA_LO); SHOW_RAMDAC_REG(NV_RAMDAC_CURSOR_DATA_HI); - SHOW_RAMDAC_REG(NV_RAMDAC_0404); + SHOW_RAMDAC_REG(NV_RAMDAC_OUTPUT); SHOW_RAMDAC_REG(NV_RAMDAC_FP_CONTROL); + SHOW_RAMDAC_REG(NV_RAMDAC_FP_DEBUG_0); SHOW_RAMDAC_REG(NV_RAMDAC_GENERAL_CONTROL); SHOW_RAMDAC_REG(NV_RAMDAC_NVPLL); SHOW_RAMDAC_REG(NV_RAMDAC_MPLL); |