Skip to content

Commit

Permalink
drm/nouveau/vdec: remove nouveau_{bsp,vp} base classes, use nouveau_e…
Browse files Browse the repository at this point in the history 
…ngine directly

Later chipsets use falcon anyway, and I can't currently see a good need
for a shared base class.

PPP will get the same treatment once Maarten's patches are merged.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Nov 28, 2012
1 parent f3295b3 commit 66433c2
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 268 deletions.
108 changes: 13 additions & 95 deletions drivers/gpu/drm/nouveau/core/engine/bsp/nv84.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,13 @@
* Authors: Ben Skeggs
*/

#include <core/os.h>
#include <core/class.h>
#include <core/engctx.h>
#include <core/class.h>

#include <engine/bsp.h>

struct nv84_bsp_priv {
struct nouveau_bsp base;
};

struct nv84_bsp_chan {
struct nouveau_bsp_chan base;
struct nouveau_engine base;
};

/*******************************************************************************
Expand All @@ -49,73 +44,23 @@ nv84_bsp_sclass[] = {
* BSP context
******************************************************************************/

static int
nv84_bsp_context_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nv84_bsp_chan *priv;
int ret;

ret = nouveau_bsp_context_create(parent, engine, oclass, NULL,
0, 0, 0, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;

return 0;
}

static void
nv84_bsp_context_dtor(struct nouveau_object *object)
{
struct nv84_bsp_chan *priv = (void *)object;
nouveau_bsp_context_destroy(&priv->base);
}

static int
nv84_bsp_context_init(struct nouveau_object *object)
{
struct nv84_bsp_chan *priv = (void *)object;
int ret;

ret = nouveau_bsp_context_init(&priv->base);
if (ret)
return ret;

return 0;
}

static int
nv84_bsp_context_fini(struct nouveau_object *object, bool suspend)
{
struct nv84_bsp_chan *priv = (void *)object;
return nouveau_bsp_context_fini(&priv->base, suspend);
}

static struct nouveau_oclass
nv84_bsp_cclass = {
.handle = NV_ENGCTX(BSP, 0x84),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv84_bsp_context_ctor,
.dtor = nv84_bsp_context_dtor,
.init = nv84_bsp_context_init,
.fini = nv84_bsp_context_fini,
.rd32 = _nouveau_bsp_context_rd32,
.wr32 = _nouveau_bsp_context_wr32,
.ctor = _nouveau_engctx_ctor,
.dtor = _nouveau_engctx_dtor,
.init = _nouveau_engctx_init,
.fini = _nouveau_engctx_fini,
.rd32 = _nouveau_engctx_rd32,
.wr32 = _nouveau_engctx_wr32,
},
};

/*******************************************************************************
* BSP engine/subdev functions
******************************************************************************/

static void
nv84_bsp_intr(struct nouveau_subdev *subdev)
{
}

static int
nv84_bsp_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
Expand All @@ -124,52 +69,25 @@ nv84_bsp_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nv84_bsp_priv *priv;
int ret;

ret = nouveau_bsp_create(parent, engine, oclass, &priv);
ret = nouveau_engine_create(parent, engine, oclass, true,
"PBSP", "bsp", &priv);
*pobject = nv_object(priv);
if (ret)
return ret;

nv_subdev(priv)->unit = 0x04008000;
nv_subdev(priv)->intr = nv84_bsp_intr;
nv_engine(priv)->cclass = &nv84_bsp_cclass;
nv_engine(priv)->sclass = nv84_bsp_sclass;
return 0;
}

static void
nv84_bsp_dtor(struct nouveau_object *object)
{
struct nv84_bsp_priv *priv = (void *)object;
nouveau_bsp_destroy(&priv->base);
}

static int
nv84_bsp_init(struct nouveau_object *object)
{
struct nv84_bsp_priv *priv = (void *)object;
int ret;

ret = nouveau_bsp_init(&priv->base);
if (ret)
return ret;

return 0;
}

static int
nv84_bsp_fini(struct nouveau_object *object, bool suspend)
{
struct nv84_bsp_priv *priv = (void *)object;
return nouveau_bsp_fini(&priv->base, suspend);
}

struct nouveau_oclass
nv84_bsp_oclass = {
.handle = NV_ENGINE(BSP, 0x84),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv84_bsp_ctor,
.dtor = nv84_bsp_dtor,
.init = nv84_bsp_init,
.fini = nv84_bsp_fini,
.dtor = _nouveau_engine_dtor,
.init = _nouveau_engine_init,
.fini = _nouveau_engine_fini,
},
};
108 changes: 13 additions & 95 deletions drivers/gpu/drm/nouveau/core/engine/vp/nv84.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,13 @@
* Authors: Ben Skeggs
*/

#include <core/os.h>
#include <core/class.h>
#include <core/engctx.h>
#include <core/class.h>

#include <engine/vp.h>

struct nv84_vp_priv {
struct nouveau_vp base;
};

struct nv84_vp_chan {
struct nouveau_vp_chan base;
struct nouveau_engine base;
};

/*******************************************************************************
Expand All @@ -49,73 +44,23 @@ nv84_vp_sclass[] = {
* PVP context
******************************************************************************/

static int
nv84_vp_context_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject)
{
struct nv84_vp_chan *priv;
int ret;

ret = nouveau_vp_context_create(parent, engine, oclass, NULL,
0, 0, 0, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;

return 0;
}

static void
nv84_vp_context_dtor(struct nouveau_object *object)
{
struct nv84_vp_chan *priv = (void *)object;
nouveau_vp_context_destroy(&priv->base);
}

static int
nv84_vp_context_init(struct nouveau_object *object)
{
struct nv84_vp_chan *priv = (void *)object;
int ret;

ret = nouveau_vp_context_init(&priv->base);
if (ret)
return ret;

return 0;
}

static int
nv84_vp_context_fini(struct nouveau_object *object, bool suspend)
{
struct nv84_vp_chan *priv = (void *)object;
return nouveau_vp_context_fini(&priv->base, suspend);
}

static struct nouveau_oclass
nv84_vp_cclass = {
.handle = NV_ENGCTX(VP, 0x84),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv84_vp_context_ctor,
.dtor = nv84_vp_context_dtor,
.init = nv84_vp_context_init,
.fini = nv84_vp_context_fini,
.rd32 = _nouveau_vp_context_rd32,
.wr32 = _nouveau_vp_context_wr32,
.ctor = _nouveau_engctx_ctor,
.dtor = _nouveau_engctx_dtor,
.init = _nouveau_engctx_init,
.fini = _nouveau_engctx_fini,
.rd32 = _nouveau_engctx_rd32,
.wr32 = _nouveau_engctx_wr32,
},
};

/*******************************************************************************
* PVP engine/subdev functions
******************************************************************************/

static void
nv84_vp_intr(struct nouveau_subdev *subdev)
{
}

static int
nv84_vp_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size,
Expand All @@ -124,52 +69,25 @@ nv84_vp_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nv84_vp_priv *priv;
int ret;

ret = nouveau_vp_create(parent, engine, oclass, &priv);
ret = nouveau_engine_create(parent, engine, oclass, true,
"PVP", "vp", &priv);
*pobject = nv_object(priv);
if (ret)
return ret;

nv_subdev(priv)->unit = 0x01020000;
nv_subdev(priv)->intr = nv84_vp_intr;
nv_engine(priv)->cclass = &nv84_vp_cclass;
nv_engine(priv)->sclass = nv84_vp_sclass;
return 0;
}

static void
nv84_vp_dtor(struct nouveau_object *object)
{
struct nv84_vp_priv *priv = (void *)object;
nouveau_vp_destroy(&priv->base);
}

static int
nv84_vp_init(struct nouveau_object *object)
{
struct nv84_vp_priv *priv = (void *)object;
int ret;

ret = nouveau_vp_init(&priv->base);
if (ret)
return ret;

return 0;
}

static int
nv84_vp_fini(struct nouveau_object *object, bool suspend)
{
struct nv84_vp_priv *priv = (void *)object;
return nouveau_vp_fini(&priv->base, suspend);
}

struct nouveau_oclass
nv84_vp_oclass = {
.handle = NV_ENGINE(VP, 0x84),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv84_vp_ctor,
.dtor = nv84_vp_dtor,
.init = nv84_vp_init,
.fini = nv84_vp_fini,
.dtor = _nouveau_engine_dtor,
.init = _nouveau_engine_init,
.fini = _nouveau_engine_fini,
},
};
39 changes: 0 additions & 39 deletions drivers/gpu/drm/nouveau/core/include/engine/bsp.h
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,6 @@
#ifndef __NOUVEAU_BSP_H__
#define __NOUVEAU_BSP_H__

#include <core/engine.h>
#include <core/engctx.h>

struct nouveau_bsp_chan {
struct nouveau_engctx base;
};

#define nouveau_bsp_context_create(p,e,c,g,s,a,f,d) \
nouveau_engctx_create((p), (e), (c), (g), (s), (a), (f), (d))
#define nouveau_bsp_context_destroy(d) \
nouveau_engctx_destroy(&(d)->base)
#define nouveau_bsp_context_init(d) \
nouveau_engctx_init(&(d)->base)
#define nouveau_bsp_context_fini(d,s) \
nouveau_engctx_fini(&(d)->base, (s))

#define _nouveau_bsp_context_dtor _nouveau_engctx_dtor
#define _nouveau_bsp_context_init _nouveau_engctx_init
#define _nouveau_bsp_context_fini _nouveau_engctx_fini
#define _nouveau_bsp_context_rd32 _nouveau_engctx_rd32
#define _nouveau_bsp_context_wr32 _nouveau_engctx_wr32

struct nouveau_bsp {
struct nouveau_engine base;
};

#define nouveau_bsp_create(p,e,c,d) \
nouveau_engine_create((p), (e), (c), true, "PBSP", "bsp", (d))
#define nouveau_bsp_destroy(d) \
nouveau_engine_destroy(&(d)->base)
#define nouveau_bsp_init(d) \
nouveau_engine_init(&(d)->base)
#define nouveau_bsp_fini(d,s) \
nouveau_engine_fini(&(d)->base, (s))

#define _nouveau_bsp_dtor _nouveau_engine_dtor
#define _nouveau_bsp_init _nouveau_engine_init
#define _nouveau_bsp_fini _nouveau_engine_fini

extern struct nouveau_oclass nv84_bsp_oclass;
extern struct nouveau_oclass nve0_bsp_oclass;

Expand Down
Loading

0 comments on commit 66433c2

Please sign in to comment.