evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/nv04-nv40/instmem: remove parent deref hack

Browse source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2013-04-24 17:38:38 +10:00
parent d395f1e4c5
commit b5795c77e5
3 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c
View file

@ -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;
} }

1
drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h
View file

@ -9,7 +9,6 @@
struct nv04_instmem_priv { struct nv04_instmem_priv {
struct nouveau_instmem base; struct nouveau_instmem base;
bool created;
void __iomem *iomem; void __iomem *iomem;
struct nouveau_mm heap; struct nouveau_mm heap;

1
drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c
View file

@ -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;
} }