From c386d2552b293d495c208d3309b28743a8c12828 Mon Sep 17 00:00:00 2001 From: Stuart Bennett Date: Thu, 12 Feb 2009 14:15:45 +0000 Subject: [PATCH] unlikely --- src/nv_crtc.c | 8 +++++--- src/nv_output.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/nv_crtc.c b/src/nv_crtc.c index 87ee69b..c754ee7 100644 --- a/src/nv_crtc.c +++ b/src/nv_crtc.c @@ -671,12 +671,13 @@ nv_crtc_mode_set_regs(xf86CrtcPtr crtc, DisplayModePtr mode) regp->CRTC[NV_CIO_CRE_SCRATCH3__INDEX] = 0x88; else regp->CRTC[NV_CIO_CRE_SCRATCH3__INDEX] = 0x22; + regp->CRTC[NV_CIO_CRE_SCRATCH3__INDEX] = 0; /* These values seem to vary */ /* This register seems to be used by the bios to make certain decisions on some G70 cards? */ regp->CRTC[NV_CIO_CRE_SCRATCH4__INDEX] = savep->CRTC[NV_CIO_CRE_SCRATCH4__INDEX]; - regp->CRTC[NV_CIO_CRE_CSB] = 0x80; + regp->CRTC[NV_CIO_CRE_CSB] = 0; /* What does this do?: * bit0: crtc0 @@ -690,12 +691,13 @@ nv_crtc_mode_set_regs(xf86CrtcPtr crtc, DisplayModePtr mode) if (lvds_output) regp->CRTC[NV_CIO_CRE_4B] |= 0x40; + regp->CRTC[NV_CIO_CRE_4B] = 0; /* The blob seems to take the current value from crtc 0, add 4 to that * and reuse the old value for crtc 1 */ regp->CRTC[NV_CIO_CRE_52] = pNv->SavedReg.crtc_reg[0].CRTC[NV_CIO_CRE_52]; - if (!nv_crtc->head) - regp->CRTC[NV_CIO_CRE_52] += 4; +// if (!nv_crtc->head) +// regp->CRTC[NV_CIO_CRE_52] += 4; regp->unk830 = mode->CrtcVDisplay - 3; regp->unk834 = mode->CrtcVDisplay - 1; diff --git a/src/nv_output.c b/src/nv_output.c index c8683d0..e53e6e1 100644 --- a/src/nv_output.c +++ b/src/nv_output.c @@ -620,6 +620,7 @@ nv_output_prepare(xf86OutputPtr output) regp->CRTC[NV_CIO_CRE_LCD__INDEX] |= (nv_encoder->dcb->or << 4) & 0x30; } else regp->CRTC[NV_CIO_CRE_LCD__INDEX] = 0; + regp->CRTC[NV_CIO_CRE_LCD__INDEX] = 3; } } -- 1.5.4.4