drm/nv50-/fifo: use parent as self for subobjects

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / core / engine / fifo / nv84.c

diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
index 094000e87871c35f5467efb1d262832e97b57056..35b94bd18808d8082454573c6fa142f8a5a41077 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
@@ -180,7 +180,8 @@ nv84_fifo_chan_ctor_dma(struct nouveau_object *parent,
        if (ret)
                return ret;
 
-       ret = nouveau_ramht_new(parent, parent, 0x8000, 16, &chan->ramht);
+       ret = nouveau_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
+                              &chan->ramht);
        if (ret)
                return ret;
 
@@ -242,7 +243,8 @@ nv84_fifo_chan_ctor_ind(struct nouveau_object *parent,
        if (ret)
                return ret;
 
-       ret = nouveau_ramht_new(parent, parent, 0x8000, 16, &chan->ramht);
+       ret = nouveau_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
+                              &chan->ramht);
        if (ret)
                return ret;
 
@@ -336,12 +338,12 @@ nv84_fifo_context_ctor(struct nouveau_object *parent,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, nv_object(base), 0x0200, 0,
+       ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x0200, 0,
                                 NVOBJ_FLAG_ZERO_ALLOC, &base->eng);
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, nv_object(base), 0x4000, 0,
+       ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x4000, 0,
                                 0, &base->pgd);
        if (ret)
                return ret;
@@ -350,13 +352,13 @@ nv84_fifo_context_ctor(struct nouveau_object *parent,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, nv_object(base), 0x1000, 0x400,
-                                NVOBJ_FLAG_ZERO_ALLOC, &base->cache);
+       ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x1000,
+                                0x400, NVOBJ_FLAG_ZERO_ALLOC, &base->cache);
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, nv_object(base), 0x0100, 0x100,
-                                NVOBJ_FLAG_ZERO_ALLOC, &base->ramfc);
+       ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x0100,
+                                0x100, NVOBJ_FLAG_ZERO_ALLOC, &base->ramfc);
        if (ret)
                return ret;
 
@@ -407,12 +409,12 @@ nv84_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 128 * 4, 0x1000, 0,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
                                &priv->playlist[0]);
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 128 * 4, 0x1000, 0,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
                                &priv->playlist[1]);
        if (ret)
                return ret;