diff options
| author | Matthew Garrett <mjg59@srcf.ucam.org> | 2007-09-13 01:06:59 +0100 |
|---|---|---|
| committer | Matthew Garrett <mjg59@srcf.ucam.org> | 2007-09-13 01:06:59 +0100 |
| commit | 727fcb1ad3099454d0cb82f9b068b03746388a42 (patch) | |
| tree | 4c1156c8fadded5cdb26efa5fc0aba31f88e80a1 | |
| parent | 168b335ba49e20288287f483f9e76e5836688846 (diff) | |
Get rid of more random constants
| -rw-r--r-- | include/radeon_reg.h | 8 | ||||
| -rw-r--r-- | xorg/avivo_output.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/radeon_reg.h b/include/radeon_reg.h index 5c22039..49e27ee 100644 --- a/include/radeon_reg.h +++ b/include/radeon_reg.h @@ -3471,6 +3471,14 @@ #define AVIVO_LVDS_CNTL 0x7af0 # define AVIVO_LVDS_EN ((1 << 4)) # define AVIVO_LVDS_MYSTERY ((1 << 0) | (1 << 2) | (1 << 3)) +#define AVIVO_LVTMA_PWRSEQ_STATE 0x7af4 +# define AVIVO_LVTMA_PWRSEQ_STATE_TARGET_STATE_R (1 << 0) +# define AVIVO_LVTMA_PWRSEQ_STATE_DIGON (1 << 1) +# define AVIVO_LVTMA_PWRSEQ_STATE_SYNCEN (1 << 2) +# define AVIVO_LVTMA_PWRSEQ_STATE_BLON (1 << 3) +# define AVIVO_LVTMA_PWRSEQ_STATE_DONE (1 << 4) +# define AVIVO_LVTMA_PWRSEQ_STATE (8) + #define AVIVO_LVDS_BACKLIGHT_CNTL 0x7af8 # define AVIVO_LVDS_BACKLIGHT_CNTL_EN (1 << 0) # define AVIVO_LVDS_BACKLIGHT_LEVEL_MASK 0x0000ff00 diff --git a/xorg/avivo_output.c b/xorg/avivo_output.c index 2d8d2b5..5ca41b8 100644 --- a/xorg/avivo_output.c +++ b/xorg/avivo_output.c @@ -242,9 +242,9 @@ avivo_output_lvds_dpms(xf86OutputPtr output, int mode) xf86DrvMsg(output->scrn->scrnIndex, X_INFO, "DISABLE LVTMA\n"); OUTREG(AVIVO_LVDS_CNTL, AVIVO_LVDS_MYSTERY); do { - tmp = INREG(0x7AF4); + tmp = INREG(AVIVO_LVTMA_PWRSEQ_STATE); usleep(100); - } while (tmp != 0x800); + } while (tmp != 0x8 << AVIVO_LVTMA_PWRSEQ_STATE); OUTREG(AVIVO_LVTMA_CLOCK_CNTL, 0); OUTREG(AVIVO_LVTMA_CLOCK_ENABLE, 0); break; |