Attachment 96252 Details for Bug 135002

[patch] Patch from Alan for i810 not livelocking

patch.diff (text/plain), 2.96 KB, created by Matthias Hopf on 2006-08-16 16:09:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Hopf

Created: 2006-08-16 16:09:31 UTC

Size: 2.96 KB

patch

obsolete

>Index: i830_driver.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c,v
>retrieving revision 1.36
>diff -u -r1.36 i830_driver.c
>--- i830_driver.c	3 Oct 2005 09:39:17 -0000	1.36
>+++ i830_driver.c	28 Nov 2005 17:20:46 -0000
>@@ -865,6 +922,7 @@
>    vbeInfoPtr pVbe = pI830->pVbe;
>    CARD32 temp;
>    int singlepipe = 0;
>+   int loop;
> #ifdef I915G_WORKAROUND
>    int getmode1;
>    Bool setmode = FALSE;
>@@ -961,37 +1019,50 @@
>       /* LFP on PipeA is unlikely! */
>       OUTREG(0x61200, INREG(0x61200) & ~0x80000000);
>       OUTREG(0x61204, INREG(0x61204) & ~0x00000001);
>-      while ((INREG(0x61200) & 0x80000000) || (INREG(0x61204) & 1));
>+      loop = 1000000;
>+      while ((INREG(0x61200) & 0x80000000) || (INREG(0x61204) & 1) && loop)
>+         loop--;
>       /* Fix up LVDS */
>       OUTREG(LVDS, (INREG(LVDS) & ~1<<30) | 0x80000300);
>       /* Enable LVDS */
>       OUTREG(0x61200, INREG(0x61200) | 0x80000000);
>       OUTREG(0x61204, INREG(0x61204) | 0x00000001);
>-      while (!(INREG(0x61200) & 0x80000000) && !(INREG(0x61204) & 1));
>-      xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
>+      loop = 1000000;
>+      while (!(INREG(0x61200) & 0x80000000) && !(INREG(0x61204) & 1) && loop)
>+         loop--;
>+      if (loop)
>+         xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
> 	 	"Enabling LVDS directly. Pipe A.\n");
>    } else
>    if (singlepipe & (PIPE_LFP << 8))  {
>       OUTREG(0x61200, INREG(0x61200) & ~0x80000000);
>       OUTREG(0x61204, INREG(0x61204) & ~0x00000001);
>-      while ((INREG(0x61200) & 0x80000000) || (INREG(0x61204) & 1));
>+      loop = 1000000;
>+      while ((INREG(0x61200) & 0x80000000) || (INREG(0x61204) & 1) && loop)
>+         loop--;
>       /* Fix up LVDS */
>       OUTREG(LVDS, (INREG(LVDS) | 1<<30) | 0x80000300);
>       /* Enable LVDS */
>       OUTREG(0x61200, INREG(0x61200) | 0x80000000);
>       OUTREG(0x61204, INREG(0x61204) | 0x00000001);
>-      while (!(INREG(0x61200) & 0x80000000) && !(INREG(0x61204) & 1));
>-      xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
>+      loop = 1000000;
>+      while (!(INREG(0x61200) & 0x80000000) && !(INREG(0x61204) & 1) && loop)
>+         loop--;
>+      if (loop)
>+         xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
> 	 	"Enabling LVDS directly. Pipe B.\n");
>    }
>    else if (!(IS_I830(pI830) || IS_845G(pI830) || IS_I865G(pI830))) {
>       if (!(devices & (PIPE_LFP | PIPE_LFP<<8))) {
>          OUTREG(0x61200, INREG(0x61200) & ~0x80000000);
>          OUTREG(0x61204, INREG(0x61204) & ~0x00000001);
>-         while ((INREG(0x61200) & 0x80000000) || (INREG(0x61204) & 1));
>+         loop = 1000000;
>+         while ((INREG(0x61200) & 0x80000000) || (INREG(0x61204) & 1) && loop)
>+            loop--;
>          /* Fix up LVDS */
>          OUTREG(LVDS, (INREG(LVDS) | 1<<30) & ~0x80000300);
>-         xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
>+         if (loop)
>+            xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
> 	 	"Disabling LVDS directly.\n");
>       }
>    }

Actions: View | Diff

Attachments on bug 135002: 58135 | 58136 | 58137 | 58138 | 58139 | 59326 | 59327 | 59328 | 59329 | 96252 | 96254