diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2008-03-07 13:18:09 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2008-03-07 13:18:09 -0800 |
| commit | 5915c75422c5277d530e7f8ecbdfe94654706efd (patch) | |
| tree | 47a11a0a776a47364c990fa4d5652c24892cab0c /src/i830_video.c | |
| parent | 13ae79b415d944891cfdc2cd2d5397fec36a4e8e (diff) | |
Enable hardware overlay on 965
Based on Maxim Levitsky's patch for the same. Many thanks to Maxim for
discovering that this features still works in recent hardware!
Diffstat (limited to 'src/i830_video.c')
| -rw-r--r-- | src/i830_video.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 79e05740..bf260e46 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -352,7 +352,7 @@ i830_overlay_switch_to_crtc (ScrnInfoPtr pScrn, xf86CrtcPtr crtc) I830CrtcPrivatePtr intel_crtc = crtc->driver_private; int pipeconf_reg = intel_crtc->pipe == 0 ? PIPEACONF : PIPEBCONF; - if (INREG(pipeconf_reg) & PIPEACONF_DOUBLE_WIDE) + if (!IS_I965G(pI830) && (INREG(pipeconf_reg) & PIPEACONF_DOUBLE_WIDE)) pPriv->overlayOK = FALSE; else pPriv->overlayOK = TRUE; @@ -580,8 +580,7 @@ I830InitVideo(ScreenPtr pScreen) } /* Set up overlay video if we can do it at this depth. */ - if (!IS_I965G(pI830) && pScrn->bitsPerPixel != 8 && - pI830->overlay_regs != NULL) + if (pScrn->bitsPerPixel != 8 && pI830->overlay_regs != NULL) { overlayAdaptor = I830SetupImageVideoOverlay(pScreen); if (overlayAdaptor != NULL) { @@ -2563,10 +2562,6 @@ I830VideoBlockHandler(int i, pointer blockData, pointer pTimeout, if (pI830->adaptor == NULL) return; - /* No overlay scaler on the 965. */ - if (IS_I965G(pI830)) - return; - pPriv = GET_PORT_PRIVATE(pScrn); if (pPriv->videoStatus & TIMER_MASK) { @@ -2846,10 +2841,6 @@ i830_crtc_dpms_video(xf86CrtcPtr crtc, Bool on) if (pI830->adaptor == NULL) return; - /* No overlay scaler on the 965. */ - if (IS_I965G(pI830)) - return; - pPriv = GET_PORT_PRIVATE(pScrn); if (crtc != pPriv->current_crtc) |