summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nvc0/nvc0_fence.c
diff options
context:
space:
mode:
authorChristian König <[email protected]>2011-01-12 00:48:10 +0100
committerChristian König <[email protected]>2011-01-12 00:48:10 +0100
commita96fe679e2f57e8e4e26c38660d8b6e5b67d5b4b (patch)
treed106cfea4baa1a9071b42d0e9bc922fad7502ed5 /src/gallium/drivers/nvc0/nvc0_fence.c
parent7965e2fc16853ae0ed0a9cde77346c25feb19b6e (diff)
parentcc0f604241ee7b536f4c9867573024b8673b0998 (diff)
Merge remote branch 'origin/master' into pipe-video
Conflicts: src/gallium/drivers/r600/r600_shader.c
Diffstat (limited to 'src/gallium/drivers/nvc0/nvc0_fence.c')
-rw-r--r--src/gallium/drivers/nvc0/nvc0_fence.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_fence.c b/src/gallium/drivers/nvc0/nvc0_fence.c
index 7c214ca9a75..9d2c48cf14d 100644
--- a/src/gallium/drivers/nvc0/nvc0_fence.c
+++ b/src/gallium/drivers/nvc0/nvc0_fence.c
@@ -59,7 +59,8 @@ nvc0_fence_emit(struct nvc0_fence *fence)
OUT_RELOCh(chan, screen->fence.bo, 0, NOUVEAU_BO_WR);
OUT_RELOCl(chan, screen->fence.bo, 0, NOUVEAU_BO_WR);
OUT_RING (chan, fence->sequence);
- OUT_RING (chan, NVC0_3D_QUERY_GET_FENCE);
+ OUT_RING (chan, NVC0_3D_QUERY_GET_FENCE | NVC0_3D_QUERY_GET_SHORT |
+ (0xf << NVC0_3D_QUERY_GET_UNIT__SHIFT));
++fence->ref;