From 2529863a1ade782819d76be2d0dc16e89028c1e3 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 26 Nov 2006 16:44:17 -0800 Subject: Start output/crtc restructuring work. It compiles. Outputs and Crtcs are now split between 'generic' and 'driver specific' pieces in the hope that more code will be able to migrate to the xf86-generic layer. Right now, the code remains tangled together, significant work remains to tease the pieces apart. First the code needs to be made to actually work as-is though. --- src/i830_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i830_video.c') diff --git a/src/i830_video.c b/src/i830_video.c index d84c1c97..5ce2b5d3 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -3595,7 +3595,7 @@ I830VideoSwitchModeAfter(ScrnInfoPtr pScrn, DisplayModePtr mode) } /* Check we have an LFP connected */ - if (i830PipeHasType (pScrn, pPriv->pipe, I830_OUTPUT_LVDS)) + if (i830PipeHasType (pI830->xf86_crtc[pPriv->pipe], I830_OUTPUT_LVDS)) { size = pPriv->pipe ? INREG(PIPEBSRC) : INREG(PIPEASRC); hsize = (size >> 16) & 0x7FF; -- cgit v1.2.3 From e8d1db326388c9a112f2b8e2eff5a81210b8d6e4 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 27 Nov 2006 12:01:47 -0800 Subject: Move crtc/output config to sub-structure. Place crtc/output in separate structure at head of driver private structure. Use this from the config code to make it driver-independent. Still lots of effectively driver independent code that continues to use driver dependent stuff, but that will change. --- src/i830_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i830_video.c') diff --git a/src/i830_video.c b/src/i830_video.c index 5ce2b5d3..2f626b2a 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -3595,7 +3595,7 @@ I830VideoSwitchModeAfter(ScrnInfoPtr pScrn, DisplayModePtr mode) } /* Check we have an LFP connected */ - if (i830PipeHasType (pI830->xf86_crtc[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; -- cgit v1.2.3