diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-04-24 03:55:28 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-04-26 01:38:06 -0400 |
| commit | a3e6789a54362c24d929e2741bde8c8c4ac7a9c9 (patch) | |
| tree | 4fb6ae00fe016bd01565674522510ce431a19fe1 | |
| parent | 617a6cbd7c0aae2314068ce5ed7cb3790c491177 (diff) | |
drm/nv20-nv30/gr: use parent as self for subobjects
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c index 0607b9801748..b24559315903 100644 --- 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, | |||
| 254 | if (ret) | 254 | if (ret) |
| 255 | return ret; | 255 | return ret; |
| 256 | 256 | ||
| 257 | ret = nouveau_gpuobj_new(parent, NULL, 32 * 4, 16, | 257 | ret = nouveau_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16, |
| 258 | NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); | 258 | NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); |
| 259 | if (ret) | 259 | if (ret) |
| 260 | return ret; | 260 | 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 b2b650dd8b28..7a80d005a974 100644 --- 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, | |||
| 142 | if (ret) | 142 | if (ret) |
| 143 | return ret; | 143 | return ret; |
| 144 | 144 | ||
| 145 | ret = nouveau_gpuobj_new(parent, NULL, 32 * 4, 16, | 145 | ret = nouveau_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16, |
| 146 | NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); | 146 | NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); |
| 147 | if (ret) | 147 | if (ret) |
| 148 | return ret; | 148 | 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 700462fa0ae0..3e1f32ee43d4 100644 --- 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, | |||
| 109 | if (ret) | 109 | if (ret) |
| 110 | return ret; | 110 | return ret; |
| 111 | 111 | ||
| 112 | ret = nouveau_gpuobj_new(parent, NULL, 32 * 4, 16, | 112 | ret = nouveau_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16, |
| 113 | NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); | 113 | NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); |
| 114 | if (ret) | 114 | if (ret) |
| 115 | return ret; | 115 | 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 cedadaa92d3f..e451db32e92a 100644 --- 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, | |||
| 143 | if (ret) | 143 | if (ret) |
| 144 | return ret; | 144 | return ret; |
| 145 | 145 | ||
| 146 | ret = nouveau_gpuobj_new(parent, NULL, 32 * 4, 16, | 146 | ret = nouveau_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16, |
| 147 | NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); | 147 | NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); |
| 148 | if (ret) | 148 | if (ret) |
| 149 | return ret; | 149 | 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 273f6320027b..9385ac7b44a4 100644 --- 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, | |||
| 143 | if (ret) | 143 | if (ret) |
| 144 | return ret; | 144 | return ret; |
| 145 | 145 | ||
| 146 | ret = nouveau_gpuobj_new(parent, NULL, 32 * 4, 16, | 146 | ret = nouveau_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16, |
| 147 | NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); | 147 | NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); |
| 148 | if (ret) | 148 | if (ret) |
| 149 | return ret; | 149 | 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 f40ee2116ee1..9ce84b73f86a 100644 --- 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, | |||
| 141 | if (ret) | 141 | if (ret) |
| 142 | return ret; | 142 | return ret; |
| 143 | 143 | ||
| 144 | ret = nouveau_gpuobj_new(parent, NULL, 32 * 4, 16, | 144 | ret = nouveau_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16, |
| 145 | NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); | 145 | NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); |
| 146 | if (ret) | 146 | if (ret) |
| 147 | return ret; | 147 | return ret; |