diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-01-07 08:30:17 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-01-07 08:30:17 +1100 |
| commit | 38d96e1769ac4e8dd17b73d793b0c399090e5d1a (patch) | |
| tree | 1b0caf9ab5479e8fdc2b3c2beff2dd53f50d6fc3 /src | |
| parent | d03cc354bc44f8d141370277eab434b848e8f6fa (diff) | |
| parent | 1f6239de8d7618de6aee402eaf1d8552524a996e (diff) | |
| download | xorg-driver-xf86-video-nouveau-38d96e1769ac4e8dd17b73d793b0c399090e5d1a.tar.gz | |
Merge branch 'origin' into randr-1.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/nv_dri.c | 2 | ||||
| -rw-r--r-- | src/nv_hw.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/nv_dri.c b/src/nv_dri.c index f01f366..e0d19df 100644 --- a/src/nv_dri.c +++ b/src/nv_dri.c @@ -244,7 +244,7 @@ Bool NVDRIGetVersion(ScrnInfoPtr pScrn) } /* temporary lock step versioning */ - if (pNv->pKernelDRMVersion->version_patchlevel != 1) { + if (pNv->pKernelDRMVersion->version_patchlevel != 2) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "wrong DRM version\n"); return FALSE; 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); |