drm/nv04-nv40/vm: use self as parent for subobjects

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

diff --git a/drivers/gpu/drm/nouveau/core/subdev/vm/nv04.c b/drivers/gpu/drm/nouveau/core/subdev/vm/nv04.c
index 6adbbc9cc361ac96a4938918c13f07baea32f877..ed45437167f20f99cbc6ff7513f8f8cb87aab86b 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/vm/nv04.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/vm/nv04.c
@@ -110,7 +110,7 @@ nv04_vmmgr_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL,
                                 (NV04_PDMA_SIZE / NV04_PDMA_PAGE) * 4 +
                                 8, 16, NVOBJ_FLAG_ZERO_ALLOC,
                                 &priv->vm->pgt[0].obj[0]);

diff --git a/drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c b/drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c
index 9474cfca6e4ccde36379d3dfa3426317be005741..064c762628765f50b371aa8685f95154dca0da8b 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c
@@ -119,7 +119,7 @@ nv41_vmmgr_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL,
                                (NV41_GART_SIZE / NV41_GART_PAGE) * 4,
                                 16, NVOBJ_FLAG_ZERO_ALLOC,
                                 &priv->vm->pgt[0].obj[0]);

diff --git a/drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c b/drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c
index aa8131436e3dced3d3d9ef894fec6d5ff21cee2d..fae1f67d59485be05ea0217646d0bc8ae04bbcdc 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c
@@ -196,7 +196,7 @@ nv44_vmmgr_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL,
                                (NV44_GART_SIZE / NV44_GART_PAGE) * 4,
                                 512 * 1024, NVOBJ_FLAG_ZERO_ALLOC,
                                 &priv->vm->pgt[0].obj[0]);