drm/nv04-nv40/instmem: remove parent deref hack (b5795c77) · Commits · e / devices / android_kernel_teracube_emerald

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

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -93,7 +93,6 @@ nv04_instmem_alloc(struct nouveau_instmem imem, struct nouveau_object parent,
	u32 size, u32 align, struct nouveau_object **pobject)		u32 size, u32 align, struct nouveau_object **pobject)
	{		{
	struct nouveau_object *engine = nv_object(imem);		struct nouveau_object *engine = nv_object(imem);
	struct nv04_instmem_priv priv = (void )(imem);
	int ret;		int ret;

	ret = nouveau_object_ctor(parent, engine, &nv04_instobj_oclass,		ret = nouveau_object_ctor(parent, engine, &nv04_instobj_oclass,
	@@ -101,14 +100,6 @@ nv04_instmem_alloc(struct nouveau_instmem imem, struct nouveau_object parent,
	if (ret)		if (ret)
	return ret;		return ret;

	/* INSTMEM itself creates objects to reserve (and preserve across
	* suspend/resume) various fixed data locations, each one of these
	* takes a reference on INSTMEM itself, causing it to never be
	* freed. We drop all the self-references here to avoid this.
	*/
	if (unlikely(!priv->created))
	atomic_dec(&engine->refcount);

	return 0;		return 0;
	}		}

	@@ -154,7 +145,6 @@ nv04_instmem_ctor(struct nouveau_object parent, struct nouveau_object engine,
	if (ret)		if (ret)
	return ret;		return ret;

	priv->created = true;
	return 0;		return 0;
	}		}

+0 −1

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -106,7 +106,6 @@ nv40_instmem_ctor(struct nouveau_object parent, struct nouveau_object engine,
	if (ret)		if (ret)
	return ret;		return ret;

	priv->created = true;
	return 0;		return 0;
	}		}