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

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

diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
index 4f226afb5591b33e34ccc64e193b8d421f00abeb..4d4a6b905370b2633b6afb199de3eb3973943ece 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
@@ -292,7 +292,8 @@ nvc0_fifo_context_ctor(struct nouveau_object *parent,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 0x10000, 0x1000, 0, &base->pgd);
+       ret = nouveau_gpuobj_new(nv_object(base), NULL, 0x10000, 0x1000, 0,
+                               &base->pgd);
        if (ret)
                return ret;
 
@@ -623,17 +624,17 @@ nvc0_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 0x1000, 0x1000, 0,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x1000, 0x1000, 0,
                                &priv->playlist[0]);
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 0x1000, 0x1000, 0,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x1000, 0x1000, 0,
                                &priv->playlist[1]);
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 128 * 0x1000, 0x1000, 0,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 0x1000, 0x1000, 0,
                                &priv->user.mem);
        if (ret)
                return ret;