diff options
author | Keith Packard <keithp@neko.keithp.com> | 2006-11-30 14:09:31 -0800 |
---|---|---|
committer | Keith Packard <keithp@neko.keithp.com> | 2006-11-30 14:09:31 -0800 |
commit | ff64bc7397cafbec94e388e1625b3a1999f1aca7 (patch) | |
tree | fdd9d519c382e39dd02be9fad341f31e668a047f /src/i830_video.c | |
parent | b94b7c4bcfdb7ba59ed818f72309b5060a2ab7ee (diff) | |
parent | 16e01b117bb7ae90b150dd4f25a887dd895cf473 (diff) |
Merge branch 'restructure-outputs' into modesetting.
Outputs and Crtcs now have a driver-independent representation which should
permit generic code to control RandR 1.2 and startup configuration.
Diffstat (limited to 'src/i830_video.c')
-rw-r--r-- | src/i830_video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 5a9c9735..a3bfda8d 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -3593,7 +3593,7 @@ I830VideoSwitchModeAfter(ScrnInfoPtr pScrn, DisplayModePtr mode) } /* Check we have an LFP connected */ - if (i830PipeHasType (pScrn, pPriv->pipe, I830_OUTPUT_LVDS)) + if (i830PipeHasType (pI830->xf86_config.crtc[pPriv->pipe], I830_OUTPUT_LVDS)) { size = pPriv->pipe ? INREG(PIPEBSRC) : INREG(PIPEASRC); hsize = (size >> 16) & 0x7FF; |