drm/nouveau: rework to new fence interface

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Acked-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/nouveau/nv04_fence.c b/drivers/gpu/drm/nouveau/nv04_fence.c
index 239c2c5a9615..4484131d826a 100644
--- a/drivers/gpu/drm/nouveau/nv04_fence.c
+++ b/drivers/gpu/drm/nouveau/nv04_fence.c
@@ -41,7 +41,7 @@ nv04_fence_emit(struct nouveau_fence *fence)
         int ret = RING_SPACE(chan, 2);
         if (ret == 0) {
                 BEGIN_NV04(chan, NvSubSw, 0x0150, 1);
-                OUT_RING  (chan, fence->sequence);
+                OUT_RING  (chan, fence->base.seqno);
                 FIRE_RING (chan);
         }
         return ret;
@@ -75,7 +75,7 @@ nv04_fence_context_new(struct nouveau_channel *chan)
 {
         struct nv04_fence_chan *fctx = kzalloc(sizeof(*fctx), GFP_KERNEL);
         if (fctx) {
-                nouveau_fence_context_new(&fctx->base);
+                nouveau_fence_context_new(chan, &fctx->base);
                 fctx->base.emit = nv04_fence_emit;
                 fctx->base.sync = nv04_fence_sync;
                 fctx->base.read = nv04_fence_read;
@@ -105,5 +105,7 @@ nv04_fence_create(struct nouveau_drm *drm)
         priv->base.dtor = nv04_fence_destroy;
         priv->base.context_new = nv04_fence_context_new;
         priv->base.context_del = nv04_fence_context_del;
+        priv->base.contexts = 15;
+        priv->base.context_base = fence_context_alloc(priv->base.contexts);
         return 0;
 }