drm/nouveau/ce: convert user classes to new-style nvkm_object

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

diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h
index 1ce75be9c2d4c622fd4e4e34f89118d8ca9fed04..d10cdfc777567997a07ef8b381fd2a3184b1fe78 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/class.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/class.h
@@ -117,6 +117,8 @@
 
 #define GT212_DMA                                                    0x000085b5
 #define FERMI_DMA                                                    0x000090b5
+#define KEPLER_DMA_COPY_A                                            0x0000a0b5
+#define MAXWELL_DMA_COPY_A                                           0x0000b0b5
 
 #define FERMI_DECOMPRESS                                             0x000090b8
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c
index 8fad0ef13bd06e0e249ece4b5a28055bdc336675..f35677b87d29bc808c3a993ce96818422f897fbc 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c
@@ -22,42 +22,9 @@
  * Authors: Ben Skeggs
  */
 #include <engine/ce.h>
+#include <engine/fifo.h>
 
-#include <core/engctx.h>
-
-/*******************************************************************************
- * Copy object classes
- ******************************************************************************/
-
-static struct nvkm_oclass
-gk104_ce_sclass[] = {
-       { 0xa0b5, &nvkm_object_ofuncs },
-       {},
-};
-
-/*******************************************************************************
- * PCE context
- ******************************************************************************/
-
-static struct nvkm_ofuncs
-gk104_ce_context_ofuncs = {
-       .ctor = _nvkm_engctx_ctor,
-       .dtor = _nvkm_engctx_dtor,
-       .init = _nvkm_engctx_init,
-       .fini = _nvkm_engctx_fini,
-       .rd32 = _nvkm_engctx_rd32,
-       .wr32 = _nvkm_engctx_wr32,
-};
-
-static struct nvkm_oclass
-gk104_ce_cclass = {
-       .handle = NV_ENGCTX(CE0, 0xc0),
-       .ofuncs = &gk104_ce_context_ofuncs,
-};
-
-/*******************************************************************************
- * PCE engine/subdev functions
- ******************************************************************************/
+#include <nvif/class.h>
 
 static void
 gk104_ce_intr(struct nvkm_subdev *subdev)
@@ -72,6 +39,14 @@ gk104_ce_intr(struct nvkm_subdev *subdev)
        }
 }
 
+static const struct nvkm_engine_func
+gk104_ce = {
+       .sclass = {
+               { -1, -1, KEPLER_DMA_COPY_A },
+               {}
+       }
+};
+
 static int
 gk104_ce0_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
               struct nvkm_oclass *oclass, void *data, u32 size,
@@ -86,10 +61,9 @@ gk104_ce0_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
        if (ret)
                return ret;
 
+       ce->func = &gk104_ce;
        nv_subdev(ce)->unit = 0x00000040;
        nv_subdev(ce)->intr = gk104_ce_intr;
-       nv_engine(ce)->cclass = &gk104_ce_cclass;
-       nv_engine(ce)->sclass = gk104_ce_sclass;
        return 0;
 }
 
@@ -107,10 +81,9 @@ gk104_ce1_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
        if (ret)
                return ret;
 
+       ce->func = &gk104_ce;
        nv_subdev(ce)->unit = 0x00000080;
        nv_subdev(ce)->intr = gk104_ce_intr;
-       nv_engine(ce)->cclass = &gk104_ce_cclass;
-       nv_engine(ce)->sclass = gk104_ce_sclass;
        return 0;
 }
 
@@ -128,10 +101,9 @@ gk104_ce2_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
        if (ret)
                return ret;
 
+       ce->func = &gk104_ce;
        nv_subdev(ce)->unit = 0x00200000;
        nv_subdev(ce)->intr = gk104_ce_intr;
-       nv_engine(ce)->cclass = &gk104_ce_cclass;
-       nv_engine(ce)->sclass = gk104_ce_sclass;
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c
index 23dc90769b1ad4e3e2592616f9cb2b14f271214e..cb8faea1db74db65ca579cd9b5815c06d4493682 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c
@@ -22,42 +22,9 @@
  * Authors: Ben Skeggs
  */
 #include <engine/ce.h>
+#include <engine/fifo.h>
 
-#include <core/engctx.h>
-
-/*******************************************************************************
- * Copy object classes
- ******************************************************************************/
-
-static struct nvkm_oclass
-gm204_ce_sclass[] = {
-       { 0xb0b5, &nvkm_object_ofuncs },
-       {},
-};
-
-/*******************************************************************************
- * PCE context
- ******************************************************************************/
-
-static struct nvkm_ofuncs
-gm204_ce_context_ofuncs = {
-       .ctor = _nvkm_engctx_ctor,
-       .dtor = _nvkm_engctx_dtor,
-       .init = _nvkm_engctx_init,
-       .fini = _nvkm_engctx_fini,
-       .rd32 = _nvkm_engctx_rd32,
-       .wr32 = _nvkm_engctx_wr32,
-};
-
-static struct nvkm_oclass
-gm204_ce_cclass = {
-       .handle = NV_ENGCTX(CE0, 0x24),
-       .ofuncs = &gm204_ce_context_ofuncs,
-};
-
-/*******************************************************************************
- * PCE engine/subdev functions
- ******************************************************************************/
+#include <nvif/class.h>
 
 static void
 gm204_ce_intr(struct nvkm_subdev *subdev)
@@ -72,6 +39,14 @@ gm204_ce_intr(struct nvkm_subdev *subdev)
        }
 }
 
+static const struct nvkm_engine_func
+gm204_ce = {
+       .sclass = {
+               { -1, -1, MAXWELL_DMA_COPY_A },
+               {}
+       }
+};
+
 static int
 gm204_ce0_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
               struct nvkm_oclass *oclass, void *data, u32 size,
@@ -86,10 +61,9 @@ gm204_ce0_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
        if (ret)
                return ret;
 
+       ce->func = &gm204_ce;
        nv_subdev(ce)->unit = 0x00000040;
        nv_subdev(ce)->intr = gm204_ce_intr;
-       nv_engine(ce)->cclass = &gm204_ce_cclass;
-       nv_engine(ce)->sclass = gm204_ce_sclass;
        return 0;
 }
 
@@ -107,10 +81,9 @@ gm204_ce1_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
        if (ret)
                return ret;
 
+       ce->func = &gm204_ce;
        nv_subdev(ce)->unit = 0x00000080;
        nv_subdev(ce)->intr = gm204_ce_intr;
-       nv_engine(ce)->cclass = &gm204_ce_cclass;
-       nv_engine(ce)->sclass = gm204_ce_sclass;
        return 0;
 }
 
@@ -128,10 +101,9 @@ gm204_ce2_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
        if (ret)
                return ret;
 
+       ce->func = &gm204_ce;
        nv_subdev(ce)->unit = 0x00200000;
        nv_subdev(ce)->intr = gm204_ce_intr;
-       nv_engine(ce)->cclass = &gm204_ce_cclass;
-       nv_engine(ce)->sclass = gm204_ce_sclass;
        return 0;
 }