drm/nouveau/ppp: remove nouveau_ppp base class

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/engine/ppp/nv98.c b/drivers/gpu/drm/nouveau/core/engine/ppp/nv98.c
index 50e7e0da1981bc8604670b8370b10ed6fe95fb18..5a5b2a773ed7facd9a3e7fdd069e9682083a4af5 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/ppp/nv98.c
+++ b/drivers/gpu/drm/nouveau/core/engine/ppp/nv98.c
@@ -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;
 };
 
 /*******************************************************************************
@@ -49,61 +49,16 @@ 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,
        },
 };
 
@@ -111,11 +66,6 @@ nv98_ppp_cclass = {
  * 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,
@@ -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,
        },
 };

diff --git a/drivers/gpu/drm/nouveau/core/include/engine/ppp.h b/drivers/gpu/drm/nouveau/core/include/engine/ppp.h
index 517bedc8279bbc14d52ffc255bf423b1639cf1fb..0a66781e8cf179ce0e9f85564b45a31895e7d433 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/include/engine/ppp.h
+++ b/drivers/gpu/drm/nouveau/core/include/engine/ppp.h
@@ -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;