summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/nouveau_winsys/nouveau_fence.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers/dri/nouveau_winsys/nouveau_fence.c')
-rw-r--r--src/mesa/drivers/dri/nouveau_winsys/nouveau_fence.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_fence.c b/src/mesa/drivers/dri/nouveau_winsys/nouveau_fence.c
index c9f0903e27..3b35a11bcb 100644
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_fence.c
+++ b/src/mesa/drivers/dri/nouveau_winsys/nouveau_fence.c
@@ -109,14 +109,9 @@ nouveau_fence_emit(struct nouveau_fence *fence)
NOUVEAU_ERR("AII wrap unhandled\n");
/*XXX: assumes subc 0 is populated */
- if (nvchan->dma.free < 2)
- WAIT_RING_CH(&nvchan->base, 2);
- nvchan->dma.free -= 2;
-#ifdef NOUVEAU_DMA_DEBUG
- nvchan->dma.push_free += 2;
-#endif
- OUT_RING_CH(&nvchan->base, 0x00040050);
- OUT_RING_CH(&nvchan->base, nvfence->sequence);
+ RING_SPACE_CH(fence->channel, 2);
+ OUT_RING_CH (fence->channel, 0x00040050);
+ OUT_RING_CH (fence->channel, nvfence->sequence);
if (nvchan->fence_tail) {
nouveau_fence(nvchan->fence_tail)->next = fence;