Skip to content

Commit

Permalink
drm/nouveau/ppp: remove nouveau_ppp base class
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 Nov 28, 2012
1 parent fb9bff2 commit d1be7e9
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 131 deletions.
107 changes: 15 additions & 92 deletions drivers/gpu/drm/nouveau/core/engine/ppp/nv98.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@
* Authors: Ben Skeggs
*/

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

#include <engine/ppp.h>

struct nv98_ppp_priv {
struct nouveau_ppp base;
struct nouveau_engine base;
};

struct nv98_ppp_chan {
struct nouveau_ppp_chan base;
struct nouveau_engctx base;
};

/*******************************************************************************
Expand All @@ -49,73 +49,23 @@ nv98_ppp_sclass[] = {
* PPPP context
******************************************************************************/

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

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

return 0;
}

static void
nv98_ppp_context_dtor(struct nouveau_object *object)
{
struct nv98_ppp_chan *priv = (void *)object;
nouveau_ppp_context_destroy(&priv->base);
}

static int
nv98_ppp_context_init(struct nouveau_object *object)
{
struct nv98_ppp_chan *priv = (void *)object;
int ret;

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

return 0;
}

static int
nv98_ppp_context_fini(struct nouveau_object *object, bool suspend)
{
struct nv98_ppp_chan *priv = (void *)object;
return nouveau_ppp_context_fini(&priv->base, suspend);
}

static struct nouveau_oclass
nv98_ppp_cclass = {
.handle = NV_ENGCTX(PPP, 0x98),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv98_ppp_context_ctor,
.dtor = nv98_ppp_context_dtor,
.init = nv98_ppp_context_init,
.fini = nv98_ppp_context_fini,
.rd32 = _nouveau_ppp_context_rd32,
.wr32 = _nouveau_ppp_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,
},
};

/*******************************************************************************
* PPPP engine/subdev functions
******************************************************************************/

static void
nv98_ppp_intr(struct nouveau_subdev *subdev)
{
}

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

ret = nouveau_ppp_create(parent, engine, oclass, &priv);
ret = nouveau_engine_create(parent, engine, oclass, true,
"PPPP", "ppp", &priv);
*pobject = nv_object(priv);
if (ret)
return ret;

nv_subdev(priv)->unit = 0x00400002;
nv_subdev(priv)->intr = nv98_ppp_intr;
nv_engine(priv)->cclass = &nv98_ppp_cclass;
nv_engine(priv)->sclass = nv98_ppp_sclass;
return 0;
}

static void
nv98_ppp_dtor(struct nouveau_object *object)
{
struct nv98_ppp_priv *priv = (void *)object;
nouveau_ppp_destroy(&priv->base);
}

static int
nv98_ppp_init(struct nouveau_object *object)
{
struct nv98_ppp_priv *priv = (void *)object;
int ret;

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

return 0;
}

static int
nv98_ppp_fini(struct nouveau_object *object, bool suspend)
{
struct nv98_ppp_priv *priv = (void *)object;
return nouveau_ppp_fini(&priv->base, suspend);
}

struct nouveau_oclass
nv98_ppp_oclass = {
.handle = NV_ENGINE(PPP, 0x98),
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv98_ppp_ctor,
.dtor = nv98_ppp_dtor,
.init = nv98_ppp_init,
.fini = nv98_ppp_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/ppp.h
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,6 @@
#ifndef __NOUVEAU_PPP_H__
#define __NOUVEAU_PPP_H__

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

struct nouveau_ppp_chan {
struct nouveau_engctx base;
};

#define nouveau_ppp_context_create(p,e,c,g,s,a,f,d) \
nouveau_engctx_create((p), (e), (c), (g), (s), (a), (f), (d))
#define nouveau_ppp_context_destroy(d) \
nouveau_engctx_destroy(&(d)->base)
#define nouveau_ppp_context_init(d) \
nouveau_engctx_init(&(d)->base)
#define nouveau_ppp_context_fini(d,s) \
nouveau_engctx_fini(&(d)->base, (s))

#define _nouveau_ppp_context_dtor _nouveau_engctx_dtor
#define _nouveau_ppp_context_init _nouveau_engctx_init
#define _nouveau_ppp_context_fini _nouveau_engctx_fini
#define _nouveau_ppp_context_rd32 _nouveau_engctx_rd32
#define _nouveau_ppp_context_wr32 _nouveau_engctx_wr32

struct nouveau_ppp {
struct nouveau_engine base;
};

#define nouveau_ppp_create(p,e,c,d) \
nouveau_engine_create((p), (e), (c), true, "PPPP", "ppp", (d))
#define nouveau_ppp_destroy(d) \
nouveau_engine_destroy(&(d)->base)
#define nouveau_ppp_init(d) \
nouveau_engine_init(&(d)->base)
#define nouveau_ppp_fini(d,s) \
nouveau_engine_fini(&(d)->base, (s))

#define _nouveau_ppp_dtor _nouveau_engine_dtor
#define _nouveau_ppp_init _nouveau_engine_init
#define _nouveau_ppp_fini _nouveau_engine_fini

extern struct nouveau_oclass nv98_ppp_oclass;
extern struct nouveau_oclass nvc0_ppp_oclass;

Expand Down

0 comments on commit d1be7e9

Please sign in to comment.