From 3532c37017f4666b74acf85b887bc11359b4765c Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 5 Dec 2014 11:54:50 +1000 Subject: [PATCH] drm/nouveau/instmem: instobjs may not have an engine Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/core/subdev/instmem/base.c | 9 ++++----- drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c | 10 ++++++---- drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/nouveau/core/subdev/instmem/base.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/base.c index 14706d9842ca..b2dac4a088a1 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/instmem/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/base.c @@ -31,7 +31,7 @@ void _nouveau_instobj_dtor(struct nouveau_object *object) { - struct nouveau_instmem *imem = (void *)object->engine; + struct nouveau_instmem *imem = nouveau_instmem(object); struct nouveau_instobj *iobj = (void *)object; mutex_lock(&nv_subdev(imem)->mutex); @@ -47,7 +47,7 @@ nouveau_instobj_create_(struct nouveau_object *parent, struct nouveau_oclass *oclass, int length, void **pobject) { - struct nouveau_instmem *imem = (void *)engine; + struct nouveau_instmem *imem = nouveau_instmem(parent); struct nouveau_instobj *iobj; int ret; @@ -72,10 +72,9 @@ nouveau_instmem_alloc(struct nouveau_instmem *imem, struct nouveau_object *parent, u32 size, u32 align, struct nouveau_object **pobject) { - struct nouveau_object *engine = nv_object(imem); - struct nouveau_instmem_impl *impl = (void *)engine->oclass; + struct nouveau_instmem_impl *impl = (void *)imem->base.object.oclass; struct nouveau_instobj_args args = { .size = size, .align = align }; - return nouveau_object_ctor(parent, engine, impl->instobj, &args, + return nouveau_object_ctor(parent, parent->engine, impl->instobj, &args, sizeof(args), pobject); } diff --git a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c index e8b1401c59c0..9ffd2d8d73c4 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c +++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c @@ -31,21 +31,23 @@ static u32 nv04_instobj_rd32(struct nouveau_object *object, u64 addr) { + struct nv04_instmem_priv *priv = (void *)nouveau_instmem(object); struct nv04_instobj_priv *node = (void *)object; - return nv_ro32(object->engine, node->mem->offset + addr); + return nv_ro32(priv, node->mem->offset + addr); } static void nv04_instobj_wr32(struct nouveau_object *object, u64 addr, u32 data) { + struct nv04_instmem_priv *priv = (void *)nouveau_instmem(object); struct nv04_instobj_priv *node = (void *)object; - nv_wo32(object->engine, node->mem->offset + addr, data); + nv_wo32(priv, node->mem->offset + addr, data); } static void nv04_instobj_dtor(struct nouveau_object *object) { - struct nv04_instmem_priv *priv = (void *)object->engine; + struct nv04_instmem_priv *priv = (void *)nouveau_instmem(object); struct nv04_instobj_priv *node = (void *)object; nouveau_mm_free(&priv->heap, &node->mem); nouveau_instobj_destroy(&node->base); @@ -56,7 +58,7 @@ nv04_instobj_ctor(struct nouveau_object *parent, struct nouveau_object *engine, struct nouveau_oclass *oclass, void *data, u32 size, struct nouveau_object **pobject) { - struct nv04_instmem_priv *priv = (void *)engine; + struct nv04_instmem_priv *priv = (void *)nouveau_instmem(parent); struct nv04_instobj_priv *node; struct nouveau_instobj_args *args = data; int ret; diff --git a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c index 7cb3b098a08d..64ee680232e2 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c +++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c @@ -45,7 +45,7 @@ struct nv50_instobj_priv { static u32 nv50_instobj_rd32(struct nouveau_object *object, u64 offset) { - struct nv50_instmem_priv *priv = (void *)object->engine; + struct nv50_instmem_priv *priv = (void *)nouveau_instmem(object); struct nv50_instobj_priv *node = (void *)object; unsigned long flags; u64 base = (node->mem->offset + offset) & 0xffffff00000ULL; @@ -65,7 +65,7 @@ nv50_instobj_rd32(struct nouveau_object *object, u64 offset) static void nv50_instobj_wr32(struct nouveau_object *object, u64 offset, u32 data) { - struct nv50_instmem_priv *priv = (void *)object->engine; + struct nv50_instmem_priv *priv = (void *)nouveau_instmem(object); struct nv50_instobj_priv *node = (void *)object; unsigned long flags; u64 base = (node->mem->offset + offset) & 0xffffff00000ULL;