Attachment 47509 Details for Bug 105511

[patch] New r128 patch by Egbert, which fixes this issue.

r128.diff (text/plain), 1.69 KB, created by Stefan Dirsch on 2005-08-25 10:04:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2005-08-25 10:04:55 UTC

Size: 1.69 KB

patch

obsolete

>--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_reg.h	19 Dec 2004 19:49:33 -0000	1.4
>+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_reg.h	23 May 2005 09:50:20 -0000	1.5
>@@ -68,7 +68,7 @@
>     do {                           \
> 	CARD32 tmp = INREG(addr);  \
> 	tmp &= (mask);             \
>-	tmp |= (val);              \
>+	tmp |= ((val) & ~(mask));  \
> 	OUTREG(addr, tmp);         \
>     } while (0)
> 
>@@ -84,7 +84,7 @@
>     do {                                                                  \
> 	CARD32 tmp = INPLL(pScrn, addr);                                  \
> 	tmp &= (mask);                                                    \
>-	tmp |= (val);                                                     \
>+	tmp |= ((val) & ~(mask));                                         \
> 	OUTPLL(addr, tmp);                                                \
>     } while (0)
> 
>--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig	2005-01-04 00:25:03.000000000 +0100
>+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c	2005-08-25 11:39:10.000000000 +0200
>@@ -2586,7 +2591,8 @@
>     R128InfoPtr   info      = R128PTR(pScrn);
>     unsigned char *R128MMIO = info->MMIO;
> 
>-    OUTPLLP(pScrn, R128_PPLL_REF_DIV, R128_PPLL_ATOMIC_UPDATE_W, 0xffff);
>+    OUTPLLP(pScrn, R128_PPLL_REF_DIV, R128_PPLL_ATOMIC_UPDATE_W, 
>+	    ~R128_PPLL_ATOMIC_UPDATE_W );
> }
> 
> /* Write PLL registers. */
>@@ -2602,7 +2608,9 @@
> 	    R128_PPLL_RESET
> 	    | R128_PPLL_ATOMIC_UPDATE_EN
> 	    | R128_PPLL_VGA_ATOMIC_UPDATE_EN,
>-	    0xffff);
>+	    ~( R128_PPLL_RESET
>+	       | R128_PPLL_ATOMIC_UPDATE_EN
>+	       | R128_PPLL_VGA_ATOMIC_UPDATE_EN) );
> 
>     R128PLLWaitForReadUpdateComplete(pScrn);
>     OUTPLLP(pScrn, R128_PPLL_REF_DIV,

Actions: View | Diff

Attachments on bug 105511: 46499 | 46637 | 46647 | 46668 | 47193 | 47509 | 47546