summaryrefslogtreecommitdiff
path: root/src/nv30_exa.c
diff options
context:
space:
mode:
authorPatrice Mandin <pmandin@caramail.com>2008-01-15 18:45:30 +0100
committerPatrice Mandin <pmandin@caramail.com>2008-01-15 18:45:30 +0100
commit17fa42166fb4e8102cbe880be6021f1145268d16 (patch)
tree1ebfd89a867c37faa13b5c0bb8b54048e46be685 /src/nv30_exa.c
parent777a3df246feb364d440282db0864fb9b0908872 (diff)
downloadxorg-driver-xf86-video-nouveau-17fa42166fb4e8102cbe880be6021f1145268d16.tar.gz
nv30: set VIEWPORT_TX_ORIGIN to 0 for all cards, except real nv30
Diffstat (limited to 'src/nv30_exa.c')
-rw-r--r--src/nv30_exa.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nv30_exa.c b/src/nv30_exa.c
index 84e8435..3a003fc 100644
--- a/src/nv30_exa.c
+++ b/src/nv30_exa.c
@@ -421,9 +421,12 @@ NV30_SetupSurface(ScrnInfoPtr pScrn, PixmapPtr pPix, PicturePtr pPict)
BEGIN_RING(Nv3D, NV34TCL_VIEWPORT_CLIP_HORIZ(0), 2);
OUT_RING ((w-1+x)<<16);
OUT_RING ((h-1+y)<<16);
- if (pNv->NVArch == 0x30 || pNv->NVArch == 0x31) {
- BEGIN_RING(Nv3D, NV34TCL_VIEWPORT_TX_ORIGIN, 1);
+
+ BEGIN_RING(Nv3D, NV34TCL_VIEWPORT_TX_ORIGIN, 1);
+ if (pNv->NVArch == 0x30) {
OUT_RING((y<<16)|x);
+ } else {
+ OUT_RING(0);
}
return TRUE;