diff options
| author | Dave Airlie <airlied@airlied-rhel5.(none)> | 2010-04-21 11:06:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@airlied-rhel5.(none)> | 2010-04-21 11:06:21 +1000 |
| commit | 3751c9d1b1c07e504e1f74ecfbaf3dc0ea770b38 (patch) | |
| tree | 6778a260847bb2ce564a0849d2f0a5b700695fc5 | |
| parent | a0b1ca1fbacb3393ed30ac2f8bf2a6c34c949396 (diff) | |
intel-2.2.1-965-overlay.patch
| -rw-r--r-- | src/i830_memory.c | 16 | ||||
| -rw-r--r-- | src/i830_video.c | 10 |
2 files changed, 8 insertions, 18 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c index bf3abf77..18a25129 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -1048,15 +1048,13 @@ i830_allocate_overlay(ScrnInfoPtr pScrn) if (!OVERLAY_NOPHYSICAL(pI830)) flags |= NEED_PHYSICAL_ADDR; - if (!IS_I965G(pI830)) { - pI830->overlay_regs = i830_allocate_memory(pScrn, "overlay registers", - OVERLAY_SIZE, GTT_PAGE_SIZE, - flags); - if (pI830->overlay_regs == NULL) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Failed to allocate Overlay register space.\n"); - /* This failure isn't fatal. */ - } + pI830->overlay_regs = i830_allocate_memory(pScrn, "overlay registers", + OVERLAY_SIZE, GTT_PAGE_SIZE, + flags); + if (pI830->overlay_regs == NULL) { + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Failed to allocate Overlay register space.\n"); + /* This failure isn't fatal. */ } return TRUE; diff --git a/src/i830_video.c b/src/i830_video.c index 87b47c52..b1293be7 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; @@ -2544,10 +2544,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) { @@ -2827,10 +2823,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) |