diff options
| author | Keith Packard <keithp@bouzouki.jf.intel.com> | 2006-12-13 13:15:14 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@bouzouki.jf.intel.com> | 2006-12-13 13:15:14 -0800 |
| commit | 3fe802453a85183a69c36a098639895f49b17df1 (patch) | |
| tree | d1ebfa96e8cf067cc161799384d0a8586d18fa6c /src/i830_video.c | |
| parent | 0f6addc8a6aeb9bd041d0f8e8e5850e76764ba51 (diff) | |
Move xf86CrtcConfig to ScrnInfo private.
Pull xf86CrtcConfig out of the driver private structure and allocate a
ScrnInfo private index for it. Also, make the arrays of outputs and crtcs
dynamic instead of fixed.
Diffstat (limited to 'src/i830_video.c')
| -rw-r--r-- | src/i830_video.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 59794156..d10fd168 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -3514,6 +3514,7 @@ void i830_crtc_dpms_video(xf86CrtcPtr crtc, Bool on) { ScrnInfoPtr pScrn = crtc->scrn; + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); I830Ptr pI830 = I830PTR(pScrn); I830PortPrivPtr pPriv; I830CrtcPrivatePtr intel_crtc = crtc->driver_private; @@ -3551,7 +3552,7 @@ i830_crtc_dpms_video(xf86CrtcPtr crtc, Bool on) } /* Check we have an LFP connected */ - if (i830PipeHasType(pI830->xf86_config.crtc[pPriv->pipe], + if (i830PipeHasType(xf86_config->crtc[pPriv->pipe], I830_OUTPUT_LVDS)) { size = pPriv->pipe ? INREG(PIPEBSRC) : INREG(PIPEASRC); hsize = (size >> 16) & 0x7FF; |