drm/nouveau: remove (most) hardcoded object handle usage

[deliverable/linux.git] / drivers / gpu / drm / nouveau / nv17_fence.c

diff --git a/drivers/gpu/drm/nouveau/nv17_fence.c b/drivers/gpu/drm/nouveau/nv17_fence.c
index 22aa9963ea6fd46b36f28b457fa7cfeecac0372b..5056131731fbbf21a70767549a15a16f17e1d634 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv17_fence.c
+++ b/drivers/gpu/drm/nouveau/nv17_fence.c
@@ -33,11 +33,13 @@ int
 nv17_fence_sync(struct nouveau_fence *fence,
                struct nouveau_channel *prev, struct nouveau_channel *chan)
 {
+       struct nouveau_cli *cli = (void *)nvif_client(&prev->device->base);
        struct nv10_fence_priv *priv = chan->drm->fence;
+       struct nv10_fence_chan *fctx = chan->fence;
        u32 value;
        int ret;
 
-       if (!mutex_trylock(&prev->cli->mutex))
+       if (!mutex_trylock(&cli->mutex))
                return -EBUSY;
 
        spin_lock(&priv->lock);
@@ -48,7 +50,7 @@ nv17_fence_sync(struct nouveau_fence *fence,
        ret = RING_SPACE(prev, 5);
        if (!ret) {
                BEGIN_NV04(prev, 0, NV11_SUBCHAN_DMA_SEMAPHORE, 4);
-               OUT_RING  (prev, NvSema);
+               OUT_RING  (prev, fctx->sema.handle);
                OUT_RING  (prev, 0);
                OUT_RING  (prev, value + 0);
                OUT_RING  (prev, value + 1);
@@ -57,14 +59,14 @@ nv17_fence_sync(struct nouveau_fence *fence,
 
        if (!ret && !(ret = RING_SPACE(chan, 5))) {
                BEGIN_NV04(chan, 0, NV11_SUBCHAN_DMA_SEMAPHORE, 4);
-               OUT_RING  (chan, NvSema);
+               OUT_RING  (chan, fctx->sema.handle);
                OUT_RING  (chan, 0);
                OUT_RING  (chan, value + 1);
                OUT_RING  (chan, value + 2);
                FIRE_RING (chan);
        }
 
-       mutex_unlock(&prev->cli->mutex);
+       mutex_unlock(&cli->mutex);
        return 0;
 }
 
@@ -74,7 +76,6 @@ nv17_fence_context_new(struct nouveau_channel *chan)
        struct nv10_fence_priv *priv = chan->drm->fence;
        struct nv10_fence_chan *fctx;
        struct ttm_mem_reg *mem = &priv->bo->bo.mem;
-       struct nouveau_object *object;
        u32 start = mem->start * PAGE_SIZE;
        u32 limit = start + mem->size - 1;
        int ret = 0;
@@ -88,15 +89,15 @@ nv17_fence_context_new(struct nouveau_channel *chan)
        fctx->base.read = nv10_fence_read;
        fctx->base.sync = nv17_fence_sync;
 
-       ret = nouveau_object_new(nv_object(chan->cli), chan->handle,
-                                NvSema, 0x0002,
-                                &(struct nv_dma_class) {
+       ret = nvif_object_init(chan->object, NULL, NvSema,
+                               NV_DMA_FROM_MEMORY_CLASS,
+                              &(struct nv_dma_class) {
                                        .flags = NV_DMA_TARGET_VRAM |
                                                 NV_DMA_ACCESS_RDWR,
                                        .start = start,
                                        .limit = limit,
-                                }, sizeof(struct nv_dma_class),
-                                &object);
+                              }, sizeof(struct nv_dma_class),
+                              &fctx->sema);
        if (ret)
                nv10_fence_context_del(chan);
        return ret;