diff options
| author | Dafydd Harries <daf@rhydd.org> | 2007-09-13 00:38:16 +0100 |
|---|---|---|
| committer | Dafydd Harries <daf@rhydd.org> | 2007-09-13 02:14:18 +0100 |
| commit | 6e154d4c7d696511ffa711b9328c8fb395c48072 (patch) | |
| tree | 459fb27e72cb43fdbf541e07a4a0511fa5c45a60 | |
| parent | efeee9d08152ddd1d4703f3b3fa3115ba6769bfb (diff) | |
0x60c0 is stereoscopic display status
| -rw-r--r-- | avivotool/avivotool.c | 2 | ||||
| -rw-r--r-- | include/avivo.h | 2 | ||||
| -rw-r--r-- | include/radeon_reg.h | 2 | ||||
| -rw-r--r-- | xorg/avivo_crtc.c | 2 | ||||
| -rw-r--r-- | xorg/avivo_state.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/avivotool/avivotool.c b/avivotool/avivotool.c index 7ca60dc..aed03a6 100644 --- a/avivotool/avivotool.c +++ b/avivotool/avivotool.c @@ -539,7 +539,7 @@ void radeon_output_set(char *output, char *status) SET_REG(AVIVO_CRTC1_V_SYNC_POL, 0x00000000); SET_REG(AVIVO_CRTC1_FB_FORMAT, AVIVO_CRTC_FORMAT_ARGB32); SET_REG(AVIVO_CRTC1_MODE, 0x00000000); - SET_REG(0x000060c0, 0x00000000); + SET_REG(AVIVO_CRTC1_STEREO_STATUS, 0x00000000); SET_REG(AVIVO_CRTC1_CNTL, 0x00010101); SET_REG(AVIVO_CRTC1_SCAN_ENABLE, AVIVO_CRTC_SCAN_EN); } diff --git a/include/avivo.h b/include/avivo.h index 92d2982..bfb0b6d 100644 --- a/include/avivo.h +++ b/include/avivo.h @@ -110,7 +110,7 @@ struct avivo_state int crtc1_v_sync_pol; int crtc1_cntl; int crtc1_mode; - int crtc1_60c0_mystery; + int crtc1_stereo_status; int crtc1_scan_enable; int crtc1_fb_format; int crtc1_fb_location; diff --git a/include/radeon_reg.h b/include/radeon_reg.h index e65ead2..874ffdc 100644 --- a/include/radeon_reg.h +++ b/include/radeon_reg.h @@ -3247,7 +3247,7 @@ # define AVIVO_CRTC_EN (1 << 0) #define AVIVO_CRTC1_MODE 0x6084 # define AVIVO_CRTC_MODE_TEXT (1 << 8) -#define AVIVO_CRTC1_60c0_MYSTERY 0x60c0 +#define AVIVO_CRTC1_STEREO_STATUS 0x60c0 /* These all appear to control the scanout from the framebuffer. * Flicking SCAN_ENABLE low results in a black screen -- aside from diff --git a/xorg/avivo_crtc.c b/xorg/avivo_crtc.c index db60b59..b3db4cb 100644 --- a/xorg/avivo_crtc.c +++ b/xorg/avivo_crtc.c @@ -255,7 +255,7 @@ avivo_crtc_mode_set(xf86CrtcPtr crtc, OUTREG(AVIVO_CRTC1_FB_END + avivo_crtc->crtc_offset, fb_location + avivo_crtc->fb_length); OUTREG(AVIVO_CRTC1_MODE + avivo_crtc->crtc_offset, 0); - OUTREG(AVIVO_CRTC1_60c0_MYSTERY + avivo_crtc->crtc_offset, 0); + OUTREG(AVIVO_CRTC1_STEREO_STATUS + avivo_crtc->crtc_offset, 0); /* avivo can only shift offset by 4 pixel in x if you program somethings * not multiple of 4 you gonna drive the GPU crazy and likely won't * be able to restore it without cold reboot (vbe post not enough) diff --git a/xorg/avivo_state.c b/xorg/avivo_state.c index ef0ba95..f917456 100644 --- a/xorg/avivo_state.c +++ b/xorg/avivo_state.c @@ -115,7 +115,7 @@ avivo_restore_state(ScrnInfoPtr screen_info) OUTREG(AVIVO_CRTC1_V_SYNC_POL, state->crtc1_v_sync_pol); OUTREG(AVIVO_CRTC1_CNTL, state->crtc1_cntl); OUTREG(AVIVO_CRTC1_MODE, state->crtc1_mode); - OUTREG(AVIVO_CRTC1_60c0_MYSTERY, state->crtc1_60c0_mystery); + OUTREG(AVIVO_CRTC1_STEREO_STATUS, state->crtc1_stereo_status); OUTREG(AVIVO_CRTC1_SCAN_ENABLE, state->crtc1_scan_enable); OUTREG(AVIVO_CRTC1_FB_FORMAT, state->crtc1_fb_format); OUTREG(AVIVO_CRTC1_FB_LOCATION, state->crtc1_fb_location); @@ -233,7 +233,7 @@ avivo_save_state(ScrnInfoPtr screen_info) state->crtc1_v_sync_pol = INREG(AVIVO_CRTC1_V_SYNC_POL); state->crtc1_cntl = INREG(AVIVO_CRTC1_CNTL); state->crtc1_mode = INREG(AVIVO_CRTC1_MODE); - state->crtc1_60c0_mystery = INREG(AVIVO_CRTC1_60c0_MYSTERY); + state->crtc1_stereo_status = INREG(AVIVO_CRTC1_STEREO_STATUS); state->crtc1_scan_enable = INREG(AVIVO_CRTC1_SCAN_ENABLE); state->crtc1_fb_format = INREG(AVIVO_CRTC1_FB_FORMAT); state->crtc1_fb_location = INREG(AVIVO_CRTC1_FB_LOCATION); |