These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / include / nvkm / core / engine.h

diff --git a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h
index faf0fd2..48bf128 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h
+++ b/kernel/drivers/gpu/drm/nouveau/include/nvkm/core/engine.h
@@ -1,56 +1,49 @@
 #ifndef __NVKM_ENGINE_H__
 #define __NVKM_ENGINE_H__
+#define nvkm_engine(p) container_of((p), struct nvkm_engine, subdev)
 #include <core/subdev.h>
-
-#define NV_ENGINE_(eng,var) (NV_ENGINE_CLASS | ((var) << 8) | (eng))
-#define NV_ENGINE(name,var)  NV_ENGINE_(NVDEV_ENGINE_##name, (var))
+struct nvkm_fifo_chan;
+struct nvkm_fb_tile;
 
 struct nvkm_engine {
+       const struct nvkm_engine_func *func;
        struct nvkm_subdev subdev;
-       struct nvkm_oclass *cclass;
-       struct nvkm_oclass *sclass;
-
-       struct list_head contexts;
        spinlock_t lock;
 
-       void (*tile_prog)(struct nvkm_engine *, int region);
-       int  (*tlb_flush)(struct nvkm_engine *);
+       int usecount;
 };
 
-static inline struct nvkm_engine *
-nv_engine(void *obj)
-{
-#if CONFIG_NOUVEAU_DEBUG >= NV_DBG_PARANOIA
-       if (unlikely(!nv_iclass(obj, NV_ENGINE_CLASS)))
-               nv_assert("BAD CAST -> NvEngine, %08x", nv_hclass(obj));
-#endif
-       return obj;
-}
-
-static inline int
-nv_engidx(struct nvkm_engine *engine)
-{
-       return nv_subidx(&engine->subdev);
-}
-
-struct nvkm_engine *nvkm_engine(void *obj, int idx);
-
-#define nvkm_engine_create(p,e,c,d,i,f,r)                                   \
-       nvkm_engine_create_((p), (e), (c), (d), (i), (f),                   \
-                              sizeof(**r),(void **)r)
-
-#define nvkm_engine_destroy(p)                                              \
-       nvkm_subdev_destroy(&(p)->subdev)
-#define nvkm_engine_init(p)                                                 \
-       nvkm_subdev_init(&(p)->subdev)
-#define nvkm_engine_fini(p,s)                                               \
-       nvkm_subdev_fini(&(p)->subdev, (s))
-
-int nvkm_engine_create_(struct nvkm_object *, struct nvkm_object *,
-                          struct nvkm_oclass *, bool, const char *,
-                          const char *, int, void **);
+struct nvkm_engine_func {
+       void *(*dtor)(struct nvkm_engine *);
+       int (*oneinit)(struct nvkm_engine *);
+       int (*init)(struct nvkm_engine *);
+       int (*fini)(struct nvkm_engine *, bool suspend);
+       void (*intr)(struct nvkm_engine *);
+       void (*tile)(struct nvkm_engine *, int region, struct nvkm_fb_tile *);
+
+       struct {
+               int (*sclass)(struct nvkm_oclass *, int index,
+                             const struct nvkm_device_oclass **);
+       } base;
+
+       struct {
+               int (*cclass)(struct nvkm_fifo_chan *,
+                             const struct nvkm_oclass *,
+                             struct nvkm_object **);
+               int (*sclass)(struct nvkm_oclass *, int index);
+       } fifo;
+
+       const struct nvkm_object_func *cclass;
+       struct nvkm_sclass sclass[];
+};
 
-#define _nvkm_engine_dtor _nvkm_subdev_dtor
-#define _nvkm_engine_init _nvkm_subdev_init
-#define _nvkm_engine_fini _nvkm_subdev_fini
+int nvkm_engine_ctor(const struct nvkm_engine_func *, struct nvkm_device *,
+                    int index, u32 pmc_enable, bool enable,
+                    struct nvkm_engine *);
+int nvkm_engine_new_(const struct nvkm_engine_func *, struct nvkm_device *,
+                    int index, u32 pmc_enable, bool enable,
+                    struct nvkm_engine **);
+struct nvkm_engine *nvkm_engine_ref(struct nvkm_engine *);
+void nvkm_engine_unref(struct nvkm_engine **);
+void nvkm_engine_tile(struct nvkm_engine *, int region);
 #endif