summaryrefslogtreecommitdiff
path: root/src/nv_hw.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-01-07 08:30:17 +1100
committerDave Airlie <airlied@linux.ie>2007-01-07 08:30:17 +1100
commit38d96e1769ac4e8dd17b73d793b0c399090e5d1a (patch)
tree1b0caf9ab5479e8fdc2b3c2beff2dd53f50d6fc3 /src/nv_hw.c
parentd03cc354bc44f8d141370277eab434b848e8f6fa (diff)
parent1f6239de8d7618de6aee402eaf1d8552524a996e (diff)
downloadxorg-driver-xf86-video-nouveau-38d96e1769ac4e8dd17b73d793b0c399090e5d1a.tar.gz
Merge branch 'origin' into randr-1.2
Diffstat (limited to 'src/nv_hw.c')
-rw-r--r--src/nv_hw.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nv_hw.c b/src/nv_hw.c
index f36ccd0..d32c8cc 100644
--- a/src/nv_hw.c
+++ b/src/nv_hw.c
@@ -835,7 +835,7 @@ void NVInitGraphContext(ScrnInfoPtr pScrn)
} else {
if(pNv->Architecture >= NV_ARCH_40) {
nvWriteGRAPH(pNv, NV_PGRAPH_DEBUG_1, 0x401287c0);
- nvWriteGRAPH(pNv, NV_PGRAPH_DEBUG_3, 0x60de8051);
+ nvWriteGRAPH(pNv, NV_PGRAPH_DEBUG_3, 0x60de8055);
nvWriteGRAPH(pNv, NV_PGRAPH_DEBUG_4, 0x00008000);
nvWriteGRAPH(pNv, NV_PGRAPH_LIMIT_VIOL_PIX, 0x00be3c5f);
@@ -903,7 +903,6 @@ void NVInitGraphContext(ScrnInfoPtr pScrn)
nvWriteGRAPH(pNv, 0x0b38, 0x2ffff800);
nvWriteGRAPH(pNv, 0x0b3c, 0x00006000);
- nvWriteGRAPH(pNv, 0x032C, 0x01000000);
} else
if(pNv->Architecture == NV_ARCH_30) {
nvWriteGRAPH(pNv, 0x0084, 0x40108700);