Attachment 107796 Details for Bug 220197

[patch] xf86-video-nv-bug220197.diff

xf86-video-nv-bug220197.diff (text/plain), 1.31 KB, created by Stefan Dirsch on 2006-12-01 05:45:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2006-12-01 05:45:06 UTC

Size: 1.31 KB

patch

obsolete

>diff-tree 558ef7e26e361529a05360610abc3cbcdb04fd67 (from 08bb966abbca11c4581d666af3249e4922156e03)
>Author: Aaron Plattner <aplattner@nvidia.com>
>Date:   Thu Nov 30 17:36:29 2006 -0800
>
>    Save and restore DAC0 register 608 when probing for connected CRTs.
>    
>    Adapted from a patch by Egbert Eich for Novell bug #220197.
>
>diff --git a/src/nv_setup.c b/src/nv_setup.c
>index c7a0e86..4009fde 100644
>--- a/src/nv_setup.c
>+++ b/src/nv_setup.c
>@@ -174,14 +174,17 @@ NVIsConnected (ScrnInfoPtr pScrn, int ou
> {
>     NVPtr pNv = NVPTR(pScrn);
>     volatile U032 *PRAMDAC = pNv->PRAMDAC0;
>-    CARD32 reg52C, reg608;
>+    CARD32 reg52C, reg608, dac0_reg608;
>     Bool present;
> 
>     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
>                "Probing for analog device on output %s...\n", 
>                 output ? "B" : "A");
> 
>-    if(output) PRAMDAC += 0x800;
>+    if(output) {
>+        dac0_reg608 = PRAMDAC[0x0608/4];
>+        PRAMDAC += 0x800;
>+    }
> 
>     reg52C = PRAMDAC[0x052C/4];
>     reg608 = PRAMDAC[0x0608/4];
>@@ -204,7 +207,8 @@ NVIsConnected (ScrnInfoPtr pScrn, int ou
>     else
>        xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "  ...can't find one\n");
> 
>-    pNv->PRAMDAC0[0x0608/4] &= 0x0000EFFF;
>+    if(output)
>+        pNv->PRAMDAC0[0x0608/4] = dac0_reg608;
> 
>     PRAMDAC[0x052C/4] = reg52C;
>     PRAMDAC[0x0608/4] = reg608;

Actions: View | Diff

Attachments on bug 220197: 104796 | 105851 | 107179 | 107796