drm/nv20-nv30/gr: use parent as self for subobjects

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

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c
index 0607b9801748481e16d40ea2103d4855bb627f47..b24559315903f56b23dad5df1aa3cf95f9572882 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c
@@ -254,7 +254,7 @@ nv20_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 32 * 4, 16,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16,
                                 NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab);
        if (ret)
                return ret;

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv25.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv25.c
index b2b650dd8b282f81622f09e59428035e0cbf0d2f..7a80d005a9741afea220be465a860f46aaedfeef 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv25.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv25.c
@@ -142,7 +142,7 @@ nv25_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 32 * 4, 16,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16,
                                 NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab);
        if (ret)
                return ret;

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv2a.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv2a.c
index 700462fa0ae0271cd4c029c950a9bae812ecd3b9..3e1f32ee43d4c4c902873de190a3de41916026e4 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv2a.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv2a.c
@@ -109,7 +109,7 @@ nv2a_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 32 * 4, 16,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16,
                                 NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab);
        if (ret)
                return ret;

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv30.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv30.c
index cedadaa92d3f4ffabb7887c4dcfb232788517b16..e451db32e92a6ecb05e1e61716a116bcfc8afbac 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv30.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv30.c
@@ -143,7 +143,7 @@ nv30_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 32 * 4, 16,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16,
                                 NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab);
        if (ret)
                return ret;

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv34.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv34.c
index 273f6320027b76b5857f98576b8f8aa9e1f54d8e..9385ac7b44a493970c32a162913494c0f8f1fde0 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv34.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv34.c
@@ -143,7 +143,7 @@ nv34_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 32 * 4, 16,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16,
                                 NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab);
        if (ret)
                return ret;

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv35.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv35.c
index f40ee2116ee1629003f93afcbfcd3ea86492c826..9ce84b73f86a21cf0e9277e998db271965b386db 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nv35.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv35.c
@@ -141,7 +141,7 @@ nv35_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(parent, NULL, 32 * 4, 16,
+       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16,
                                 NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab);
        if (ret)
                return ret;