drm/nvc0-/gr: use self as parent for subobjects

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
index ebc9caa951f60ba2899845e1aff0a0257d26af45..4cc6269d407720687931d5e17a783e711df833c2 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
@@ -36,7 +36,6 @@ int
 nvc0_grctx_init(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
 {
        struct nouveau_bar *bar = nouveau_bar(priv);
-       struct nouveau_object *parent = nv_object(priv);
        struct nouveau_gpuobj *chan;
        u32 size = (0x80000 + priv->size + 4095) & ~4095;
        int ret, i;
@@ -44,7 +43,7 @@ nvc0_grctx_init(struct nvc0_graph_priv *priv, struct nvc0_grctx *info)
        /* allocate memory to for a "channel", which we'll use to generate
         * the default context values
         */
-       ret = nouveau_gpuobj_new(parent, NULL, size, 0x1000,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, size, 0x1000,
                                 NVOBJ_FLAG_ZERO_ALLOC, &info->chan);
        chan = info->chan;
        if (ret) {

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
index 2dcd13796188e8a9adecda88d974285bfb3875bc..f9b9d82c287fd0c1b733f37ddc03051468bc486d 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
@@ -102,7 +102,8 @@ nvc0_graph_context_ctor(struct nouveau_object *parent,
         * fuc to modify some per-context register settings on first load
         * of the context.
         */
-       ret = nouveau_gpuobj_new(parent, NULL, 0x1000, 0x100, 0, &chan->mmio);
+       ret = nouveau_gpuobj_new(nv_object(chan), NULL, 0x1000, 0x100, 0,
+                               &chan->mmio);
        if (ret)
                return ret;
 
@@ -114,8 +115,8 @@ nvc0_graph_context_ctor(struct nouveau_object *parent,
 
        /* allocate buffers referenced by mmio list */
        for (i = 0; data->size && i < ARRAY_SIZE(priv->mmio_data); i++) {
-               ret = nouveau_gpuobj_new(parent, NULL, data->size, data->align,
-                                        0, &chan->data[i].mem);
+               ret = nouveau_gpuobj_new(nv_object(chan), NULL, data->size,
+                                        data->align, 0, &chan->data[i].mem);
                if (ret)
                        return ret;
 
@@ -567,11 +568,13 @@ nvc0_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
                break;
        }
 
-       ret = nouveau_gpuobj_new(parent, NULL, 0x1000, 256, 0, &priv->unk4188b4);
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x1000, 256, 0,
+                               &priv->unk4188b4);
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 0x1000, 256, 0, &priv->unk4188b8);
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x1000, 256, 0,
+                               &priv->unk4188b8);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
index 2a60258eefd4585577406d6c74cee9d9bf7c9d21..678c16f630559219477656e798ae1a816311477d 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
@@ -451,11 +451,13 @@ nve0_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
                priv->firmware = true;
        }
 
-       ret = nouveau_gpuobj_new(parent, NULL, 0x1000, 256, 0, &priv->unk4188b4);
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x1000, 256, 0,
+                               &priv->unk4188b4);
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 0x1000, 256, 0, &priv->unk4188b8);
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x1000, 256, 0,
+                               &priv->unk4188b8);
        if (ret)
                return ret;