drm/nouveau/xtensa: convert to new-style nvkm_engine

[deliverable/linux.git] / drivers / gpu / drm / nouveau / include / nvkm / engine / xtensa.h

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h
index 6a53812c064d8c148fbbfd52bed6994761d2abbd..3128d21a5d1a6409acbbbbdfd16b09551055bfdf 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/xtensa.h
@@ -4,30 +4,20 @@
 #include <core/engine.h>
 
 struct nvkm_xtensa {
-       struct nvkm_engine engine;
        const struct nvkm_xtensa_func *func;
-
        u32 addr;
+       struct nvkm_engine engine;
+
        struct nvkm_memory *gpu_fw;
-       u32 fifo_val;
-       u32 unkd28;
 };
 
+int nvkm_xtensa_new_(const struct nvkm_xtensa_func *, struct nvkm_device *,
+                    int index, bool enable, u32 addr, struct nvkm_engine **);
+
 struct nvkm_xtensa_func {
-       void (*init)(struct nvkm_xtensa *);
+       u32 pmc_enable;
+       u32 fifo_val;
+       u32 unkd28;
        struct nvkm_sclass sclass[];
 };
-
-#define nvkm_xtensa_create(p,e,c,b,d,i,f,r)                            \
-       nvkm_xtensa_create_((p), (e), (c), (b), (d), (i), (f),  \
-                              sizeof(**r),(void **)r)
-
-int nvkm_xtensa_create_(struct nvkm_object *,
-                          struct nvkm_object *,
-                          struct nvkm_oclass *, u32, bool,
-                          const char *, const char *,
-                          int, void **);
-#define _nvkm_xtensa_dtor _nvkm_engine_dtor
-int _nvkm_xtensa_init(struct nvkm_object *);
-int _nvkm_xtensa_fini(struct nvkm_object *, bool);
 #endif