diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-11-04 00:46:18 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-11-07 15:17:27 -0800 |
| commit | f1ff01e31eb8e9dc05190bf1a8b318d4f587f64a (patch) | |
| tree | 0063232cbf5ecb356ee84864e9e758c6e9cb4731 /src/i830_crt.c | |
| parent | 0b2d36d4f038c4e8fa08632b6f1368627f010392 (diff) | |
Eliminate operatingDevices member and PIPE_* values.
operatingDevices and MonType1/MonType2 duplicate information already stored
in the device structures. Eliminate them and replace uses with direct
references to the appropriate other data.
(cherry picked from 3ab7f9693217d8fe993bdc94c376b219b0082961 commit)
Diffstat (limited to 'src/i830_crt.c')
| -rw-r--r-- | src/i830_crt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/i830_crt.c b/src/i830_crt.c index 4c704b2c..9287a205 100644 --- a/src/i830_crt.c +++ b/src/i830_crt.c @@ -170,7 +170,7 @@ static Bool i830_crt_detect_load(ScrnInfoPtr pScrn, I830OutputPtr output) { I830Ptr pI830 = I830PTR(pScrn); - CARD32 adpa, pipeconf; + CARD32 adpa, pipeconf, bclrpat; CARD8 st00; int pipeconf_reg, bclrpat_reg, dpll_reg; int pipe; @@ -198,9 +198,10 @@ i830_crt_detect_load(ScrnInfoPtr pScrn, I830OutputPtr output) ((pipe == 1) ? ADPA_PIPE_B_SELECT : 0)); } - /* Set the border color to red, green. Maybe we should save/restore this + /* Set the border color to purple. Maybe we should save/restore this * reg. */ + bclrpat = INREG(bclrpat_reg); OUTREG(bclrpat_reg, 0x00500050); /* Force the border color through the active region */ @@ -211,6 +212,7 @@ i830_crt_detect_load(ScrnInfoPtr pScrn, I830OutputPtr output) st00 = pI830->readStandard(pI830, 0x3c2); /* Restore previous settings */ + OUTREG(bclrpat_reg, bclrpat); OUTREG(pipeconf_reg, pipeconf); OUTREG(ADPA, adpa); |