diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-04-24 03:46:54 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-04-26 01:38:02 -0400 |
| commit | be1e8e16ecb13b81e3ca7c459c60c7e939fb9d0e (patch) | |
| tree | 9ad9905b4cae33515296632f24ea2151d4dcf676 | |
| parent | f83145ecd71f782b219fdee0939f00de5761314c (diff) | |
drm/nv04-nv40/vm: use self as parent for subobjects
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/vm/nv04.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/vm/nv41.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/vm/nv44.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/vm/nv04.c b/drivers/gpu/drm/nouveau/core/subdev/vm/nv04.c index 6adbbc9cc361..ed45437167f2 100644 --- 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, | |||
| 110 | if (ret) | 110 | if (ret) |
| 111 | return ret; | 111 | return ret; |
| 112 | 112 | ||
| 113 | ret = nouveau_gpuobj_new(parent, NULL, | 113 | ret = nouveau_gpuobj_new(nv_object(priv), NULL, |
| 114 | (NV04_PDMA_SIZE / NV04_PDMA_PAGE) * 4 + | 114 | (NV04_PDMA_SIZE / NV04_PDMA_PAGE) * 4 + |
| 115 | 8, 16, NVOBJ_FLAG_ZERO_ALLOC, | 115 | 8, 16, NVOBJ_FLAG_ZERO_ALLOC, |
| 116 | &priv->vm->pgt[0].obj[0]); | 116 | &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 9474cfca6e4c..064c76262876 100644 --- 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, | |||
| 119 | if (ret) | 119 | if (ret) |
| 120 | return ret; | 120 | return ret; |
| 121 | 121 | ||
| 122 | ret = nouveau_gpuobj_new(parent, NULL, | 122 | ret = nouveau_gpuobj_new(nv_object(priv), NULL, |
| 123 | (NV41_GART_SIZE / NV41_GART_PAGE) * 4, | 123 | (NV41_GART_SIZE / NV41_GART_PAGE) * 4, |
| 124 | 16, NVOBJ_FLAG_ZERO_ALLOC, | 124 | 16, NVOBJ_FLAG_ZERO_ALLOC, |
| 125 | &priv->vm->pgt[0].obj[0]); | 125 | &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 aa8131436e3d..fae1f67d5948 100644 --- 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, | |||
| 196 | if (ret) | 196 | if (ret) |
| 197 | return ret; | 197 | return ret; |
| 198 | 198 | ||
| 199 | ret = nouveau_gpuobj_new(parent, NULL, | 199 | ret = nouveau_gpuobj_new(nv_object(priv), NULL, |
| 200 | (NV44_GART_SIZE / NV44_GART_PAGE) * 4, | 200 | (NV44_GART_SIZE / NV44_GART_PAGE) * 4, |
| 201 | 512 * 1024, NVOBJ_FLAG_ZERO_ALLOC, | 201 | 512 * 1024, NVOBJ_FLAG_ZERO_ALLOC, |
| 202 | &priv->vm->pgt[0].obj[0]); | 202 | &priv->vm->pgt[0].obj[0]); |