Commit 1409d90f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent be1e8e16

drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c

+6 −4
Original line number Diff line number Diff line
@@ -125,23 +125,25 @@ nv04_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
		return ret;



	/* 0x00000-0x10000: reserve for probable vbios image */

	ret = nouveau_gpuobj_new(parent, NULL, 0x10000, 0, 0, &priv->vbios);

	ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x10000, 0, 0,

				&priv->vbios);

	if (ret)

		return ret;



	/* 0x10000-0x18000: reserve for RAMHT */

	ret = nouveau_ramht_new(parent, NULL, 0x08000, 0, &priv->ramht);

	ret = nouveau_ramht_new(nv_object(priv), NULL, 0x08000, 0, &priv->ramht);

	if (ret)

		return ret;



	/* 0x18000-0x18800: reserve for RAMFC (enough for 32 nv30 channels) */

	ret = nouveau_gpuobj_new(parent, NULL, 0x00800, 0,

	ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x00800, 0,

				 NVOBJ_FLAG_ZERO_ALLOC, &priv->ramfc);

	if (ret)

		return ret;



	/* 0x18800-0x18a00: reserve for RAMRO */

	ret = nouveau_gpuobj_new(parent, NULL, 0x00200, 0, 0, &priv->ramro);

	ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x00200, 0, 0,

				&priv->ramro);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c

+7 −4
Original line number Diff line number Diff line
@@ -82,26 +82,29 @@ nv40_instmem_ctor(struct nouveau_object *parent, struct nouveau_object *engine, 
		return ret;



	/* 0x00000-0x10000: reserve for probable vbios image */

	ret = nouveau_gpuobj_new(parent, NULL, 0x10000, 0, 0, &priv->vbios);

	ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x10000, 0, 0,

				&priv->vbios);

	if (ret)

		return ret;



	/* 0x10000-0x18000: reserve for RAMHT */

	ret = nouveau_ramht_new(parent, NULL, 0x08000, 0, &priv->ramht);

	ret = nouveau_ramht_new(nv_object(priv), NULL, 0x08000, 0,

			       &priv->ramht);

	if (ret)

		return ret;



	/* 0x18000-0x18200: reserve for RAMRO

	 * 0x18200-0x20000: padding

	 */

	ret = nouveau_gpuobj_new(parent, NULL, 0x08000, 0, 0, &priv->ramro);

	ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x08000, 0, 0,

				&priv->ramro);

	if (ret)

		return ret;



	/* 0x20000-0x21000: reserve for RAMFC

	 * 0x21000-0x40000: padding and some unknown crap

	 */

	ret = nouveau_gpuobj_new(parent, NULL, 0x20000, 0,

	ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x20000, 0,

				 NVOBJ_FLAG_ZERO_ALLOC, &priv->ramfc);

	if (ret)

		return ret;