Skip to content

Commit

Permalink
drm/nouveau/instmem: tidy up the object class definition
Browse files Browse the repository at this point in the history 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Jan 23, 2014
1 parent 24a4ae8 commit ab60619
Show file tree
Hide file tree
Showing 7 changed files with 127 additions and 114 deletions.
15 changes: 0 additions & 15 deletions drivers/gpu/drm/nouveau/core/include/subdev/instmem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,6 @@ nv_memobj(void *obj)
return obj;
}

#define nouveau_instobj_create(p,e,o,d) \
nouveau_instobj_create_((p), (e), (o), sizeof(**d), (void **)d)
#define nouveau_instobj_init(p) \
nouveau_object_init(&(p)->base)
#define nouveau_instobj_fini(p,s) \
nouveau_object_fini(&(p)->base, (s))

int nouveau_instobj_create_(struct nouveau_object *, struct nouveau_object *,
struct nouveau_oclass *, int, void **);
void nouveau_instobj_destroy(struct nouveau_instobj *);

void _nouveau_instobj_dtor(struct nouveau_object *);
#define _nouveau_instobj_init nouveau_object_init
#define _nouveau_instobj_fini nouveau_object_fini

struct nouveau_instmem {
struct nouveau_subdev base;
struct list_head list;
Expand Down
47 changes: 20 additions & 27 deletions drivers/gpu/drm/nouveau/core/subdev/instmem/base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,23 @@

#include "priv.h"

/******************************************************************************
* instmem object base implementation
*****************************************************************************/

void
_nouveau_instobj_dtor(struct nouveau_object *object)
{
struct nouveau_instmem *imem = (void *)object->engine;
struct nouveau_instobj *iobj = (void *)object;

mutex_lock(&nv_subdev(imem)->mutex);
list_del(&iobj->head);
mutex_unlock(&nv_subdev(imem)->mutex);

return nouveau_object_destroy(&iobj->base);
}

int
nouveau_instobj_create_(struct nouveau_object *parent,
struct nouveau_object *engine,
Expand All @@ -46,25 +63,6 @@ nouveau_instobj_create_(struct nouveau_object *parent,
return 0;
}

void
nouveau_instobj_destroy(struct nouveau_instobj *iobj)
{
struct nouveau_subdev *subdev = nv_subdev(iobj->base.engine);

mutex_lock(&subdev->mutex);
list_del(&iobj->head);
mutex_unlock(&subdev->mutex);

return nouveau_object_destroy(&iobj->base);
}

void
_nouveau_instobj_dtor(struct nouveau_object *object)
{
struct nouveau_instobj *iobj = (void *)object;
return nouveau_instobj_destroy(iobj);
}

/******************************************************************************
* instmem subdev base implementation
*****************************************************************************/
Expand All @@ -76,14 +74,9 @@ nouveau_instmem_alloc(struct nouveau_instmem *imem,
{
struct nouveau_object *engine = nv_object(imem);
struct nouveau_instmem_impl *impl = (void *)engine->oclass;
int ret;

ret = nouveau_object_ctor(parent, engine, impl->instobj,
(void *)(unsigned long)align, size, pobject);
if (ret)
return ret;

return 0;
struct nouveau_instobj_args args = { .size = size, .align = align };
return nouveau_object_ctor(parent, engine, impl->instobj, &args,
sizeof(args), pobject);
}

int
Expand Down
67 changes: 36 additions & 31 deletions drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,53 @@

#include "nv04.h"

/******************************************************************************
* instmem object implementation
*****************************************************************************/

static u32
nv04_instobj_rd32(struct nouveau_object *object, u64 addr)
{
struct nv04_instobj_priv *node = (void *)object;
return nv_ro32(object->engine, node->mem->offset + addr);
}

static void
nv04_instobj_wr32(struct nouveau_object *object, u64 addr, u32 data)
{
struct nv04_instobj_priv *node = (void *)object;
nv_wo32(object->engine, node->mem->offset + addr, data);
}

static void
nv04_instobj_dtor(struct nouveau_object *object)
{
struct nv04_instmem_priv *priv = (void *)object->engine;
struct nv04_instobj_priv *node = (void *)object;
nouveau_mm_free(&priv->heap, &node->mem);
nouveau_instobj_destroy(&node->base);
}

static int
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_instobj_priv *node;
int ret, align;
struct nouveau_instobj_args *args = data;
int ret;

align = (unsigned long)data;
if (!align)
align = 1;
if (!args->align)
args->align = 1;

ret = nouveau_instobj_create(parent, engine, oclass, &node);
*pobject = nv_object(node);
if (ret)
return ret;

ret = nouveau_mm_head(&priv->heap, 1, size, size, align, &node->mem);
ret = nouveau_mm_head(&priv->heap, 1, args->size, args->size,
args->align, &node->mem);
if (ret)
return ret;

Expand All @@ -51,32 +79,9 @@ nv04_instobj_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
return 0;
}

static void
nv04_instobj_dtor(struct nouveau_object *object)
{
struct nv04_instmem_priv *priv = (void *)object->engine;
struct nv04_instobj_priv *node = (void *)object;
nouveau_mm_free(&priv->heap, &node->mem);
nouveau_instobj_destroy(&node->base);
}

static u32
nv04_instobj_rd32(struct nouveau_object *object, u64 addr)
{
struct nv04_instobj_priv *node = (void *)object;
return nv_ro32(object->engine, node->mem->offset + addr);
}

static void
nv04_instobj_wr32(struct nouveau_object *object, u64 addr, u32 data)
{
struct nv04_instobj_priv *node = (void *)object;
nv_wo32(object->engine, node->mem->offset + addr, data);
}

struct nouveau_oclass
struct nouveau_instobj_impl
nv04_instobj_oclass = {
.ofuncs = &(struct nouveau_ofuncs) {
.base.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv04_instobj_ctor,
.dtor = nv04_instobj_dtor,
.init = _nouveau_instobj_init,
Expand Down Expand Up @@ -173,5 +178,5 @@ nv04_instmem_oclass = &(struct nouveau_instmem_impl) {
.rd32 = nv04_instmem_rd32,
.wr32 = nv04_instmem_wr32,
},
.instobj = &nv04_instobj_oclass,
.instobj = &nv04_instobj_oclass.base,
}.base;
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "priv.h"

extern struct nouveau_oclass nv04_instobj_oclass;
extern struct nouveau_instobj_impl nv04_instobj_oclass;

struct nv04_instmem_priv {
struct nouveau_instmem base;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/core/subdev/instmem/nv40.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,5 +134,5 @@ nv40_instmem_oclass = &(struct nouveau_instmem_impl) {
.rd32 = nv40_instmem_rd32,
.wr32 = nv40_instmem_wr32,
},
.instobj = &nv04_instobj_oclass,
.instobj = &nv04_instobj_oclass.base,
}.base;
82 changes: 43 additions & 39 deletions drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,42 +38,9 @@ struct nv50_instobj_priv {
struct nouveau_mem *mem;
};

static int
nv50_instobj_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nouveau_fb *pfb = nouveau_fb(parent);
struct nv50_instobj_priv *node;
u32 align = (unsigned long)data;
int ret;

size = max((size + 4095) & ~4095, (u32)4096);
align = max((align + 4095) & ~4095, (u32)4096);

ret = nouveau_instobj_create(parent, engine, oclass, &node);
*pobject = nv_object(node);
if (ret)
return ret;

ret = pfb->ram->get(pfb, size, align, 0, 0x800, &node->mem);
if (ret)
return ret;

node->base.addr = node->mem->offset;
node->base.size = node->mem->size << 12;
node->mem->page_shift = 12;
return 0;
}

static void
nv50_instobj_dtor(struct nouveau_object *object)
{
struct nv50_instobj_priv *node = (void *)object;
struct nouveau_fb *pfb = nouveau_fb(object);
pfb->ram->put(pfb, &node->mem);
nouveau_instobj_destroy(&node->base);
}
/******************************************************************************
* instmem object implementation
*****************************************************************************/

static u32
nv50_instobj_rd32(struct nouveau_object *object, u64 offset)
Expand Down Expand Up @@ -113,9 +80,46 @@ nv50_instobj_wr32(struct nouveau_object *object, u64 offset, u32 data)
spin_unlock_irqrestore(&priv->lock, flags);
}

static struct nouveau_oclass
static void
nv50_instobj_dtor(struct nouveau_object *object)
{
struct nv50_instobj_priv *node = (void *)object;
struct nouveau_fb *pfb = nouveau_fb(object);
pfb->ram->put(pfb, &node->mem);
nouveau_instobj_destroy(&node->base);
}

static int
nv50_instobj_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nouveau_fb *pfb = nouveau_fb(parent);
struct nouveau_instobj_args *args = data;
struct nv50_instobj_priv *node;
int ret;

args->size = max((args->size + 4095) & ~4095, (u32)4096);
args->align = max((args->align + 4095) & ~4095, (u32)4096);

ret = nouveau_instobj_create(parent, engine, oclass, &node);
*pobject = nv_object(node);
if (ret)
return ret;

ret = pfb->ram->get(pfb, args->size, args->align, 0, 0x800, &node->mem);
if (ret)
return ret;

node->base.addr = node->mem->offset;
node->base.size = node->mem->size << 12;
node->mem->page_shift = 12;
return 0;
}

static struct nouveau_instobj_impl
nv50_instobj_oclass = {
.ofuncs = &(struct nouveau_ofuncs) {
.base.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv50_instobj_ctor,
.dtor = nv50_instobj_dtor,
.init = _nouveau_instobj_init,
Expand Down Expand Up @@ -163,5 +167,5 @@ nv50_instmem_oclass = &(struct nouveau_instmem_impl) {
.init = _nouveau_instmem_init,
.fini = nv50_instmem_fini,
},
.instobj = &nv50_instobj_oclass,
.instobj = &nv50_instobj_oclass.base,
}.base;
26 changes: 26 additions & 0 deletions drivers/gpu/drm/nouveau/core/subdev/instmem/priv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,32 @@

#include <subdev/instmem.h>

struct nouveau_instobj_impl {
struct nouveau_oclass base;
};

struct nouveau_instobj_args {
u32 size;
u32 align;
};

#define nouveau_instobj_create(p,e,o,d) \
nouveau_instobj_create_((p), (e), (o), sizeof(**d), (void **)d)
#define nouveau_instobj_destroy(p) ({ \
struct nouveau_instobj *iobj = (p); \
_nouveau_instobj_dtor(nv_object(iobj)); \
})
#define nouveau_instobj_init(p) \
nouveau_object_init(&(p)->base)
#define nouveau_instobj_fini(p,s) \
nouveau_object_fini(&(p)->base, (s))

int nouveau_instobj_create_(struct nouveau_object *, struct nouveau_object *,
struct nouveau_oclass *, int, void **);
void _nouveau_instobj_dtor(struct nouveau_object *);
#define _nouveau_instobj_init nouveau_object_init
#define _nouveau_instobj_fini nouveau_object_fini

struct nouveau_instmem_impl {
struct nouveau_oclass base;
struct nouveau_oclass *instobj;
Expand Down

0 comments on commit ab60619

Please sign in to comment.