Attachment 7188 Details for Bug 7951 – Another attempt to fix xv lockup

[patch] Another attempt to fix xv lockup

xv2.patch (text/plain), 2.92 KB, created by Alan Hourihane on 2006-09-29 03:08:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Hourihane

Created: 2006-09-29 03:08:09 UTC

Size: 2.92 KB

patch

obsolete

>diff --git a/src/i830_video.c b/src/i830_video.c
>index b87e4eb..3fadf97 100644
>--- a/src/i830_video.c
>+++ b/src/i830_video.c
>@@ -420,7 +420,7 @@ I830InitVideo(ScreenPtr pScreen)
>    XF86VideoAdaptorPtr overlayAdaptor = NULL, texturedAdaptor = NULL;
>    int num_adaptors;
> 
>-   DPRINTF(PFX, "I830InitVideo\n");
>+   ErrorF("I830InitVideo\n");
> 
> #if 0
>    {
>@@ -494,7 +494,7 @@ I830ResetVideo(ScrnInfoPtr pScrn)
>    I830OverlayRegPtr overlay =
> 	 (I830OverlayRegPtr) (pI830->FbBase + pI830->OverlayMem->Start);
> 
>-   DPRINTF(PFX, "I830ResetVideo: base: %p, offset: 0x%lx, obase: %p\n",
>+   ErrorF("I830ResetVideo: base: %p, offset: 0x%lx, obase: %p\n",
> 	   pI830->FbBase, pI830->OverlayMem->Start, overlay);
>    /*
>     * Default to maximum image size in YV12
>@@ -663,7 +663,7 @@ I830SetupImageVideoOverlay(ScreenPtr pSc
>    I830PortPrivPtr pPriv;
>    XF86AttributePtr att;
> 
>-   DPRINTF(PFX, "I830SetupImageVideoOverlay\n");
>+   ErrorF("I830SetupImageVideoOverlay\n");
> 
>    if (!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
> 			 sizeof(I830PortPrivRec) + sizeof(DevUnion))))
>@@ -789,7 +789,7 @@ I830SetupImageVideoTextured(ScreenPtr pS
>    int nports = 16, i;
>    int nAttributes;
> 
>-   DPRINTF(PFX, "I830SetupImageVideoOverlay\n");
>+   ErrorF("I830SetupImageVideoOverlay\n");
> 
>    nAttributes = NUM_TEXTURED_ATTRIBUTES;
> 
>@@ -898,7 +898,7 @@ I830StopVideo(ScrnInfoPtr pScrn, pointer
>    if (pPriv->textured)
>       return;
> 
>-   DPRINTF(PFX, "I830StopVideo\n");
>+   ErrorF("I830StopVideo\n");
> 
>    REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
> 
>@@ -1671,8 +1671,11 @@ #endif
>       I830ResetVideo(pScrn);
> 
>    /* Ensure overlay is turned on with OVERLAY_ENABLE at 0 */
>-   if (!*pI830->overlayOn)
>+   if (!*pI830->overlayOn) {
>+      ErrorF("TURNING ON OVERLAY BEFORE UPDATE\n");
>+      overlay->OCMD &= ~OVERLAY_ENABLE;
>       OVERLAY_UPDATE;
>+   }
> 
>    /* Fix up the dstBox if outside the visible screen */
>    {
>@@ -1939,8 +1942,8 @@ #endif
>       /*
>        * Y down-scale factor as a multiple of 4096.
>        */
>-      xscaleFract = ((src_w - 1) << 12) / drw_w;
>-      yscaleFract = ((src_h - 1) << 12) / drw_h;
>+      xscaleFract = ((src_w - 1) << 12) / (dstBox->x2 - dstBox->x1) /*drw_w*/;
>+      yscaleFract = ((src_h - 1) << 12) / (dstBox->y2 - dstBox->y1) /*drw_h*/;
> 
>       /* Calculate the UV scaling factor. */
>       xscaleFractUV = xscaleFract / uvratio;
>@@ -2873,7 +2876,7 @@ I830AllocateMemory(ScrnInfoPtr pScrn, FB
>    ScreenPtr pScreen;
>    FBLinearPtr new_linear = NULL;
> 
>-   DPRINTF(PFX, "I830AllocateMemory\n");
>+   ErrorF("I830AllocateMemory\n");
> 
>    if (linear) {
>       if (linear->size >= size)
>@@ -2945,7 +2948,7 @@ I830PutImage(ScrnInfoPtr pScrn,
>    int pitchAlignMask;
>    int extraLinear;
> 
>-   DPRINTF(PFX, "I830PutImage: src: (%d,%d)(%d,%d), dst: (%d,%d)(%d,%d)\n"
>+   ErrorF("I830PutImage: src: (%d,%d)(%d,%d), dst: (%d,%d)(%d,%d)\n"
> 	   "width %d, height %d\n", src_x, src_y, src_w, src_h, drw_x, drw_y,
> 	   drw_w, drw_h, width, height);
>

Actions: View | Splinter Review

Attachments on bug 7951: 6641 | 6674 | 7173 | 7174 | 7178 | 7184 | 7186 | 7188 | 7189 | 7190 | 7191 | 7192 | 7193 | 7194 | 7196 | 7197 | 7200 | 7201 | 7202 | 7204 | 7205 | 7206

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.