summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_reg.h
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-10-18 16:15:15 +0200
committerBen Skeggs <bskeggs@redhat.com>2010-12-03 15:06:49 +1000
commit0541324abce0225a795222558fdfe35c8dbc5b4f (patch)
treeed9ae66b92d1c2ff52265cb01f3cf74b0e17fd5b /drivers/gpu/drm/nouveau/nouveau_reg.h
parent889fa93dc0ab94b9255e9dd8e2036facfee5485e (diff)
downloadlinux-0541324abce0225a795222558fdfe35c8dbc5b4f.tar.bz2
drm/nv40: Ignore sync-to-vblank active when waiting for idle.
Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_reg.h')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_reg.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_reg.h b/drivers/gpu/drm/nouveau/nouveau_reg.h
index 1b42541ca9e5..1bbe7037cf99 100644
--- a/drivers/gpu/drm/nouveau/nouveau_reg.h
+++ b/drivers/gpu/drm/nouveau/nouveau_reg.h
@@ -332,6 +332,7 @@
#define NV04_PGRAPH_BSWIZZLE5 0x004006A0
#define NV03_PGRAPH_STATUS 0x004006B0
#define NV04_PGRAPH_STATUS 0x00400700
+# define NV40_PGRAPH_STATUS_SYNC_STALL 0x00004000
#define NV04_PGRAPH_TRAPPED_ADDR 0x00400704
#define NV04_PGRAPH_TRAPPED_DATA 0x00400708
#define NV04_PGRAPH_SURFACE 0x0040070C