Attachment 7727 Details for Bug 5774 – Alternative fix

[patch] Alternative fix

video2.patch (text/plain), 1.94 KB, created by Alan Hourihane on 2006-11-10 07:30:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Hourihane

Created: 2006-11-10 07:30:38 UTC

Size: 1.94 KB

patch

obsolete

>diff --git a/src/i830_video.c b/src/i830_video.c
>index 054d26b..1a1b968 100644
>--- a/src/i830_video.c
>+++ b/src/i830_video.c
>@@ -934,14 +934,16 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
>       pPriv->brightness = value;
>       overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff);
>       ErrorF("BRIGHTNESS\n");
>-      OVERLAY_UPDATE;
>+      if (*pI830->overlayOn)
>+         OVERLAY_UPDATE;
>    } else if (attribute == xvContrast) {
>       if ((value < 0) || (value > 255))
> 	 return BadValue;
>       pPriv->contrast = value;
>       overlay->OCLRC0 = (pPriv->contrast << 18) | (pPriv->brightness & 0xff);
>       ErrorF("CONTRAST\n");
>-      OVERLAY_UPDATE;
>+      if (*pI830->overlayOn)
>+         OVERLAY_UPDATE;
>    } else if (pI830->Clone && attribute == xvPipe) {
>       if ((value < 0) || (value > 1))
>          return BadValue;
>@@ -955,7 +957,8 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
>       else 
>          overlay->OCONFIG |= OVERLAY_PIPE_B;
>       ErrorF("PIPE CHANGE\n");
>-      OVERLAY_UPDATE;
>+      if (*pI830->overlayOn)
>+         OVERLAY_UPDATE;
>    } else if (attribute == xvGamma0 && (IS_I9XX(pI830))) {
>       pPriv->gamma0 = value; 
>    } else if (attribute == xvGamma1 && (IS_I9XX(pI830))) {
>@@ -982,7 +985,8 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
> 	 break;
>       }
>       ErrorF("COLORKEY\n");
>-      OVERLAY_UPDATE;
>+      if (*pI830->overlayOn)
>+         OVERLAY_UPDATE;
>       REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
>    } else if(attribute == xvDoubleBuffer) {
>       if ((value < 0) || (value > 1))
>@@ -1000,13 +1004,8 @@ I830SetPortAttribute(ScrnInfoPtr pScrn,
>         attribute == xvGamma3 ||
>         attribute == xvGamma4 ||
>         attribute == xvGamma5) && (IS_I9XX(pI830))) {
>-	CARD32 r = overlay->OCMD & OVERLAY_ENABLE;
>         ErrorF("GAMMA\n");
>-        overlay->OCMD &= ~OVERLAY_ENABLE;
>-        OVERLAY_UPDATE;
> 	I830UpdateGamma(pScrn);
>-        overlay->OCMD |= r;
>-        OVERLAY_UPDATE;
>    }
> 
>    return Success;

Actions: View | Splinter Review

Attachments on bug 5774: 4518 | 4519 | 4520 | 4521 | 4522 | 6449 | 6529 | 7399 | 7654 | 7727

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.