diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-11-26 16:44:17 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-11-26 16:44:17 -0800 |
| commit | 2529863a1ade782819d76be2d0dc16e89028c1e3 (patch) | |
| tree | be9973bb1f83a633c998f137caa132b5f1a84bb8 /src/i830_dri.c | |
| parent | 9aca4e207440119f4280b78199a221f85d50c511 (diff) | |
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.
Diffstat (limited to 'src/i830_dri.c')
| -rw-r--r-- | src/i830_dri.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c index 3b029185..af34afc5 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -1513,13 +1513,9 @@ I830DRISetVBlankInterrupt (ScrnInfoPtr pScrn, Bool on) if (pI830->directRenderingEnabled && pI830->drmMinor >= 5) { if (on) { - if (pI830->pipes[1].enabled) { - if (pI830->drmMinor >= 6) - pipe.pipe = DRM_I830_VBLANK_PIPE_A | DRM_I830_VBLANK_PIPE_B; - else - pipe.pipe = DRM_I830_VBLANK_PIPE_B; + if (pI830->num_pipes > 1 && pI830->xf86_crtc[1]->enabled) pipe.pipe = DRM_I830_VBLANK_PIPE_B; - } else + else pipe.pipe = DRM_I830_VBLANK_PIPE_A; } else { pipe.pipe = 0; |