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

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / engine / fifo / gk104.h

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
index 318d30d..5afd9b5 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
@@ -1,18 +1,77 @@
-#ifndef __NVKM_FIFO_NVE0_H__
-#define __NVKM_FIFO_NVE0_H__
-#include <engine/fifo.h>
-
-int  gk104_fifo_ctor(struct nvkm_object *, struct nvkm_object *,
-                   struct nvkm_oclass *, void *, u32,
-                   struct nvkm_object **);
-void gk104_fifo_dtor(struct nvkm_object *);
-int  gk104_fifo_init(struct nvkm_object *);
-int  gk104_fifo_fini(struct nvkm_object *, bool);
-
-struct gk104_fifo_impl {
-       struct nvkm_oclass base;
-       u32 channels;
+#ifndef __GK104_FIFO_H__
+#define __GK104_FIFO_H__
+#define gk104_fifo(p) container_of((p), struct gk104_fifo, base)
+#include "priv.h"
+
+#include <subdev/mmu.h>
+
+struct gk104_fifo_engn {
+       struct nvkm_memory *runlist[2];
+       int cur_runlist;
+       wait_queue_head_t wait;
+       struct list_head chan;
+};
+
+struct gk104_fifo {
+       struct nvkm_fifo base;
+
+       struct work_struct fault;
+       u64 mask;
+
+       struct gk104_fifo_engn engine[7];
+       struct {
+               struct nvkm_memory *mem;
+               struct nvkm_vma bar;
+       } user;
+       int spoon_nr;
 };
 
-extern struct nvkm_ofuncs gk104_fifo_chan_ofuncs;
+int gk104_fifo_new_(const struct nvkm_fifo_func *, struct nvkm_device *,
+                   int index, int nr, struct nvkm_fifo **);
+void *gk104_fifo_dtor(struct nvkm_fifo *);
+int gk104_fifo_oneinit(struct nvkm_fifo *);
+void gk104_fifo_init(struct nvkm_fifo *);
+void gk104_fifo_fini(struct nvkm_fifo *);
+void gk104_fifo_intr(struct nvkm_fifo *);
+void gk104_fifo_uevent_init(struct nvkm_fifo *);
+void gk104_fifo_uevent_fini(struct nvkm_fifo *);
+void gk104_fifo_runlist_update(struct gk104_fifo *, u32 engine);
+
+static inline u64
+gk104_fifo_engine_subdev(int engine)
+{
+       switch (engine) {
+       case 0: return (1ULL << NVKM_ENGINE_GR) |
+                      (1ULL << NVKM_ENGINE_SW) |
+                      (1ULL << NVKM_ENGINE_CE2);
+       case 1: return (1ULL << NVKM_ENGINE_MSPDEC);
+       case 2: return (1ULL << NVKM_ENGINE_MSPPP);
+       case 3: return (1ULL << NVKM_ENGINE_MSVLD);
+       case 4: return (1ULL << NVKM_ENGINE_CE0);
+       case 5: return (1ULL << NVKM_ENGINE_CE1);
+       case 6: return (1ULL << NVKM_ENGINE_MSENC);
+       default:
+               WARN_ON(1);
+               return 0;
+       }
+}
+
+static inline int
+gk104_fifo_subdev_engine(int subdev)
+{
+       switch (subdev) {
+       case NVKM_ENGINE_GR:
+       case NVKM_ENGINE_SW:
+       case NVKM_ENGINE_CE2   : return 0;
+       case NVKM_ENGINE_MSPDEC: return 1;
+       case NVKM_ENGINE_MSPPP : return 2;
+       case NVKM_ENGINE_MSVLD : return 3;
+       case NVKM_ENGINE_CE0   : return 4;
+       case NVKM_ENGINE_CE1   : return 5;
+       case NVKM_ENGINE_MSENC : return 6;
+       default:
+               WARN_ON(1);
+               return 0;
+       }
+}
 #endif