summaryrefslogtreecommitdiff
path: root/drm/nv17_fence.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2014-09-15 10:12:13 +1000
committerBen Skeggs <bskeggs@redhat.com>2014-10-02 13:25:42 +1000
commita9eb04df716277dafb12cac49b2b89aa7d3b5776 (patch)
tree75e35132145bc95a597efab24bcc0ec8f31b6c43 /drm/nv17_fence.c
parent3ca4a836fe2934b5e9fea67301a82469d3de9aee (diff)
downloadnouveau-a9eb04df716277dafb12cac49b2b89aa7d3b5776.tar.gz
drm-next 98faa78ce7f1f986e11e7805d31b409782a6d2d4
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nv17_fence.c')
-rw-r--r--drm/nv17_fence.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drm/nv17_fence.c b/drm/nv17_fence.c
index ca907479f..6f9a1f8e2 100644
--- a/drm/nv17_fence.c
+++ b/drm/nv17_fence.c
@@ -84,7 +84,7 @@ nv17_fence_context_new(struct nouveau_channel *chan)
if (!fctx)
return -ENOMEM;
- nouveau_fence_context_new(&fctx->base);
+ nouveau_fence_context_new(chan, &fctx->base);
fctx->base.emit = nv10_fence_emit;
fctx->base.read = nv10_fence_read;
fctx->base.sync = nv17_fence_sync;
@@ -124,6 +124,8 @@ nv17_fence_create(struct nouveau_drm *drm)
priv->base.resume = nv17_fence_resume;
priv->base.context_new = nv17_fence_context_new;
priv->base.context_del = nv10_fence_context_del;
+ priv->base.contexts = 31;
+ priv->base.context_base = fence_context_alloc(priv->base.contexts);
spin_lock_init(&priv->lock);
ret = nouveau_bo_new(drm->dev, 4096, 0x1000, TTM_PL_FLAG_VRAM,