drm/nouveau/fifo: namespace + nvidia gpu names (no binary change)
authorBen Skeggs <bskeggs@redhat.com>
Wed, 14 Jan 2015 05:28:47 +0000 (15:28 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 22 Jan 2015 02:18:02 +0000 (12:18 +1000)
The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver.  This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).

Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.

A comparison of objdump disassemblies proves no code changes.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
26 files changed:
drivers/gpu/drm/nouveau/include/nvkm/core/os.h
drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
drivers/gpu/drm/nouveau/nvkm/engine/device/nvc0.c
drivers/gpu/drm/nouveau/nvkm/engine/device/nve0.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild
drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk208.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk20a.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.h
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv108.c [deleted file]
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.h
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv84.c [deleted file]
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nvc0.c [deleted file]
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.c [deleted file]
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.h [deleted file]

index e81d40c221b5b2d9c9c8f3689156efcb960b7265..9d6990aa5b47fce0597a506863181b6798f22b2f 100644 (file)
 #define nouveau_dmaeng nvkm_dmaeng
 #define nouveau_dmaobj nvkm_dmaobj
 #define nouveau_disp nvkm_disp
+#define nouveau_fifo_chan nvkm_fifo_chan
+#define nouveau_fifo nvkm_fifo
 
 #endif
index 27f05de8fd0a639cb861edd814402b82d37eefb2..05321ce7ab15a27c9f2154b0fbfe7a1b790f8a52 100644 (file)
@@ -1,15 +1,11 @@
-#ifndef __NOUVEAU_FIFO_H__
-#define __NOUVEAU_FIFO_H__
-
+#ifndef __NVKM_FIFO_H__
+#define __NVKM_FIFO_H__
 #include <core/namedb.h>
-#include <core/gpuobj.h>
-#include <core/engine.h>
-#include <core/event.h>
 
-struct nouveau_fifo_chan {
-       struct nouveau_namedb namedb;
-       struct nouveau_dmaobj *pushdma;
-       struct nouveau_gpuobj *pushgpu;
+struct nvkm_fifo_chan {
+       struct nvkm_namedb namedb;
+       struct nvkm_dmaobj *pushdma;
+       struct nvkm_gpuobj *pushgpu;
        void __iomem *user;
        u64 addr;
        u32 size;
@@ -17,110 +13,114 @@ struct nouveau_fifo_chan {
        atomic_t refcnt; /* NV04_NVSW_SET_REF */
 };
 
-static inline struct nouveau_fifo_chan *
-nouveau_fifo_chan(void *obj)
+static inline struct nvkm_fifo_chan *
+nvkm_fifo_chan(void *obj)
 {
        return (void *)nv_namedb(obj);
 }
 
-#define nouveau_fifo_channel_create(p,e,c,b,a,s,n,m,d)                         \
-       nouveau_fifo_channel_create_((p), (e), (c), (b), (a), (s), (n),        \
+#define nvkm_fifo_channel_create(p,e,c,b,a,s,n,m,d)                         \
+       nvkm_fifo_channel_create_((p), (e), (c), (b), (a), (s), (n),        \
                                     (m), sizeof(**d), (void **)d)
-#define nouveau_fifo_channel_init(p)                                           \
-       nouveau_namedb_init(&(p)->namedb)
-#define nouveau_fifo_channel_fini(p,s)                                         \
-       nouveau_namedb_fini(&(p)->namedb, (s))
-
-int  nouveau_fifo_channel_create_(struct nouveau_object *,
-                                 struct nouveau_object *,
-                                 struct nouveau_oclass *,
+#define nvkm_fifo_channel_init(p)                                           \
+       nvkm_namedb_init(&(p)->namedb)
+#define nvkm_fifo_channel_fini(p,s)                                         \
+       nvkm_namedb_fini(&(p)->namedb, (s))
+
+int  nvkm_fifo_channel_create_(struct nvkm_object *,
+                                 struct nvkm_object *,
+                                 struct nvkm_oclass *,
                                  int bar, u32 addr, u32 size, u32 push,
                                  u64 engmask, int len, void **);
-void nouveau_fifo_channel_destroy(struct nouveau_fifo_chan *);
+void nvkm_fifo_channel_destroy(struct nvkm_fifo_chan *);
 
-#define _nouveau_fifo_channel_init _nouveau_namedb_init
-#define _nouveau_fifo_channel_fini _nouveau_namedb_fini
+#define _nvkm_fifo_channel_init _nvkm_namedb_init
+#define _nvkm_fifo_channel_fini _nvkm_namedb_fini
 
-void _nouveau_fifo_channel_dtor(struct nouveau_object *);
-int  _nouveau_fifo_channel_map(struct nouveau_object *, u64 *, u32 *);
-u32  _nouveau_fifo_channel_rd32(struct nouveau_object *, u64);
-void _nouveau_fifo_channel_wr32(struct nouveau_object *, u64, u32);
-int  _nouveau_fifo_channel_ntfy(struct nouveau_object *, u32, struct nvkm_event **);
+void _nvkm_fifo_channel_dtor(struct nvkm_object *);
+int  _nvkm_fifo_channel_map(struct nvkm_object *, u64 *, u32 *);
+u32  _nvkm_fifo_channel_rd32(struct nvkm_object *, u64);
+void _nvkm_fifo_channel_wr32(struct nvkm_object *, u64, u32);
+int  _nvkm_fifo_channel_ntfy(struct nvkm_object *, u32, struct nvkm_event **);
 
-struct nouveau_fifo_base {
-       struct nouveau_gpuobj gpuobj;
+#include <core/gpuobj.h>
+
+struct nvkm_fifo_base {
+       struct nvkm_gpuobj gpuobj;
 };
 
-#define nouveau_fifo_context_create(p,e,c,g,s,a,f,d)                           \
-       nouveau_gpuobj_create((p), (e), (c), 0, (g), (s), (a), (f), (d))
-#define nouveau_fifo_context_destroy(p)                                        \
-       nouveau_gpuobj_destroy(&(p)->gpuobj)
-#define nouveau_fifo_context_init(p)                                           \
-       nouveau_gpuobj_init(&(p)->gpuobj)
-#define nouveau_fifo_context_fini(p,s)                                         \
-       nouveau_gpuobj_fini(&(p)->gpuobj, (s))
+#define nvkm_fifo_context_create(p,e,c,g,s,a,f,d)                           \
+       nvkm_gpuobj_create((p), (e), (c), 0, (g), (s), (a), (f), (d))
+#define nvkm_fifo_context_destroy(p)                                        \
+       nvkm_gpuobj_destroy(&(p)->gpuobj)
+#define nvkm_fifo_context_init(p)                                           \
+       nvkm_gpuobj_init(&(p)->gpuobj)
+#define nvkm_fifo_context_fini(p,s)                                         \
+       nvkm_gpuobj_fini(&(p)->gpuobj, (s))
+
+#define _nvkm_fifo_context_dtor _nvkm_gpuobj_dtor
+#define _nvkm_fifo_context_init _nvkm_gpuobj_init
+#define _nvkm_fifo_context_fini _nvkm_gpuobj_fini
+#define _nvkm_fifo_context_rd32 _nvkm_gpuobj_rd32
+#define _nvkm_fifo_context_wr32 _nvkm_gpuobj_wr32
 
-#define _nouveau_fifo_context_dtor _nouveau_gpuobj_dtor
-#define _nouveau_fifo_context_init _nouveau_gpuobj_init
-#define _nouveau_fifo_context_fini _nouveau_gpuobj_fini
-#define _nouveau_fifo_context_rd32 _nouveau_gpuobj_rd32
-#define _nouveau_fifo_context_wr32 _nouveau_gpuobj_wr32
+#include <core/engine.h>
+#include <core/event.h>
 
-struct nouveau_fifo {
-       struct nouveau_engine base;
+struct nvkm_fifo {
+       struct nvkm_engine base;
 
        struct nvkm_event cevent; /* channel creation event */
        struct nvkm_event uevent; /* async user trigger */
 
-       struct nouveau_object **channel;
+       struct nvkm_object **channel;
        spinlock_t lock;
        u16 min;
        u16 max;
 
-       int  (*chid)(struct nouveau_fifo *, struct nouveau_object *);
-       void (*pause)(struct nouveau_fifo *, unsigned long *);
-       void (*start)(struct nouveau_fifo *, unsigned long *);
+       int  (*chid)(struct nvkm_fifo *, struct nvkm_object *);
+       void (*pause)(struct nvkm_fifo *, unsigned long *);
+       void (*start)(struct nvkm_fifo *, unsigned long *);
 };
 
-static inline struct nouveau_fifo *
-nouveau_fifo(void *obj)
+static inline struct nvkm_fifo *
+nvkm_fifo(void *obj)
 {
-       return (void *)nouveau_engine(obj, NVDEV_ENGINE_FIFO);
+       return (void *)nvkm_engine(obj, NVDEV_ENGINE_FIFO);
 }
 
-#define nouveau_fifo_create(o,e,c,fc,lc,d)                                     \
-       nouveau_fifo_create_((o), (e), (c), (fc), (lc), sizeof(**d), (void **)d)
-#define nouveau_fifo_init(p)                                                   \
-       nouveau_engine_init(&(p)->base)
-#define nouveau_fifo_fini(p,s)                                                 \
-       nouveau_engine_fini(&(p)->base, (s))
+#define nvkm_fifo_create(o,e,c,fc,lc,d)                                     \
+       nvkm_fifo_create_((o), (e), (c), (fc), (lc), sizeof(**d), (void **)d)
+#define nvkm_fifo_init(p)                                                   \
+       nvkm_engine_init(&(p)->base)
+#define nvkm_fifo_fini(p,s)                                                 \
+       nvkm_engine_fini(&(p)->base, (s))
 
-int nouveau_fifo_create_(struct nouveau_object *, struct nouveau_object *,
-                        struct nouveau_oclass *, int min, int max,
+int nvkm_fifo_create_(struct nvkm_object *, struct nvkm_object *,
+                        struct nvkm_oclass *, int min, int max,
                         int size, void **);
-void nouveau_fifo_destroy(struct nouveau_fifo *);
+void nvkm_fifo_destroy(struct nvkm_fifo *);
 const char *
-nouveau_client_name_for_fifo_chid(struct nouveau_fifo *fifo, u32 chid);
-
-#define _nouveau_fifo_init _nouveau_engine_init
-#define _nouveau_fifo_fini _nouveau_engine_fini
-
-extern struct nouveau_oclass *nv04_fifo_oclass;
-extern struct nouveau_oclass *nv10_fifo_oclass;
-extern struct nouveau_oclass *nv17_fifo_oclass;
-extern struct nouveau_oclass *nv40_fifo_oclass;
-extern struct nouveau_oclass *nv50_fifo_oclass;
-extern struct nouveau_oclass *nv84_fifo_oclass;
-extern struct nouveau_oclass *nvc0_fifo_oclass;
-extern struct nouveau_oclass *nve0_fifo_oclass;
-extern struct nouveau_oclass *gk20a_fifo_oclass;
-extern struct nouveau_oclass *nv108_fifo_oclass;
-
-int  nouveau_fifo_uevent_ctor(struct nouveau_object *, void *, u32,
-                             struct nvkm_notify *);
-void nouveau_fifo_uevent(struct nouveau_fifo *);
-
-void nv04_fifo_intr(struct nouveau_subdev *);
-int  nv04_fifo_context_attach(struct nouveau_object *, struct nouveau_object *);
-
+nvkm_client_name_for_fifo_chid(struct nvkm_fifo *fifo, u32 chid);
+
+#define _nvkm_fifo_init _nvkm_engine_init
+#define _nvkm_fifo_fini _nvkm_engine_fini
+
+extern struct nvkm_oclass *nv04_fifo_oclass;
+extern struct nvkm_oclass *nv10_fifo_oclass;
+extern struct nvkm_oclass *nv17_fifo_oclass;
+extern struct nvkm_oclass *nv40_fifo_oclass;
+extern struct nvkm_oclass *nv50_fifo_oclass;
+extern struct nvkm_oclass *g84_fifo_oclass;
+extern struct nvkm_oclass *gf100_fifo_oclass;
+extern struct nvkm_oclass *gk104_fifo_oclass;
+extern struct nvkm_oclass *gk20a_fifo_oclass;
+extern struct nvkm_oclass *gk208_fifo_oclass;
+
+int  nvkm_fifo_uevent_ctor(struct nvkm_object *, void *, u32,
+                          struct nvkm_notify *);
+void nvkm_fifo_uevent(struct nvkm_fifo *);
+
+void nv04_fifo_intr(struct nvkm_subdev *);
+int  nv04_fifo_context_attach(struct nvkm_object *, struct nvkm_object *);
 #endif
index 1d851d61f98288a0fc5a0ce5b33aab24db4d99a0..bcdc5bdd10cfb0767fe95ead70a8318b2e09b54a 100644 (file)
@@ -84,7 +84,7 @@ gm100_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
 #endif
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv108_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gk208_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gm107_gr_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gm107_disp_oclass;
@@ -128,7 +128,7 @@ gm100_identify(struct nouveau_device *device)
 #endif
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
 #if 0
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv108_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gk208_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gm107_gr_oclass;
 #endif
index e4baae226379010efbf723e053044e58355eb86c..f48fd5a22f26ea13ec03dc8767acb42a02b6c72c 100644 (file)
@@ -106,7 +106,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv84_mpeg_oclass;
@@ -135,7 +135,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv84_mpeg_oclass;
@@ -164,7 +164,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv84_mpeg_oclass;
@@ -193,7 +193,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv84_mpeg_oclass;
@@ -222,7 +222,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv84_mpeg_oclass;
@@ -251,7 +251,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;
@@ -280,7 +280,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv84_mpeg_oclass;
@@ -309,7 +309,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;
@@ -338,7 +338,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_BAR    ] = &nv50_bar_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;
@@ -368,7 +368,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gt215_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MPEG   ] = &nv84_mpeg_oclass;
@@ -399,7 +399,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gt215_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;
@@ -429,7 +429,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gt215_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;
@@ -459,7 +459,7 @@ nv50_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gt215_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  nv50_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv84_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  g84_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nv50_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] = &nv50_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;
index 9a4e062656aca50d70225a0abae1fa9ac2387e96..3ebf7172835bcbc90b0217acb2522ccb772e9d22 100644 (file)
@@ -81,7 +81,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nvc0_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
@@ -114,7 +114,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nvc4_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
@@ -147,7 +147,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nvc4_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
@@ -179,7 +179,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nvc4_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
@@ -212,7 +212,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nvc4_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
@@ -244,7 +244,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nvc1_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
@@ -276,7 +276,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gf100_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf100_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nvc8_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
@@ -309,7 +309,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gf110_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nvd9_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
@@ -339,7 +339,7 @@ nvc0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_MMU    ] = &gf100_mmu_oclass;
                device->oclass[NVDEV_SUBDEV_BAR    ] = &gf100_bar_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nvc0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gf100_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nvd7_gr_oclass;
                device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
index 91aea039bfb1b90a9157a4e99f67028a4258ab03..cc06a67bbeacb23b5671b9ecfab6cfdb6f5fda6f 100644 (file)
@@ -81,7 +81,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gk104_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gk104_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nve4_gr_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gk104_disp_oclass;
@@ -115,7 +115,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gf110_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gk104_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nve4_gr_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gk104_disp_oclass;
@@ -149,7 +149,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gk104_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gk104_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nve4_gr_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gk104_disp_oclass;
@@ -205,7 +205,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gf110_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gk104_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nvf0_gr_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gk110_disp_oclass;
@@ -239,7 +239,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gf110_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nve0_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gk104_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  gk110b_gr_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gk110_disp_oclass;
@@ -273,7 +273,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gk208_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv108_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gk208_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nv108_gr_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gk110_disp_oclass;
@@ -306,7 +306,7 @@ nve0_identify(struct nouveau_device *device)
                device->oclass[NVDEV_SUBDEV_PMU    ] =  gk208_pmu_oclass;
                device->oclass[NVDEV_SUBDEV_VOLT   ] = &nv40_volt_oclass;
                device->oclass[NVDEV_ENGINE_DMAOBJ ] =  gf110_dmaeng_oclass;
-               device->oclass[NVDEV_ENGINE_FIFO   ] =  nv108_fifo_oclass;
+               device->oclass[NVDEV_ENGINE_FIFO   ] =  gk208_fifo_oclass;
                device->oclass[NVDEV_ENGINE_SW     ] =  nvc0_sw_oclass;
                device->oclass[NVDEV_ENGINE_GR     ] =  nv108_gr_oclass;
                device->oclass[NVDEV_ENGINE_DISP   ] =  gk110_disp_oclass;
index f38820faf44f85e5699e827d5374b775d4c0234a..c5a2d8718c5bdfdefc91e414e14d14c8d65edc79 100644 (file)
@@ -4,8 +4,8 @@ nvkm-y += nvkm/engine/fifo/nv10.o
 nvkm-y += nvkm/engine/fifo/nv17.o
 nvkm-y += nvkm/engine/fifo/nv40.o
 nvkm-y += nvkm/engine/fifo/nv50.o
-nvkm-y += nvkm/engine/fifo/nv84.o
-nvkm-y += nvkm/engine/fifo/nvc0.o
-nvkm-y += nvkm/engine/fifo/nve0.o
+nvkm-y += nvkm/engine/fifo/g84.o
+nvkm-y += nvkm/engine/fifo/gf100.o
+nvkm-y += nvkm/engine/fifo/gk104.o
 nvkm-y += nvkm/engine/fifo/gk20a.o
-nvkm-y += nvkm/engine/fifo/nv108.o
+nvkm-y += nvkm/engine/fifo/gk208.o
index 7e54a521bc05ab64117db31bbddfcc2fdd947482..fa223f88d25ea15f36983f063710facf783fcc7b 100644 (file)
  *
  * Authors: Ben Skeggs
  */
+#include <engine/fifo.h>
 
 #include <core/client.h>
 #include <core/device.h>
-#include <core/notify.h>
-#include <core/object.h>
 #include <core/handle.h>
-#include <core/event.h>
-#include <nvif/unpack.h>
+#include <core/notify.h>
+#include <engine/dmaobj.h>
+
 #include <nvif/class.h>
 #include <nvif/event.h>
-
-#include <engine/dmaobj.h>
-#include <engine/fifo.h>
+#include <nvif/unpack.h>
 
 static int
-nouveau_fifo_event_ctor(struct nouveau_object *object, void *data, u32 size,
-                       struct nvkm_notify *notify)
+nvkm_fifo_event_ctor(struct nvkm_object *object, void *data, u32 size,
+                    struct nvkm_notify *notify)
 {
        if (size == 0) {
                notify->size  = 0;
@@ -49,33 +47,33 @@ nouveau_fifo_event_ctor(struct nouveau_object *object, void *data, u32 size,
 }
 
 static const struct nvkm_event_func
-nouveau_fifo_event_func = {
-       .ctor = nouveau_fifo_event_ctor,
+nvkm_fifo_event_func = {
+       .ctor = nvkm_fifo_event_ctor,
 };
 
 int
-nouveau_fifo_channel_create_(struct nouveau_object *parent,
-                            struct nouveau_object *engine,
-                            struct nouveau_oclass *oclass,
-                            int bar, u32 addr, u32 size, u32 pushbuf,
-                            u64 engmask, int len, void **ptr)
+nvkm_fifo_channel_create_(struct nvkm_object *parent,
+                         struct nvkm_object *engine,
+                         struct nvkm_oclass *oclass,
+                         int bar, u32 addr, u32 size, u32 pushbuf,
+                         u64 engmask, int len, void **ptr)
 {
-       struct nouveau_device *device = nv_device(engine);
-       struct nouveau_fifo *priv = (void *)engine;
-       struct nouveau_fifo_chan *chan;
-       struct nouveau_dmaeng *dmaeng;
+       struct nvkm_device *device = nv_device(engine);
+       struct nvkm_fifo *priv = (void *)engine;
+       struct nvkm_fifo_chan *chan;
+       struct nvkm_dmaeng *dmaeng;
        unsigned long flags;
        int ret;
 
        /* create base object class */
-       ret = nouveau_namedb_create_(parent, engine, oclass, 0, NULL,
-                                    engmask, len, ptr);
+       ret = nvkm_namedb_create_(parent, engine, oclass, 0, NULL,
+                                 engmask, len, ptr);
        chan = *ptr;
        if (ret)
                return ret;
 
        /* validate dma object representing push buffer */
-       chan->pushdma = (void *)nouveau_handle_ref(parent, pushbuf);
+       chan->pushdma = (void *)nvkm_handle_ref(parent, pushbuf);
        if (!chan->pushdma)
                return -ENOENT;
 
@@ -115,9 +113,9 @@ nouveau_fifo_channel_create_(struct nouveau_object *parent,
 }
 
 void
-nouveau_fifo_channel_destroy(struct nouveau_fifo_chan *chan)
+nvkm_fifo_channel_destroy(struct nvkm_fifo_chan *chan)
 {
-       struct nouveau_fifo *priv = (void *)nv_object(chan)->engine;
+       struct nvkm_fifo *priv = (void *)nv_object(chan)->engine;
        unsigned long flags;
 
        if (chan->user)
@@ -127,31 +125,31 @@ nouveau_fifo_channel_destroy(struct nouveau_fifo_chan *chan)
        priv->channel[chan->chid] = NULL;
        spin_unlock_irqrestore(&priv->lock, flags);
 
-       nouveau_gpuobj_ref(NULL, &chan->pushgpu);
-       nouveau_object_ref(NULL, (struct nouveau_object **)&chan->pushdma);
-       nouveau_namedb_destroy(&chan->namedb);
+       nvkm_gpuobj_ref(NULL, &chan->pushgpu);
+       nvkm_object_ref(NULL, (struct nvkm_object **)&chan->pushdma);
+       nvkm_namedb_destroy(&chan->namedb);
 }
 
 void
-_nouveau_fifo_channel_dtor(struct nouveau_object *object)
+_nvkm_fifo_channel_dtor(struct nvkm_object *object)
 {
-       struct nouveau_fifo_chan *chan = (void *)object;
-       nouveau_fifo_channel_destroy(chan);
+       struct nvkm_fifo_chan *chan = (void *)object;
+       nvkm_fifo_channel_destroy(chan);
 }
 
 int
-_nouveau_fifo_channel_map(struct nouveau_object *object, u64 *addr, u32 *size)
+_nvkm_fifo_channel_map(struct nvkm_object *object, u64 *addr, u32 *size)
 {
-       struct nouveau_fifo_chan *chan = (void *)object;
+       struct nvkm_fifo_chan *chan = (void *)object;
        *addr = chan->addr;
        *size = chan->size;
        return 0;
 }
 
 u32
-_nouveau_fifo_channel_rd32(struct nouveau_object *object, u64 addr)
+_nvkm_fifo_channel_rd32(struct nvkm_object *object, u64 addr)
 {
-       struct nouveau_fifo_chan *chan = (void *)object;
+       struct nvkm_fifo_chan *chan = (void *)object;
        if (unlikely(!chan->user)) {
                chan->user = ioremap(chan->addr, chan->size);
                if (WARN_ON_ONCE(chan->user == NULL))
@@ -161,9 +159,9 @@ _nouveau_fifo_channel_rd32(struct nouveau_object *object, u64 addr)
 }
 
 void
-_nouveau_fifo_channel_wr32(struct nouveau_object *object, u64 addr, u32 data)
+_nvkm_fifo_channel_wr32(struct nvkm_object *object, u64 addr, u32 data)
 {
-       struct nouveau_fifo_chan *chan = (void *)object;
+       struct nvkm_fifo_chan *chan = (void *)object;
        if (unlikely(!chan->user)) {
                chan->user = ioremap(chan->addr, chan->size);
                if (WARN_ON_ONCE(chan->user == NULL))
@@ -173,8 +171,8 @@ _nouveau_fifo_channel_wr32(struct nouveau_object *object, u64 addr, u32 data)
 }
 
 int
-nouveau_fifo_uevent_ctor(struct nouveau_object *object, void *data, u32 size,
-                        struct nvkm_notify *notify)
+nvkm_fifo_uevent_ctor(struct nvkm_object *object, void *data, u32 size,
+                     struct nvkm_notify *notify)
 {
        union {
                struct nvif_notify_uevent_req none;
@@ -191,7 +189,7 @@ nouveau_fifo_uevent_ctor(struct nouveau_object *object, void *data, u32 size,
 }
 
 void
-nouveau_fifo_uevent(struct nouveau_fifo *fifo)
+nvkm_fifo_uevent(struct nvkm_fifo *fifo)
 {
        struct nvif_notify_uevent_rep rep = {
        };
@@ -199,10 +197,10 @@ nouveau_fifo_uevent(struct nouveau_fifo *fifo)
 }
 
 int
-_nouveau_fifo_channel_ntfy(struct nouveau_object *object, u32 type,
-                          struct nvkm_event **event)
+_nvkm_fifo_channel_ntfy(struct nvkm_object *object, u32 type,
+                       struct nvkm_event **event)
 {
-       struct nouveau_fifo *fifo = (void *)object->engine;
+       struct nvkm_fifo *fifo = (void *)object->engine;
        switch (type) {
        case G82_CHANNEL_DMA_V0_NTFY_UEVENT:
                if (nv_mclass(object) >= G82_CHANNEL_DMA) {
@@ -217,14 +215,14 @@ _nouveau_fifo_channel_ntfy(struct nouveau_object *object, u32 type,
 }
 
 static int
-nouveau_fifo_chid(struct nouveau_fifo *priv, struct nouveau_object *object)
+nvkm_fifo_chid(struct nvkm_fifo *priv, struct nvkm_object *object)
 {
        int engidx = nv_hclass(priv) & 0xff;
 
        while (object && object->parent) {
                if ( nv_iclass(object->parent, NV_ENGCTX_CLASS) &&
                    (nv_hclass(object->parent) & 0xff) == engidx)
-                       return nouveau_fifo_chan(object)->chid;
+                       return nvkm_fifo_chan(object)->chid;
                object = object->parent;
        }
 
@@ -232,9 +230,9 @@ nouveau_fifo_chid(struct nouveau_fifo *priv, struct nouveau_object *object)
 }
 
 const char *
-nouveau_client_name_for_fifo_chid(struct nouveau_fifo *fifo, u32 chid)
+nvkm_client_name_for_fifo_chid(struct nvkm_fifo *fifo, u32 chid)
 {
-       struct nouveau_fifo_chan *chan = NULL;
+       struct nvkm_fifo_chan *chan = NULL;
        unsigned long flags;
 
        spin_lock_irqsave(&fifo->lock, flags);
@@ -242,29 +240,28 @@ nouveau_client_name_for_fifo_chid(struct nouveau_fifo *fifo, u32 chid)
                chan = (void *)fifo->channel[chid];
        spin_unlock_irqrestore(&fifo->lock, flags);
 
-       return nouveau_client_name(chan);
+       return nvkm_client_name(chan);
 }
 
 void
-nouveau_fifo_destroy(struct nouveau_fifo *priv)
+nvkm_fifo_destroy(struct nvkm_fifo *priv)
 {
        kfree(priv->channel);
        nvkm_event_fini(&priv->uevent);
        nvkm_event_fini(&priv->cevent);
-       nouveau_engine_destroy(&priv->base);
+       nvkm_engine_destroy(&priv->base);
 }
 
 int
-nouveau_fifo_create_(struct nouveau_object *parent,
-                    struct nouveau_object *engine,
-                    struct nouveau_oclass *oclass,
-                    int min, int max, int length, void **pobject)
+nvkm_fifo_create_(struct nvkm_object *parent, struct nvkm_object *engine,
+                 struct nvkm_oclass *oclass,
+                 int min, int max, int length, void **pobject)
 {
-       struct nouveau_fifo *priv;
+       struct nvkm_fifo *priv;
        int ret;
 
-       ret = nouveau_engine_create_(parent, engine, oclass, true, "PFIFO",
-                                    "fifo", length, pobject);
+       ret = nvkm_engine_create_(parent, engine, oclass, true, "PFIFO",
+                                 "fifo", length, pobject);
        priv = *pobject;
        if (ret)
                return ret;
@@ -275,11 +272,11 @@ nouveau_fifo_create_(struct nouveau_object *parent,
        if (!priv->channel)
                return -ENOMEM;
 
-       ret = nvkm_event_init(&nouveau_fifo_event_func, 1, 1, &priv->cevent);
+       ret = nvkm_event_init(&nvkm_fifo_event_func, 1, 1, &priv->cevent);
        if (ret)
                return ret;
 
-       priv->chid = nouveau_fifo_chid;
+       priv->chid = nvkm_fifo_chid;
        spin_lock_init(&priv->lock);
        return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c
new file mode 100644 (file)
index 0000000..a04920b
--- /dev/null
@@ -0,0 +1,487 @@
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs
+ */
+#include "nv50.h"
+#include "nv04.h"
+
+#include <core/client.h>
+#include <core/engctx.h>
+#include <core/ramht.h>
+#include <subdev/bar.h>
+#include <subdev/mmu.h>
+#include <subdev/timer.h>
+
+#include <nvif/class.h>
+#include <nvif/unpack.h>
+
+/*******************************************************************************
+ * FIFO channel objects
+ ******************************************************************************/
+
+static int
+g84_fifo_context_attach(struct nvkm_object *parent, struct nvkm_object *object)
+{
+       struct nvkm_bar *bar = nvkm_bar(parent);
+       struct nv50_fifo_base *base = (void *)parent->parent;
+       struct nvkm_gpuobj *ectx = (void *)object;
+       u64 limit = ectx->addr + ectx->size - 1;
+       u64 start = ectx->addr;
+       u32 addr;
+
+       switch (nv_engidx(object->engine)) {
+       case NVDEV_ENGINE_SW    : return 0;
+       case NVDEV_ENGINE_GR    : addr = 0x0020; break;
+       case NVDEV_ENGINE_VP    :
+       case NVDEV_ENGINE_MSPDEC: addr = 0x0040; break;
+       case NVDEV_ENGINE_MSPPP :
+       case NVDEV_ENGINE_MPEG  : addr = 0x0060; break;
+       case NVDEV_ENGINE_BSP   :
+       case NVDEV_ENGINE_MSVLD : addr = 0x0080; break;
+       case NVDEV_ENGINE_CIPHER:
+       case NVDEV_ENGINE_SEC   : addr = 0x00a0; break;
+       case NVDEV_ENGINE_CE0   : addr = 0x00c0; break;
+       default:
+               return -EINVAL;
+       }
+
+       nv_engctx(ectx)->addr = nv_gpuobj(base)->addr >> 12;
+       nv_wo32(base->eng, addr + 0x00, 0x00190000);
+       nv_wo32(base->eng, addr + 0x04, lower_32_bits(limit));
+       nv_wo32(base->eng, addr + 0x08, lower_32_bits(start));
+       nv_wo32(base->eng, addr + 0x0c, upper_32_bits(limit) << 24 |
+                                       upper_32_bits(start));
+       nv_wo32(base->eng, addr + 0x10, 0x00000000);
+       nv_wo32(base->eng, addr + 0x14, 0x00000000);
+       bar->flush(bar);
+       return 0;
+}
+
+static int
+g84_fifo_context_detach(struct nvkm_object *parent, bool suspend,
+                       struct nvkm_object *object)
+{
+       struct nvkm_bar *bar = nvkm_bar(parent);
+       struct nv50_fifo_priv *priv = (void *)parent->engine;
+       struct nv50_fifo_base *base = (void *)parent->parent;
+       struct nv50_fifo_chan *chan = (void *)parent;
+       u32 addr, save, engn;
+       bool done;
+
+       switch (nv_engidx(object->engine)) {
+       case NVDEV_ENGINE_SW    : return 0;
+       case NVDEV_ENGINE_GR    : engn = 0; addr = 0x0020; break;
+       case NVDEV_ENGINE_VP    :
+       case NVDEV_ENGINE_MSPDEC: engn = 3; addr = 0x0040; break;
+       case NVDEV_ENGINE_MSPPP :
+       case NVDEV_ENGINE_MPEG  : engn = 1; addr = 0x0060; break;
+       case NVDEV_ENGINE_BSP   :
+       case NVDEV_ENGINE_MSVLD : engn = 5; addr = 0x0080; break;
+       case NVDEV_ENGINE_CIPHER:
+       case NVDEV_ENGINE_SEC   : engn = 4; addr = 0x00a0; break;
+       case NVDEV_ENGINE_CE0   : engn = 2; addr = 0x00c0; break;
+       default:
+               return -EINVAL;
+       }
+
+       save = nv_mask(priv, 0x002520, 0x0000003f, 1 << engn);
+       nv_wr32(priv, 0x0032fc, nv_gpuobj(base)->addr >> 12);
+       done = nv_wait_ne(priv, 0x0032fc, 0xffffffff, 0xffffffff);
+       nv_wr32(priv, 0x002520, save);
+       if (!done) {
+               nv_error(priv, "channel %d [%s] unload timeout\n",
+                        chan->base.chid, nvkm_client_name(chan));
+               if (suspend)
+                       return -EBUSY;
+       }
+
+       nv_wo32(base->eng, addr + 0x00, 0x00000000);
+       nv_wo32(base->eng, addr + 0x04, 0x00000000);
+       nv_wo32(base->eng, addr + 0x08, 0x00000000);
+       nv_wo32(base->eng, addr + 0x0c, 0x00000000);
+       nv_wo32(base->eng, addr + 0x10, 0x00000000);
+       nv_wo32(base->eng, addr + 0x14, 0x00000000);
+       bar->flush(bar);
+       return 0;
+}
+
+static int
+g84_fifo_object_attach(struct nvkm_object *parent,
+                      struct nvkm_object *object, u32 handle)
+{
+       struct nv50_fifo_chan *chan = (void *)parent;
+       u32 context;
+
+       if (nv_iclass(object, NV_GPUOBJ_CLASS))
+               context = nv_gpuobj(object)->node->offset >> 4;
+       else
+               context = 0x00000004; /* just non-zero */
+
+       switch (nv_engidx(object->engine)) {
+       case NVDEV_ENGINE_DMAOBJ:
+       case NVDEV_ENGINE_SW    : context |= 0x00000000; break;
+       case NVDEV_ENGINE_GR    : context |= 0x00100000; break;
+       case NVDEV_ENGINE_MPEG  :
+       case NVDEV_ENGINE_MSPPP : context |= 0x00200000; break;
+       case NVDEV_ENGINE_ME    :
+       case NVDEV_ENGINE_CE0   : context |= 0x00300000; break;
+       case NVDEV_ENGINE_VP    :
+       case NVDEV_ENGINE_MSPDEC: context |= 0x00400000; break;
+       case NVDEV_ENGINE_CIPHER:
+       case NVDEV_ENGINE_SEC   :
+       case NVDEV_ENGINE_VIC   : context |= 0x00500000; break;
+       case NVDEV_ENGINE_BSP   :
+       case NVDEV_ENGINE_MSVLD : context |= 0x00600000; break;
+       default:
+               return -EINVAL;
+       }
+
+       return nvkm_ramht_insert(chan->ramht, 0, handle, context);
+}
+
+static int
+g84_fifo_chan_ctor_dma(struct nvkm_object *parent, struct nvkm_object *engine,
+                      struct nvkm_oclass *oclass, void *data, u32 size,
+                      struct nvkm_object **pobject)
+{
+       union {
+               struct nv03_channel_dma_v0 v0;
+       } *args = data;
+       struct nvkm_bar *bar = nvkm_bar(parent);
+       struct nv50_fifo_base *base = (void *)parent;
+       struct nv50_fifo_chan *chan;
+       int ret;
+
+       nv_ioctl(parent, "create channel dma size %d\n", size);
+       if (nvif_unpack(args->v0, 0, 0, false)) {
+               nv_ioctl(parent, "create channel dma vers %d pushbuf %08x "
+                                "offset %016llx\n", args->v0.version,
+                        args->v0.pushbuf, args->v0.offset);
+       } else
+               return ret;
+
+       ret = nvkm_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
+                                      0x2000, args->v0.pushbuf,
+                                      (1ULL << NVDEV_ENGINE_DMAOBJ) |
+                                      (1ULL << NVDEV_ENGINE_SW) |
+                                      (1ULL << NVDEV_ENGINE_GR) |
+                                      (1ULL << NVDEV_ENGINE_MPEG) |
+                                      (1ULL << NVDEV_ENGINE_ME) |
+                                      (1ULL << NVDEV_ENGINE_VP) |
+                                      (1ULL << NVDEV_ENGINE_CIPHER) |
+                                      (1ULL << NVDEV_ENGINE_SEC) |
+                                      (1ULL << NVDEV_ENGINE_BSP) |
+                                      (1ULL << NVDEV_ENGINE_MSVLD) |
+                                      (1ULL << NVDEV_ENGINE_MSPDEC) |
+                                      (1ULL << NVDEV_ENGINE_MSPPP) |
+                                      (1ULL << NVDEV_ENGINE_CE0) |
+                                      (1ULL << NVDEV_ENGINE_VIC), &chan);
+       *pobject = nv_object(chan);
+       if (ret)
+               return ret;
+
+       args->v0.chid = chan->base.chid;
+
+       ret = nvkm_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
+                            &chan->ramht);
+       if (ret)
+               return ret;
+
+       nv_parent(chan)->context_attach = g84_fifo_context_attach;
+       nv_parent(chan)->context_detach = g84_fifo_context_detach;
+       nv_parent(chan)->object_attach = g84_fifo_object_attach;
+       nv_parent(chan)->object_detach = nv50_fifo_object_detach;
+
+       nv_wo32(base->ramfc, 0x08, lower_32_bits(args->v0.offset));
+       nv_wo32(base->ramfc, 0x0c, upper_32_bits(args->v0.offset));
+       nv_wo32(base->ramfc, 0x10, lower_32_bits(args->v0.offset));
+       nv_wo32(base->ramfc, 0x14, upper_32_bits(args->v0.offset));
+       nv_wo32(base->ramfc, 0x3c, 0x003f6078);
+       nv_wo32(base->ramfc, 0x44, 0x01003fff);
+       nv_wo32(base->ramfc, 0x48, chan->base.pushgpu->node->offset >> 4);
+       nv_wo32(base->ramfc, 0x4c, 0xffffffff);
+       nv_wo32(base->ramfc, 0x60, 0x7fffffff);
+       nv_wo32(base->ramfc, 0x78, 0x00000000);
+       nv_wo32(base->ramfc, 0x7c, 0x30000001);
+       nv_wo32(base->ramfc, 0x80, ((chan->ramht->bits - 9) << 27) |
+                                  (4 << 24) /* SEARCH_FULL */ |
+                                  (chan->ramht->gpuobj.node->offset >> 4));
+       nv_wo32(base->ramfc, 0x88, base->cache->addr >> 10);
+       nv_wo32(base->ramfc, 0x98, nv_gpuobj(base)->addr >> 12);
+       bar->flush(bar);
+       return 0;
+}
+
+static int
+g84_fifo_chan_ctor_ind(struct nvkm_object *parent, struct nvkm_object *engine,
+                      struct nvkm_oclass *oclass, void *data, u32 size,
+                      struct nvkm_object **pobject)
+{
+       union {
+               struct nv50_channel_gpfifo_v0 v0;
+       } *args = data;
+       struct nvkm_bar *bar = nvkm_bar(parent);
+       struct nv50_fifo_base *base = (void *)parent;
+       struct nv50_fifo_chan *chan;
+       u64 ioffset, ilength;
+       int ret;
+
+       nv_ioctl(parent, "create channel gpfifo size %d\n", size);
+       if (nvif_unpack(args->v0, 0, 0, false)) {
+               nv_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
+                                "ioffset %016llx ilength %08x\n",
+                        args->v0.version, args->v0.pushbuf, args->v0.ioffset,
+                        args->v0.ilength);
+       } else
+               return ret;
+
+       ret = nvkm_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
+                                      0x2000, args->v0.pushbuf,
+                                      (1ULL << NVDEV_ENGINE_DMAOBJ) |
+                                      (1ULL << NVDEV_ENGINE_SW) |
+                                      (1ULL << NVDEV_ENGINE_GR) |
+                                      (1ULL << NVDEV_ENGINE_MPEG) |
+                                      (1ULL << NVDEV_ENGINE_ME) |
+                                      (1ULL << NVDEV_ENGINE_VP) |
+                                      (1ULL << NVDEV_ENGINE_CIPHER) |
+                                      (1ULL << NVDEV_ENGINE_SEC) |
+                                      (1ULL << NVDEV_ENGINE_BSP) |
+                                      (1ULL << NVDEV_ENGINE_MSVLD) |
+                                      (1ULL << NVDEV_ENGINE_MSPDEC) |
+                                      (1ULL << NVDEV_ENGINE_MSPPP) |
+                                      (1ULL << NVDEV_ENGINE_CE0) |
+                                      (1ULL << NVDEV_ENGINE_VIC), &chan);
+       *pobject = nv_object(chan);
+       if (ret)
+               return ret;
+
+       args->v0.chid = chan->base.chid;
+
+       ret = nvkm_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
+                            &chan->ramht);
+       if (ret)
+               return ret;
+
+       nv_parent(chan)->context_attach = g84_fifo_context_attach;
+       nv_parent(chan)->context_detach = g84_fifo_context_detach;
+       nv_parent(chan)->object_attach = g84_fifo_object_attach;
+       nv_parent(chan)->object_detach = nv50_fifo_object_detach;
+
+       ioffset = args->v0.ioffset;
+       ilength = order_base_2(args->v0.ilength / 8);
+
+       nv_wo32(base->ramfc, 0x3c, 0x403f6078);
+       nv_wo32(base->ramfc, 0x44, 0x01003fff);
+       nv_wo32(base->ramfc, 0x48, chan->base.pushgpu->node->offset >> 4);
+       nv_wo32(base->ramfc, 0x50, lower_32_bits(ioffset));
+       nv_wo32(base->ramfc, 0x54, upper_32_bits(ioffset) | (ilength << 16));
+       nv_wo32(base->ramfc, 0x60, 0x7fffffff);
+       nv_wo32(base->ramfc, 0x78, 0x00000000);
+       nv_wo32(base->ramfc, 0x7c, 0x30000001);
+       nv_wo32(base->ramfc, 0x80, ((chan->ramht->bits - 9) << 27) |
+                                  (4 << 24) /* SEARCH_FULL */ |
+                                  (chan->ramht->gpuobj.node->offset >> 4));
+       nv_wo32(base->ramfc, 0x88, base->cache->addr >> 10);
+       nv_wo32(base->ramfc, 0x98, nv_gpuobj(base)->addr >> 12);
+       bar->flush(bar);
+       return 0;
+}
+
+static int
+g84_fifo_chan_init(struct nvkm_object *object)
+{
+       struct nv50_fifo_priv *priv = (void *)object->engine;
+       struct nv50_fifo_base *base = (void *)object->parent;
+       struct nv50_fifo_chan *chan = (void *)object;
+       struct nvkm_gpuobj *ramfc = base->ramfc;
+       u32 chid = chan->base.chid;
+       int ret;
+
+       ret = nvkm_fifo_channel_init(&chan->base);
+       if (ret)
+               return ret;
+
+       nv_wr32(priv, 0x002600 + (chid * 4), 0x80000000 | ramfc->addr >> 8);
+       nv50_fifo_playlist_update(priv);
+       return 0;
+}
+
+static struct nvkm_ofuncs
+g84_fifo_ofuncs_dma = {
+       .ctor = g84_fifo_chan_ctor_dma,
+       .dtor = nv50_fifo_chan_dtor,
+       .init = g84_fifo_chan_init,
+       .fini = nv50_fifo_chan_fini,
+       .map  = _nvkm_fifo_channel_map,
+       .rd32 = _nvkm_fifo_channel_rd32,
+       .wr32 = _nvkm_fifo_channel_wr32,
+       .ntfy = _nvkm_fifo_channel_ntfy
+};
+
+static struct nvkm_ofuncs
+g84_fifo_ofuncs_ind = {
+       .ctor = g84_fifo_chan_ctor_ind,
+       .dtor = nv50_fifo_chan_dtor,
+       .init = g84_fifo_chan_init,
+       .fini = nv50_fifo_chan_fini,
+       .map  = _nvkm_fifo_channel_map,
+       .rd32 = _nvkm_fifo_channel_rd32,
+       .wr32 = _nvkm_fifo_channel_wr32,
+       .ntfy = _nvkm_fifo_channel_ntfy
+};
+
+static struct nvkm_oclass
+g84_fifo_sclass[] = {
+       { G82_CHANNEL_DMA, &g84_fifo_ofuncs_dma },
+       { G82_CHANNEL_GPFIFO, &g84_fifo_ofuncs_ind },
+       {}
+};
+
+/*******************************************************************************
+ * FIFO context - basically just the instmem reserved for the channel
+ ******************************************************************************/
+
+static int
+g84_fifo_context_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+                     struct nvkm_oclass *oclass, void *data, u32 size,
+                     struct nvkm_object **pobject)
+{
+       struct nv50_fifo_base *base;
+       int ret;
+
+       ret = nvkm_fifo_context_create(parent, engine, oclass, NULL, 0x10000,
+                                      0x1000, NVOBJ_FLAG_HEAP, &base);
+       *pobject = nv_object(base);
+       if (ret)
+               return ret;
+
+       ret = nvkm_gpuobj_new(nv_object(base), nv_object(base), 0x0200, 0,
+                             NVOBJ_FLAG_ZERO_ALLOC, &base->eng);
+       if (ret)
+               return ret;
+
+       ret = nvkm_gpuobj_new(nv_object(base), nv_object(base), 0x4000, 0,
+                             0, &base->pgd);
+       if (ret)
+               return ret;
+
+       ret = nvkm_vm_ref(nvkm_client(parent)->vm, &base->vm, base->pgd);
+       if (ret)
+               return ret;
+
+       ret = nvkm_gpuobj_new(nv_object(base), nv_object(base), 0x1000,
+                             0x400, NVOBJ_FLAG_ZERO_ALLOC, &base->cache);
+       if (ret)
+               return ret;
+
+       ret = nvkm_gpuobj_new(nv_object(base), nv_object(base), 0x0100,
+                             0x100, NVOBJ_FLAG_ZERO_ALLOC, &base->ramfc);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+static struct nvkm_oclass
+g84_fifo_cclass = {
+       .handle = NV_ENGCTX(FIFO, 0x84),
+       .ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = g84_fifo_context_ctor,
+               .dtor = nv50_fifo_context_dtor,
+               .init = _nvkm_fifo_context_init,
+               .fini = _nvkm_fifo_context_fini,
+               .rd32 = _nvkm_fifo_context_rd32,
+               .wr32 = _nvkm_fifo_context_wr32,
+       },
+};
+
+/*******************************************************************************
+ * PFIFO engine
+ ******************************************************************************/
+
+static void
+g84_fifo_uevent_init(struct nvkm_event *event, int type, int index)
+{
+       struct nvkm_fifo *fifo = container_of(event, typeof(*fifo), uevent);
+       nv_mask(fifo, 0x002140, 0x40000000, 0x40000000);
+}
+
+static void
+g84_fifo_uevent_fini(struct nvkm_event *event, int type, int index)
+{
+       struct nvkm_fifo *fifo = container_of(event, typeof(*fifo), uevent);
+       nv_mask(fifo, 0x002140, 0x40000000, 0x00000000);
+}
+
+static const struct nvkm_event_func
+g84_fifo_uevent_func = {
+       .ctor = nvkm_fifo_uevent_ctor,
+       .init = g84_fifo_uevent_init,
+       .fini = g84_fifo_uevent_fini,
+};
+
+static int
+g84_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+             struct nvkm_oclass *oclass, void *data, u32 size,
+             struct nvkm_object **pobject)
+{
+       struct nv50_fifo_priv *priv;
+       int ret;
+
+       ret = nvkm_fifo_create(parent, engine, oclass, 1, 127, &priv);
+       *pobject = nv_object(priv);
+       if (ret)
+               return ret;
+
+       ret = nvkm_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
+                             &priv->playlist[0]);
+       if (ret)
+               return ret;
+
+       ret = nvkm_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
+                             &priv->playlist[1]);
+       if (ret)
+               return ret;
+
+       ret = nvkm_event_init(&g84_fifo_uevent_func, 1, 1, &priv->base.uevent);
+       if (ret)
+               return ret;
+
+       nv_subdev(priv)->unit = 0x00000100;
+       nv_subdev(priv)->intr = nv04_fifo_intr;
+       nv_engine(priv)->cclass = &g84_fifo_cclass;
+       nv_engine(priv)->sclass = g84_fifo_sclass;
+       priv->base.pause = nv04_fifo_pause;
+       priv->base.start = nv04_fifo_start;
+       return 0;
+}
+
+struct nvkm_oclass *
+g84_fifo_oclass = &(struct nvkm_oclass) {
+       .handle = NV_ENGINE(FIFO, 0x84),
+       .ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = g84_fifo_ctor,
+               .dtor = nv50_fifo_dtor,
+               .init = nv50_fifo_init,
+               .fini = _nvkm_fifo_fini,
+       },
+};
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
new file mode 100644 (file)
index 0000000..b745252
--- /dev/null
@@ -0,0 +1,967 @@
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs
+ */
+#include <engine/fifo.h>
+
+#include <core/client.h>
+#include <core/engctx.h>
+#include <core/enum.h>
+#include <core/handle.h>
+#include <subdev/bar.h>
+#include <subdev/fb.h>
+#include <subdev/mmu.h>
+#include <subdev/timer.h>
+
+#include <nvif/class.h>
+#include <nvif/unpack.h>
+
+struct gf100_fifo_priv {
+       struct nvkm_fifo base;
+
+       struct work_struct fault;
+       u64 mask;
+
+       struct {
+               struct nvkm_gpuobj *mem[2];
+               int active;
+               wait_queue_head_t wait;
+       } runlist;
+
+       struct {
+               struct nvkm_gpuobj *mem;
+               struct nvkm_vma bar;
+       } user;
+       int spoon_nr;
+};
+
+struct gf100_fifo_base {
+       struct nvkm_fifo_base base;
+       struct nvkm_gpuobj *pgd;
+       struct nvkm_vm *vm;
+};
+
+struct gf100_fifo_chan {
+       struct nvkm_fifo_chan base;
+       enum {
+               STOPPED,
+               RUNNING,
+               KILLED
+       } state;
+};
+
+/*******************************************************************************
+ * FIFO channel objects
+ ******************************************************************************/
+
+static void
+gf100_fifo_runlist_update(struct gf100_fifo_priv *priv)
+{
+       struct nvkm_bar *bar = nvkm_bar(priv);
+       struct nvkm_gpuobj *cur;
+       int i, p;
+
+       mutex_lock(&nv_subdev(priv)->mutex);
+       cur = priv->runlist.mem[priv->runlist.active];
+       priv->runlist.active = !priv->runlist.active;
+
+       for (i = 0, p = 0; i < 128; i++) {
+               struct gf100_fifo_chan *chan = (void *)priv->base.channel[i];
+               if (chan && chan->state == RUNNING) {
+                       nv_wo32(cur, p + 0, i);
+                       nv_wo32(cur, p + 4, 0x00000004);
+                       p += 8;
+               }
+       }
+       bar->flush(bar);
+
+       nv_wr32(priv, 0x002270, cur->addr >> 12);
+       nv_wr32(priv, 0x002274, 0x01f00000 | (p >> 3));
+
+       if (wait_event_timeout(priv->runlist.wait,
+                              !(nv_rd32(priv, 0x00227c) & 0x00100000),
+                              msecs_to_jiffies(2000)) == 0)
+               nv_error(priv, "runlist update timeout\n");
+       mutex_unlock(&nv_subdev(priv)->mutex);
+}
+
+static int
+gf100_fifo_context_attach(struct nvkm_object *parent,
+                         struct nvkm_object *object)
+{
+       struct nvkm_bar *bar = nvkm_bar(parent);
+       struct gf100_fifo_base *base = (void *)parent->parent;
+       struct nvkm_engctx *ectx = (void *)object;
+       u32 addr;
+       int ret;
+
+       switch (nv_engidx(object->engine)) {
+       case NVDEV_ENGINE_SW    : return 0;
+       case NVDEV_ENGINE_GR    : addr = 0x0210; break;
+       case NVDEV_ENGINE_CE0   : addr = 0x0230; break;
+       case NVDEV_ENGINE_CE1   : addr = 0x0240; break;
+       case NVDEV_ENGINE_MSVLD : addr = 0x0270; break;
+       case NVDEV_ENGINE_MSPDEC: addr = 0x0250; break;
+       case NVDEV_ENGINE_MSPPP : addr = 0x0260; break;
+       default:
+               return -EINVAL;
+       }
+
+       if (!ectx->vma.node) {
+               ret = nvkm_gpuobj_map_vm(nv_gpuobj(ectx), base->vm,
+                                        NV_MEM_ACCESS_RW, &ectx->vma);
+               if (ret)
+                       return ret;
+
+               nv_engctx(ectx)->addr = nv_gpuobj(base)->addr >> 12;
+       }
+
+       nv_wo32(base, addr + 0x00, lower_32_bits(ectx->vma.offset) | 4);
+       nv_wo32(base, addr + 0x04, upper_32_bits(ectx->vma.offset));
+       bar->flush(bar);
+       return 0;
+}
+
+static int
+gf100_fifo_context_detach(struct nvkm_object *parent, bool suspend,
+                         struct nvkm_object *object)
+{
+       struct nvkm_bar *bar = nvkm_bar(parent);
+       struct gf100_fifo_priv *priv = (void *)parent->engine;
+       struct gf100_fifo_base *base = (void *)parent->parent;
+       struct gf100_fifo_chan *chan = (void *)parent;
+       u32 addr;
+
+       switch (nv_engidx(object->engine)) {
+       case NVDEV_ENGINE_SW    : return 0;
+       case NVDEV_ENGINE_GR    : addr = 0x0210; break;
+       case NVDEV_ENGINE_CE0   : addr = 0x0230; break;
+       case NVDEV_ENGINE_CE1   : addr = 0x0240; break;
+       case NVDEV_ENGINE_MSVLD : addr = 0x0270; break;
+       case NVDEV_ENGINE_MSPDEC: addr = 0x0250; break;
+       case NVDEV_ENGINE_MSPPP : addr = 0x0260; break;
+       default:
+               return -EINVAL;
+       }
+
+       nv_wr32(priv, 0x002634, chan->base.chid);
+       if (!nv_wait(priv, 0x002634, 0xffffffff, chan->base.chid)) {
+               nv_error(priv, "channel %d [%s] kick timeout\n",
+                        chan->base.chid, nvkm_client_name(chan));
+               if (suspend)
+                       return -EBUSY;
+       }
+
+       nv_wo32(base, addr + 0x00, 0x00000000);
+       nv_wo32(base, addr + 0x04, 0x00000000);
+       bar->flush(bar);
+       return 0;
+}
+
+static int
+gf100_fifo_chan_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+                    struct nvkm_oclass *oclass, void *data, u32 size,
+                    struct nvkm_object **pobject)
+{
+       union {
+               struct nv50_channel_gpfifo_v0 v0;
+       } *args = data;
+       struct nvkm_bar *bar = nvkm_bar(parent);
+       struct gf100_fifo_priv *priv = (void *)engine;
+       struct gf100_fifo_base *base = (void *)parent;
+       struct gf100_fifo_chan *chan;
+       u64 usermem, ioffset, ilength;
+       int ret, i;
+
+       nv_ioctl(parent, "create channel gpfifo size %d\n", size);
+       if (nvif_unpack(args->v0, 0, 0, false)) {
+               nv_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
+                                "ioffset %016llx ilength %08x\n",
+                        args->v0.version, args->v0.pushbuf, args->v0.ioffset,
+                        args->v0.ilength);
+       } else
+               return ret;
+
+       ret = nvkm_fifo_channel_create(parent, engine, oclass, 1,
+                                      priv->user.bar.offset, 0x1000,
+                                      args->v0.pushbuf,
+                                      (1ULL << NVDEV_ENGINE_SW) |
+                                      (1ULL << NVDEV_ENGINE_GR) |
+                                      (1ULL << NVDEV_ENGINE_CE0) |
+                                      (1ULL << NVDEV_ENGINE_CE1) |
+                                      (1ULL << NVDEV_ENGINE_MSVLD) |
+                                      (1ULL << NVDEV_ENGINE_MSPDEC) |
+                                      (1ULL << NVDEV_ENGINE_MSPPP), &chan);
+       *pobject = nv_object(chan);
+       if (ret)
+               return ret;
+
+       args->v0.chid = chan->base.chid;
+
+       nv_parent(chan)->context_attach = gf100_fifo_context_attach;
+       nv_parent(chan)->context_detach = gf100_fifo_context_detach;
+
+       usermem = chan->base.chid * 0x1000;
+       ioffset = args->v0.ioffset;
+       ilength = order_base_2(args->v0.ilength / 8);
+
+       for (i = 0; i < 0x1000; i += 4)
+               nv_wo32(priv->user.mem, usermem + i, 0x00000000);
+
+       nv_wo32(base, 0x08, lower_32_bits(priv->user.mem->addr + usermem));
+       nv_wo32(base, 0x0c, upper_32_bits(priv->user.mem->addr + usermem));
+       nv_wo32(base, 0x10, 0x0000face);
+       nv_wo32(base, 0x30, 0xfffff902);
+       nv_wo32(base, 0x48, lower_32_bits(ioffset));
+       nv_wo32(base, 0x4c, upper_32_bits(ioffset) | (ilength << 16));
+       nv_wo32(base, 0x54, 0x00000002);
+       nv_wo32(base, 0x84, 0x20400000);
+       nv_wo32(base, 0x94, 0x30000001);
+       nv_wo32(base, 0x9c, 0x00000100);
+       nv_wo32(base, 0xa4, 0x1f1f1f1f);
+       nv_wo32(base, 0xa8, 0x1f1f1f1f);
+       nv_wo32(base, 0xac, 0x0000001f);
+       nv_wo32(base, 0xb8, 0xf8000000);
+       nv_wo32(base, 0xf8, 0x10003080); /* 0x002310 */
+       nv_wo32(base, 0xfc, 0x10000010); /* 0x002350 */
+       bar->flush(bar);
+       return 0;
+}
+
+static int
+gf100_fifo_chan_init(struct nvkm_object *object)
+{
+       struct nvkm_gpuobj *base = nv_gpuobj(object->parent);
+       struct gf100_fifo_priv *priv = (void *)object->engine;
+       struct gf100_fifo_chan *chan = (void *)object;
+       u32 chid = chan->base.chid;
+       int ret;
+
+       ret = nvkm_fifo_channel_init(&chan->base);
+       if (ret)
+               return ret;
+
+       nv_wr32(priv, 0x003000 + (chid * 8), 0xc0000000 | base->addr >> 12);
+
+       if (chan->state == STOPPED && (chan->state = RUNNING) == RUNNING) {
+               nv_wr32(priv, 0x003004 + (chid * 8), 0x001f0001);
+               gf100_fifo_runlist_update(priv);
+       }
+
+       return 0;
+}
+
+static void gf100_fifo_intr_engine(struct gf100_fifo_priv *priv);
+
+static int
+gf100_fifo_chan_fini(struct nvkm_object *object, bool suspend)
+{
+       struct gf100_fifo_priv *priv = (void *)object->engine;
+       struct gf100_fifo_chan *chan = (void *)object;
+       u32 chid = chan->base.chid;
+
+       if (chan->state == RUNNING && (chan->state = STOPPED) == STOPPED) {
+               nv_mask(priv, 0x003004 + (chid * 8), 0x00000001, 0x00000000);
+               gf100_fifo_runlist_update(priv);
+       }
+
+       gf100_fifo_intr_engine(priv);
+
+       nv_wr32(priv, 0x003000 + (chid * 8), 0x00000000);
+       return nvkm_fifo_channel_fini(&chan->base, suspend);
+}
+
+static struct nvkm_ofuncs
+gf100_fifo_ofuncs = {
+       .ctor = gf100_fifo_chan_ctor,
+       .dtor = _nvkm_fifo_channel_dtor,
+       .init = gf100_fifo_chan_init,
+       .fini = gf100_fifo_chan_fini,
+       .map  = _nvkm_fifo_channel_map,
+       .rd32 = _nvkm_fifo_channel_rd32,
+       .wr32 = _nvkm_fifo_channel_wr32,
+       .ntfy = _nvkm_fifo_channel_ntfy
+};
+
+static struct nvkm_oclass
+gf100_fifo_sclass[] = {
+       { FERMI_CHANNEL_GPFIFO, &gf100_fifo_ofuncs },
+       {}
+};
+
+/*******************************************************************************
+ * FIFO context - instmem heap and vm setup
+ ******************************************************************************/
+
+static int
+gf100_fifo_context_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+                       struct nvkm_oclass *oclass, void *data, u32 size,
+                       struct nvkm_object **pobject)
+{
+       struct gf100_fifo_base *base;
+       int ret;
+
+       ret = nvkm_fifo_context_create(parent, engine, oclass, NULL, 0x1000,
+                                      0x1000, NVOBJ_FLAG_ZERO_ALLOC |
+                                      NVOBJ_FLAG_HEAP, &base);
+       *pobject = nv_object(base);
+       if (ret)
+               return ret;
+
+       ret = nvkm_gpuobj_new(nv_object(base), NULL, 0x10000, 0x1000, 0,
+                             &base->pgd);
+       if (ret)
+               return ret;
+
+       nv_wo32(base, 0x0200, lower_32_bits(base->pgd->addr));
+       nv_wo32(base, 0x0204, upper_32_bits(base->pgd->addr));
+       nv_wo32(base, 0x0208, 0xffffffff);
+       nv_wo32(base, 0x020c, 0x000000ff);
+
+       ret = nvkm_vm_ref(nvkm_client(parent)->vm, &base->vm, base->pgd);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+static void
+gf100_fifo_context_dtor(struct nvkm_object *object)
+{
+       struct gf100_fifo_base *base = (void *)object;
+       nvkm_vm_ref(NULL, &base->vm, base->pgd);
+       nvkm_gpuobj_ref(NULL, &base->pgd);
+       nvkm_fifo_context_destroy(&base->base);
+}
+
+static struct nvkm_oclass
+gf100_fifo_cclass = {
+       .handle = NV_ENGCTX(FIFO, 0xc0),
+       .ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = gf100_fifo_context_ctor,
+               .dtor = gf100_fifo_context_dtor,
+               .init = _nvkm_fifo_context_init,
+               .fini = _nvkm_fifo_context_fini,
+               .rd32 = _nvkm_fifo_context_rd32,
+               .wr32 = _nvkm_fifo_context_wr32,
+       },
+};
+
+/*******************************************************************************
+ * PFIFO engine
+ ******************************************************************************/
+
+static inline int
+gf100_fifo_engidx(struct gf100_fifo_priv *priv, u32 engn)
+{
+       switch (engn) {
+       case NVDEV_ENGINE_GR    : engn = 0; break;
+       case NVDEV_ENGINE_MSVLD : engn = 1; break;
+       case NVDEV_ENGINE_MSPPP : engn = 2; break;
+       case NVDEV_ENGINE_MSPDEC: engn = 3; break;
+       case NVDEV_ENGINE_CE0   : engn = 4; break;
+       case NVDEV_ENGINE_CE1   : engn = 5; break;
+       default:
+               return -1;
+       }
+
+       return engn;
+}
+
+static inline struct nvkm_engine *
+gf100_fifo_engine(struct gf100_fifo_priv *priv, u32 engn)
+{
+       switch (engn) {
+       case 0: engn = NVDEV_ENGINE_GR; break;
+       case 1: engn = NVDEV_ENGINE_MSVLD; break;
+       case 2: engn = NVDEV_ENGINE_MSPPP; break;
+       case 3: engn = NVDEV_ENGINE_MSPDEC; break;
+       case 4: engn = NVDEV_ENGINE_CE0; break;
+       case 5: engn = NVDEV_ENGINE_CE1; break;
+       default:
+               return NULL;
+       }
+
+       return nvkm_engine(priv, engn);
+}
+
+static void
+gf100_fifo_recover_work(struct work_struct *work)
+{
+       struct gf100_fifo_priv *priv = container_of(work, typeof(*priv), fault);
+       struct nvkm_object *engine;
+       unsigned long flags;
+       u32 engn, engm = 0;
+       u64 mask, todo;
+
+       spin_lock_irqsave(&priv->base.lock, flags);
+       mask = priv->mask;
+       priv->mask = 0ULL;
+       spin_unlock_irqrestore(&priv->base.lock, flags);
+
+       for (todo = mask; engn = __ffs64(todo), todo; todo &= ~(1 << engn))
+               engm |= 1 << gf100_fifo_engidx(priv, engn);
+       nv_mask(priv, 0x002630, engm, engm);
+
+       for (todo = mask; engn = __ffs64(todo), todo; todo &= ~(1 << engn)) {
+               if ((engine = (void *)nvkm_engine(priv, engn))) {
+                       nv_ofuncs(engine)->fini(engine, false);
+                       WARN_ON(nv_ofuncs(engine)->init(engine));
+               }
+       }
+
+       gf100_fifo_runlist_update(priv);
+       nv_wr32(priv, 0x00262c, engm);
+       nv_mask(priv, 0x002630, engm, 0x00000000);
+}
+
+static void
+gf100_fifo_recover(struct gf100_fifo_priv *priv, struct nvkm_engine *engine,
+                  struct gf100_fifo_chan *chan)
+{
+       u32 chid = chan->base.chid;
+       unsigned long flags;
+
+       nv_error(priv, "%s engine fault on channel %d, recovering...\n",
+                      nv_subdev(engine)->name, chid);
+
+       nv_mask(priv, 0x003004 + (chid * 0x08), 0x00000001, 0x00000000);
+       chan->state = KILLED;
+
+       spin_lock_irqsave(&priv->base.lock, flags);
+       priv->mask |= 1ULL << nv_engidx(engine);
+       spin_unlock_irqrestore(&priv->base.lock, flags);
+       schedule_work(&priv->fault);
+}
+
+static int
+gf100_fifo_swmthd(struct gf100_fifo_priv *priv, u32 chid, u32 mthd, u32 data)
+{
+       struct gf100_fifo_chan *chan = NULL;
+       struct nvkm_handle *bind;
+       unsigned long flags;
+       int ret = -EINVAL;
+
+       spin_lock_irqsave(&priv->base.lock, flags);
+       if (likely(chid >= priv->base.min && chid <= priv->base.max))
+               chan = (void *)priv->base.channel[chid];
+       if (unlikely(!chan))
+               goto out;
+
+       bind = nvkm_namedb_get_class(nv_namedb(chan), 0x906e);
+       if (likely(bind)) {
+               if (!mthd || !nv_call(bind->object, mthd, data))
+                       ret = 0;
+               nvkm_namedb_put(bind);
+       }
+
+out:
+       spin_unlock_irqrestore(&priv->base.lock, flags);
+       return ret;
+}
+
+static const struct nvkm_enum
+gf100_fifo_sched_reason[] = {
+       { 0x0a, "CTXSW_TIMEOUT" },
+       {}
+};
+
+static void
+gf100_fifo_intr_sched_ctxsw(struct gf100_fifo_priv *priv)
+{
+       struct nvkm_engine *engine;
+       struct gf100_fifo_chan *chan;
+       u32 engn;
+
+       for (engn = 0; engn < 6; engn++) {
+               u32 stat = nv_rd32(priv, 0x002640 + (engn * 0x04));
+               u32 busy = (stat & 0x80000000);
+               u32 save = (stat & 0x00100000); /* maybe? */
+               u32 unk0 = (stat & 0x00040000);
+               u32 unk1 = (stat & 0x00001000);
+               u32 chid = (stat & 0x0000007f);
+               (void)save;
+
+               if (busy && unk0 && unk1) {
+                       if (!(chan = (void *)priv->base.channel[chid]))
+                               continue;
+                       if (!(engine = gf100_fifo_engine(priv, engn)))
+                               continue;
+                       gf100_fifo_recover(priv, engine, chan);
+               }
+       }
+}
+
+static void
+gf100_fifo_intr_sched(struct gf100_fifo_priv *priv)
+{
+       u32 intr = nv_rd32(priv, 0x00254c);
+       u32 code = intr & 0x000000ff;
+       const struct nvkm_enum *en;
+       char enunk[6] = "";
+
+       en = nvkm_enum_find(gf100_fifo_sched_reason, code);
+       if (!en)
+               snprintf(enunk, sizeof(enunk), "UNK%02x", code);
+
+       nv_error(priv, "SCHED_ERROR [ %s ]\n", en ? en->name : enunk);
+
+       switch (code) {
+       case 0x0a:
+               gf100_fifo_intr_sched_ctxsw(priv);
+               break;
+       default:
+               break;
+       }
+}
+
+static const struct nvkm_enum
+gf100_fifo_fault_engine[] = {
+       { 0x00, "PGRAPH", NULL, NVDEV_ENGINE_GR },
+       { 0x03, "PEEPHOLE", NULL, NVDEV_ENGINE_IFB },
+       { 0x04, "BAR1", NULL, NVDEV_SUBDEV_BAR },
+       { 0x05, "BAR3", NULL, NVDEV_SUBDEV_INSTMEM },
+       { 0x07, "PFIFO", NULL, NVDEV_ENGINE_FIFO },
+       { 0x10, "PMSVLD", NULL, NVDEV_ENGINE_MSVLD },
+       { 0x11, "PMSPPP", NULL, NVDEV_ENGINE_MSPPP },
+       { 0x13, "PCOUNTER" },
+       { 0x14, "PMSPDEC", NULL, NVDEV_ENGINE_MSPDEC },
+       { 0x15, "PCE0", NULL, NVDEV_ENGINE_CE0 },
+       { 0x16, "PCE1", NULL, NVDEV_ENGINE_CE1 },
+       { 0x17, "PDAEMON" },
+       {}
+};
+
+static const struct nvkm_enum
+gf100_fifo_fault_reason[] = {
+       { 0x00, "PT_NOT_PRESENT" },
+       { 0x01, "PT_TOO_SHORT" },
+       { 0x02, "PAGE_NOT_PRESENT" },
+       { 0x03, "VM_LIMIT_EXCEEDED" },
+       { 0x04, "NO_CHANNEL" },
+       { 0x05, "PAGE_SYSTEM_ONLY" },
+       { 0x06, "PAGE_READ_ONLY" },
+       { 0x0a, "COMPRESSED_SYSRAM" },
+       { 0x0c, "INVALID_STORAGE_TYPE" },
+       {}
+};
+
+static const struct nvkm_enum
+gf100_fifo_fault_hubclient[] = {
+       { 0x01, "PCOPY0" },
+       { 0x02, "PCOPY1" },
+       { 0x04, "DISPATCH" },
+       { 0x05, "CTXCTL" },
+       { 0x06, "PFIFO" },
+       { 0x07, "BAR_READ" },
+       { 0x08, "BAR_WRITE" },
+       { 0x0b, "PVP" },
+       { 0x0c, "PMSPPP" },
+       { 0x0d, "PMSVLD" },
+       { 0x11, "PCOUNTER" },
+       { 0x12, "PDAEMON" },
+       { 0x14, "CCACHE" },
+       { 0x15, "CCACHE_POST" },
+       {}
+};
+
+static const struct nvkm_enum
+gf100_fifo_fault_gpcclient[] = {
+       { 0x01, "TEX" },
+       { 0x0c, "ESETUP" },
+       { 0x0e, "CTXCTL" },
+       { 0x0f, "PROP" },
+       {}
+};
+
+static void
+gf100_fifo_intr_fault(struct gf100_fifo_priv *priv, int unit)
+{
+       u32 inst = nv_rd32(priv, 0x002800 + (unit * 0x10));
+       u32 valo = nv_rd32(priv, 0x002804 + (unit * 0x10));
+       u32 vahi = nv_rd32(priv, 0x002808 + (unit * 0x10));
+       u32 stat = nv_rd32(priv, 0x00280c + (unit * 0x10));
+       u32 gpc    = (stat & 0x1f000000) >> 24;
+       u32 client = (stat & 0x00001f00) >> 8;
+       u32 write  = (stat & 0x00000080);
+       u32 hub    = (stat & 0x00000040);
+       u32 reason = (stat & 0x0000000f);
+       struct nvkm_object *engctx = NULL, *object;
+       struct nvkm_engine *engine = NULL;
+       const struct nvkm_enum *er, *eu, *ec;
+       char erunk[6] = "";
+       char euunk[6] = "";
+       char ecunk[6] = "";
+       char gpcid[3] = "";
+
+       er = nvkm_enum_find(gf100_fifo_fault_reason, reason);
+       if (!er)
+               snprintf(erunk, sizeof(erunk), "UNK%02X", reason);
+
+       eu = nvkm_enum_find(gf100_fifo_fault_engine, unit);
+       if (eu) {
+               switch (eu->data2) {
+               case NVDEV_SUBDEV_BAR:
+                       nv_mask(priv, 0x001704, 0x00000000, 0x00000000);
+                       break;
+               case NVDEV_SUBDEV_INSTMEM:
+                       nv_mask(priv, 0x001714, 0x00000000, 0x00000000);
+                       break;
+               case NVDEV_ENGINE_IFB:
+                       nv_mask(priv, 0x001718, 0x00000000, 0x00000000);
+                       break;
+               default:
+                       engine = nvkm_engine(priv, eu->data2);
+                       if (engine)
+                               engctx = nvkm_engctx_get(engine, inst);
+                       break;
+               }
+       } else {
+               snprintf(euunk, sizeof(euunk), "UNK%02x", unit);
+       }
+
+       if (hub) {
+               ec = nvkm_enum_find(gf100_fifo_fault_hubclient, client);
+       } else {
+               ec = nvkm_enum_find(gf100_fifo_fault_gpcclient, client);
+               snprintf(gpcid, sizeof(gpcid), "%d", gpc);
+       }
+
+       if (!ec)
+               snprintf(ecunk, sizeof(ecunk), "UNK%02x", client);
+
+       nv_error(priv, "%s fault at 0x%010llx [%s] from %s/%s%s%s%s on "
+                      "channel 0x%010llx [%s]\n", write ? "write" : "read",
+                (u64)vahi << 32 | valo, er ? er->name : erunk,
+                eu ? eu->name : euunk, hub ? "" : "GPC", gpcid, hub ? "" : "/",
+                ec ? ec->name : ecunk, (u64)inst << 12,
+                nvkm_client_name(engctx));
+
+       object = engctx;
+       while (object) {
+               switch (nv_mclass(object)) {
+               case FERMI_CHANNEL_GPFIFO:
+                       gf100_fifo_recover(priv, engine, (void *)object);
+                       break;
+               }
+               object = object->parent;
+       }
+
+       nvkm_engctx_put(engctx);
+}
+
+static const struct nvkm_bitfield
+gf100_fifo_pbdma_intr[] = {
+/*     { 0x00008000, "" }      seen with null ib push */
+       { 0x00200000, "ILLEGAL_MTHD" },
+       { 0x00800000, "EMPTY_SUBC" },
+       {}
+};
+
+static void
+gf100_fifo_intr_pbdma(struct gf100_fifo_priv *priv, int unit)
+{
+       u32 stat = nv_rd32(priv, 0x040108 + (unit * 0x2000));
+       u32 addr = nv_rd32(priv, 0x0400c0 + (unit * 0x2000));
+       u32 data = nv_rd32(priv, 0x0400c4 + (unit * 0x2000));
+       u32 chid = nv_rd32(priv, 0x040120 + (unit * 0x2000)) & 0x7f;
+       u32 subc = (addr & 0x00070000) >> 16;
+       u32 mthd = (addr & 0x00003ffc);
+       u32 show = stat;
+
+       if (stat & 0x00800000) {
+               if (!gf100_fifo_swmthd(priv, chid, mthd, data))
+                       show &= ~0x00800000;
+       }
+
+       if (show) {
+               nv_error(priv, "PBDMA%d:", unit);
+               nvkm_bitfield_print(gf100_fifo_pbdma_intr, show);
+               pr_cont("\n");
+               nv_error(priv,
+                        "PBDMA%d: ch %d [%s] subc %d mthd 0x%04x data 0x%08x\n",
+                        unit, chid,
+                        nvkm_client_name_for_fifo_chid(&priv->base, chid),
+                        subc, mthd, data);
+       }
+
+       nv_wr32(priv, 0x0400c0 + (unit * 0x2000), 0x80600008);
+       nv_wr32(priv, 0x040108 + (unit * 0x2000), stat);
+}
+
+static void
+gf100_fifo_intr_runlist(struct gf100_fifo_priv *priv)
+{
+       u32 intr = nv_rd32(priv, 0x002a00);
+
+       if (intr & 0x10000000) {
+               wake_up(&priv->runlist.wait);
+               nv_wr32(priv, 0x002a00, 0x10000000);
+               intr &= ~0x10000000;
+       }
+
+       if (intr) {
+               nv_error(priv, "RUNLIST 0x%08x\n", intr);
+               nv_wr32(priv, 0x002a00, intr);
+       }
+}
+
+static void
+gf100_fifo_intr_engine_unit(struct gf100_fifo_priv *priv, int engn)
+{
+       u32 intr = nv_rd32(priv, 0x0025a8 + (engn * 0x04));
+       u32 inte = nv_rd32(priv, 0x002628);
+       u32 unkn;
+
+       nv_wr32(priv, 0x0025a8 + (engn * 0x04), intr);
+
+       for (unkn = 0; unkn < 8; unkn++) {
+               u32 ints = (intr >> (unkn * 0x04)) & inte;
+               if (ints & 0x1) {
+                       nvkm_fifo_uevent(&priv->base);
+                       ints &= ~1;
+               }
+               if (ints) {
+                       nv_error(priv, "ENGINE %d %d %01x", engn, unkn, ints);
+                       nv_mask(priv, 0x002628, ints, 0);
+               }
+       }
+}
+
+static void
+gf100_fifo_intr_engine(struct gf100_fifo_priv *priv)
+{
+       u32 mask = nv_rd32(priv, 0x0025a4);
+       while (mask) {
+               u32 unit = __ffs(mask);
+               gf100_fifo_intr_engine_unit(priv, unit);
+               mask &= ~(1 << unit);
+       }
+}
+
+static void
+gf100_fifo_intr(struct nvkm_subdev *subdev)
+{
+       struct gf100_fifo_priv *priv = (void *)subdev;
+       u32 mask = nv_rd32(priv, 0x002140);
+       u32 stat = nv_rd32(priv, 0x002100) & mask;
+
+       if (stat & 0x00000001) {
+               u32 intr = nv_rd32(priv, 0x00252c);
+               nv_warn(priv, "INTR 0x00000001: 0x%08x\n", intr);
+               nv_wr32(priv, 0x002100, 0x00000001);
+               stat &= ~0x00000001;
+       }
+
+       if (stat & 0x00000100) {
+               gf100_fifo_intr_sched(priv);
+               nv_wr32(priv, 0x002100, 0x00000100);
+               stat &= ~0x00000100;
+       }
+
+       if (stat & 0x00010000) {
+               u32 intr = nv_rd32(priv, 0x00256c);
+               nv_warn(priv, "INTR 0x00010000: 0x%08x\n", intr);
+               nv_wr32(priv, 0x002100, 0x00010000);
+               stat &= ~0x00010000;
+       }
+
+       if (stat & 0x01000000) {
+               u32 intr = nv_rd32(priv, 0x00258c);
+               nv_warn(priv, "INTR 0x01000000: 0x%08x\n", intr);
+               nv_wr32(priv, 0x002100, 0x01000000);
+               stat &= ~0x01000000;
+       }
+
+       if (stat & 0x10000000) {
+               u32 mask = nv_rd32(priv, 0x00259c);
+               while (mask) {
+                       u32 unit = __ffs(mask);
+                       gf100_fifo_intr_fault(priv, unit);
+                       nv_wr32(priv, 0x00259c, (1 << unit));
+                       mask &= ~(1 << unit);
+               }
+               stat &= ~0x10000000;
+       }
+
+       if (stat & 0x20000000) {
+               u32 mask = nv_rd32(priv, 0x0025a0);
+               while (mask) {
+                       u32 unit = __ffs(mask);
+                       gf100_fifo_intr_pbdma(priv, unit);
+                       nv_wr32(priv, 0x0025a0, (1 << unit));
+                       mask &= ~(1 << unit);
+               }
+               stat &= ~0x20000000;
+       }
+
+       if (stat & 0x40000000) {
+               gf100_fifo_intr_runlist(priv);
+               stat &= ~0x40000000;
+       }
+
+       if (stat & 0x80000000) {
+               gf100_fifo_intr_engine(priv);
+               stat &= ~0x80000000;
+       }
+
+       if (stat) {
+               nv_error(priv, "INTR 0x%08x\n", stat);
+               nv_mask(priv, 0x002140, stat, 0x00000000);
+               nv_wr32(priv, 0x002100, stat);
+       }
+}
+
+static void
+gf100_fifo_uevent_init(struct nvkm_event *event, int type, int index)
+{
+       struct nvkm_fifo *fifo = container_of(event, typeof(*fifo), uevent);
+       nv_mask(fifo, 0x002140, 0x80000000, 0x80000000);
+}
+
+static void
+gf100_fifo_uevent_fini(struct nvkm_event *event, int type, int index)
+{
+       struct nvkm_fifo *fifo = container_of(event, typeof(*fifo), uevent);
+       nv_mask(fifo, 0x002140, 0x80000000, 0x00000000);
+}
+
+static const struct nvkm_event_func
+gf100_fifo_uevent_func = {
+       .ctor = nvkm_fifo_uevent_ctor,
+       .init = gf100_fifo_uevent_init,
+       .fini = gf100_fifo_uevent_fini,
+};
+
+static int
+gf100_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+               struct nvkm_oclass *oclass, void *data, u32 size,
+               struct nvkm_object **pobject)
+{
+       struct gf100_fifo_priv *priv;
+       int ret;
+
+       ret = nvkm_fifo_create(parent, engine, oclass, 0, 127, &priv);
+       *pobject = nv_object(priv);
+       if (ret)
+               return ret;
+
+       INIT_WORK(&priv->fault, gf100_fifo_recover_work);
+
+       ret = nvkm_gpuobj_new(nv_object(priv), NULL, 0x1000, 0x1000, 0,
+                             &priv->runlist.mem[0]);
+       if (ret)
+               return ret;
+
+       ret = nvkm_gpuobj_new(nv_object(priv), NULL, 0x1000, 0x1000, 0,
+                             &priv->runlist.mem[1]);
+       if (ret)
+               return ret;
+
+       init_waitqueue_head(&priv->runlist.wait);
+
+       ret = nvkm_gpuobj_new(nv_object(priv), NULL, 128 * 0x1000, 0x1000, 0,
+                             &priv->user.mem);
+       if (ret)
+               return ret;
+
+       ret = nvkm_gpuobj_map(priv->user.mem, NV_MEM_ACCESS_RW,
+                             &priv->user.bar);
+       if (ret)
+               return ret;
+
+       ret = nvkm_event_init(&gf100_fifo_uevent_func, 1, 1, &priv->base.uevent);
+       if (ret)
+               return ret;
+
+       nv_subdev(priv)->unit = 0x00000100;
+       nv_subdev(priv)->intr = gf100_fifo_intr;
+       nv_engine(priv)->cclass = &gf100_fifo_cclass;
+       nv_engine(priv)->sclass = gf100_fifo_sclass;
+       return 0;
+}
+
+static void
+gf100_fifo_dtor(struct nvkm_object *object)
+{
+       struct gf100_fifo_priv *priv = (void *)object;
+
+       nvkm_gpuobj_unmap(&priv->user.bar);
+       nvkm_gpuobj_ref(NULL, &priv->user.mem);
+       nvkm_gpuobj_ref(NULL, &priv->runlist.mem[0]);
+       nvkm_gpuobj_ref(NULL, &priv->runlist.mem[1]);
+
+       nvkm_fifo_destroy(&priv->base);
+}
+
+static int
+gf100_fifo_init(struct nvkm_object *object)
+{
+       struct gf100_fifo_priv *priv = (void *)object;
+       int ret, i;
+
+       ret = nvkm_fifo_init(&priv->base);
+       if (ret)
+               return ret;
+
+       nv_wr32(priv, 0x000204, 0xffffffff);
+       nv_wr32(priv, 0x002204, 0xffffffff);
+
+       priv->spoon_nr = hweight32(nv_rd32(priv, 0x002204));
+       nv_debug(priv, "%d PBDMA unit(s)\n", priv->spoon_nr);
+
+       /* assign engines to PBDMAs */
+       if (priv->spoon_nr >= 3) {
+               nv_wr32(priv, 0x002208, ~(1 << 0)); /* PGRAPH */
+               nv_wr32(priv, 0x00220c, ~(1 << 1)); /* PVP */
+               nv_wr32(priv, 0x002210, ~(1 << 1)); /* PMSPP */
+               nv_wr32(priv, 0x002214, ~(1 << 1)); /* PMSVLD */
+               nv_wr32(priv, 0x002218, ~(1 << 2)); /* PCE0 */
+               nv_wr32(priv, 0x00221c, ~(1 << 1)); /* PCE1 */
+       }
+
+       /* PBDMA[n] */
+       for (i = 0; i < priv->spoon_nr; i++) {
+               nv_mask(priv, 0x04013c + (i * 0x2000), 0x10000100, 0x00000000);
+               nv_wr32(priv, 0x040108 + (i * 0x2000), 0xffffffff); /* INTR */
+               nv_wr32(priv, 0x04010c + (i * 0x2000), 0xfffffeff); /* INTREN */
+       }
+
+       nv_mask(priv, 0x002200, 0x00000001, 0x00000001);
+       nv_wr32(priv, 0x002254, 0x10000000 | priv->user.bar.offset >> 12);
+
+       nv_wr32(priv, 0x002100, 0xffffffff);
+       nv_wr32(priv, 0x002140, 0x7fffffff);
+       nv_wr32(priv, 0x002628, 0x00000001); /* ENGINE_INTR_EN */
+       return 0;
+}
+
+struct nvkm_oclass *
+gf100_fifo_oclass = &(struct nvkm_oclass) {
+       .handle = NV_ENGINE(FIFO, 0xc0),
+       .ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = gf100_fifo_ctor,
+               .dtor = gf100_fifo_dtor,
+               .init = gf100_fifo_init,
+               .fini = _nvkm_fifo_fini,
+       },
+};
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
new file mode 100644 (file)
index 0000000..9585539
--- /dev/null
@@ -0,0 +1,1138 @@
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs
+ */
+#include "gk104.h"
+
+#include <core/client.h>
+#include <core/engctx.h>
+#include <core/enum.h>
+#include <core/handle.h>
+#include <subdev/bar.h>
+#include <subdev/fb.h>
+#include <subdev/mmu.h>
+#include <subdev/timer.h>
+
+#include <nvif/class.h>
+#include <nvif/unpack.h>
+
+#define _(a,b) { (a), ((1ULL << (a)) | (b)) }
+static const struct {
+       u64 subdev;
+       u64 mask;
+} fifo_engine[] = {
+       _(NVDEV_ENGINE_GR      , (1ULL << NVDEV_ENGINE_SW) |
+                                (1ULL << NVDEV_ENGINE_CE2)),
+       _(NVDEV_ENGINE_MSPDEC  , 0),
+       _(NVDEV_ENGINE_MSPPP   , 0),
+       _(NVDEV_ENGINE_MSVLD   , 0),
+       _(NVDEV_ENGINE_CE0     , 0),
+       _(NVDEV_ENGINE_CE1     , 0),
+       _(NVDEV_ENGINE_MSENC   , 0),
+};
+#undef _
+#define FIFO_ENGINE_NR ARRAY_SIZE(fifo_engine)
+
+struct gk104_fifo_engn {
+       struct nvkm_gpuobj *runlist[2];
+       int cur_runlist;
+       wait_queue_head_t wait;
+};
+
+struct gk104_fifo_priv {
+       struct nvkm_fifo base;
+
+       struct work_struct fault;
+       u64 mask;
+
+       struct gk104_fifo_engn engine[FIFO_ENGINE_NR];
+       struct {
+               struct nvkm_gpuobj *mem;
+               struct nvkm_vma bar;
+       } user;
+       int spoon_nr;
+};
+
+struct gk104_fifo_base {
+       struct nvkm_fifo_base base;
+       struct nvkm_gpuobj *pgd;
+       struct nvkm_vm *vm;
+};
+
+struct gk104_fifo_chan {
+       struct nvkm_fifo_chan base;
+       u32 engine;
+       enum {
+               STOPPED,
+               RUNNING,
+               KILLED
+       } state;
+};
+
+/*******************************************************************************
+ * FIFO channel objects
+ ******************************************************************************/
+
+static void
+gk104_fifo_runlist_update(struct gk104_fifo_priv *priv, u32 engine)
+{
+       struct nvkm_bar *bar = nvkm_bar(priv);
+       struct gk104_fifo_engn *engn = &priv->engine[engine];
+       struct nvkm_gpuobj *cur;
+       int i, p;
+
+       mutex_lock(&nv_subdev(priv)->mutex);
+       cur = engn->runlist[engn->cur_runlist];
+       engn->cur_runlist = !engn->cur_runlist;
+
+       for (i = 0, p = 0; i < priv->base.max; i++) {
+               struct gk104_fifo_chan *chan = (void *)priv->base.channel[i];
+               if (chan && chan->state == RUNNING && chan->engine == engine) {
+                       nv_wo32(cur, p + 0, i);
+                       nv_wo32(cur, p + 4, 0x00000000);
+                       p += 8;
+               }
+       }
+       bar->flush(bar);
+
+       nv_wr32(priv, 0x002270, cur->addr >> 12);
+       nv_wr32(priv, 0x002274, (engine << 20) | (p >> 3));
+
+       if (wait_event_timeout(engn->wait, !(nv_rd32(priv, 0x002284 +
+                              (engine * 0x08)) & 0x00100000),
+                               msecs_to_jiffies(2000)) == 0)
+               nv_error(priv, "runlist %d update timeout\n", engine);
+       mutex_unlock(&nv_subdev(priv)->mutex);
+}
+
+static int
+gk104_fifo_context_attach(struct nvkm_object *parent,
+                         struct nvkm_object *object)
+{
+       struct nvkm_bar *bar = nvkm_bar(parent);
+       struct gk104_fifo_base *base = (void *)parent->parent;
+       struct nvkm_engctx *ectx = (void *)object;
+       u32 addr;
+       int ret;
+
+       switch (nv_engidx(object->engine)) {
+       case NVDEV_ENGINE_SW   :
+               return 0;
+       case NVDEV_ENGINE_CE0:
+       case NVDEV_ENGINE_CE1:
+       case NVDEV_ENGINE_CE2:
+               nv_engctx(ectx)->addr = nv_gpuobj(base)->addr >> 12;
+               return 0;
+       case NVDEV_ENGINE_GR    : addr = 0x0210; break;
+       case NVDEV_ENGINE_MSVLD : addr = 0x0270; break;
+       case NVDEV_ENGINE_MSPDEC: addr = 0x0250; break;
+       case NVDEV_ENGINE_MSPPP : addr = 0x0260; break;
+       default:
+               return -EINVAL;
+       }
+
+       if (!ectx->vma.node) {
+               ret = nvkm_gpuobj_map_vm(nv_gpuobj(ectx), base->vm,
+                                        NV_MEM_ACCESS_RW, &ectx->vma);
+               if (ret)
+                       return ret;
+
+               nv_engctx(ectx)->addr = nv_gpuobj(base)->addr >> 12;
+       }
+
+       nv_wo32(base, addr + 0x00, lower_32_bits(ectx->vma.offset) | 4);
+       nv_wo32(base, addr + 0x04, upper_32_bits(ectx->vma.offset));
+       bar->flush(bar);
+       return 0;
+}
+
+static int
+gk104_fifo_context_detach(struct nvkm_object *parent, bool suspend,
+                         struct nvkm_object *object)
+{
+       struct nvkm_bar *bar = nvkm_bar(parent);
+       struct gk104_fifo_priv *priv = (void *)parent->engine;
+       struct gk104_fifo_base *base = (void *)parent->parent;
+       struct gk104_fifo_chan *chan = (void *)parent;
+       u32 addr;
+
+       switch (nv_engidx(object->engine)) {
+       case NVDEV_ENGINE_SW    : return 0;
+       case NVDEV_ENGINE_CE0   :
+       case NVDEV_ENGINE_CE1   :
+       case NVDEV_ENGINE_CE2   : addr = 0x0000; break;
+       case NVDEV_ENGINE_GR    : addr = 0x0210; break;
+       case NVDEV_ENGINE_MSVLD : addr = 0x0270; break;
+       case NVDEV_ENGINE_MSPDEC: addr = 0x0250; break;
+       case NVDEV_ENGINE_MSPPP : addr = 0x0260; break;
+       default:
+               return -EINVAL;
+       }
+
+       nv_wr32(priv, 0x002634, chan->base.chid);
+       if (!nv_wait(priv, 0x002634, 0xffffffff, chan->base.chid)) {
+               nv_error(priv, "channel %d [%s] kick timeout\n",
+                        chan->base.chid, nvkm_client_name(chan));
+               if (suspend)
+                       return -EBUSY;
+       }
+
+       if (addr) {
+               nv_wo32(base, addr + 0x00, 0x00000000);
+               nv_wo32(base, addr + 0x04, 0x00000000);
+               bar->flush(bar);
+       }
+
+       return 0;
+}
+
+static int
+gk104_fifo_chan_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+                    struct nvkm_oclass *oclass, void *data, u32 size,
+                    struct nvkm_object **pobject)
+{
+       union {
+               struct kepler_channel_gpfifo_a_v0 v0;
+       } *args = data;
+       struct nvkm_bar *bar = nvkm_bar(parent);
+       struct gk104_fifo_priv *priv = (void *)engine;
+       struct gk104_fifo_base *base = (void *)parent;
+       struct gk104_fifo_chan *chan;
+       u64 usermem, ioffset, ilength;
+       int ret, i;
+
+       nv_ioctl(parent, "create channel gpfifo size %d\n", size);
+       if (nvif_unpack(args->v0, 0, 0, false)) {
+               nv_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
+                                "ioffset %016llx ilength %08x engine %08x\n",
+                        args->v0.version, args->v0.pushbuf, args->v0.ioffset,
+                        args->v0.ilength, args->v0.engine);
+       } else
+               return ret;
+
+       for (i = 0; i < FIFO_ENGINE_NR; i++) {
+               if (args->v0.engine & (1 << i)) {
+                       if (nvkm_engine(parent, fifo_engine[i].subdev)) {
+                               args->v0.engine = (1 << i);
+                               break;
+                       }
+               }
+       }
+
+       if (i == FIFO_ENGINE_NR) {
+               nv_error(priv, "unsupported engines 0x%08x\n", args->v0.engine);
+               return -ENODEV;
+       }
+
+       ret = nvkm_fifo_channel_create(parent, engine, oclass, 1,
+                                      priv->user.bar.offset, 0x200,
+                                      args->v0.pushbuf,
+                                      fifo_engine[i].mask, &chan);
+       *pobject = nv_object(chan);
+       if (ret)
+               return ret;
+
+       args->v0.chid = chan->base.chid;
+
+       nv_parent(chan)->context_attach = gk104_fifo_context_attach;
+       nv_parent(chan)->context_detach = gk104_fifo_context_detach;
+       chan->engine = i;
+
+       usermem = chan->base.chid * 0x200;
+       ioffset = args->v0.ioffset;
+       ilength = order_base_2(args->v0.ilength / 8);
+
+       for (i = 0; i < 0x200; i += 4)
+               nv_wo32(priv->user.mem, usermem + i, 0x00000000);
+
+       nv_wo32(base, 0x08, lower_32_bits(priv->user.mem->addr + usermem));
+       nv_wo32(base, 0x0c, upper_32_bits(priv->user.mem->addr + usermem));
+       nv_wo32(base, 0x10, 0x0000face);
+       nv_wo32(base, 0x30, 0xfffff902);
+       nv_wo32(base, 0x48, lower_32_bits(ioffset));
+       nv_wo32(base, 0x4c, upper_32_bits(ioffset) | (ilength << 16));
+       nv_wo32(base, 0x84, 0x20400000);
+       nv_wo32(base, 0x94, 0x30000001);
+       nv_wo32(base, 0x9c, 0x00000100);
+       nv_wo32(base, 0xac, 0x0000001f);
+       nv_wo32(base, 0xe8, chan->base.chid);
+       nv_wo32(base, 0xb8, 0xf8000000);
+       nv_wo32(base, 0xf8, 0x10003080); /* 0x002310 */
+       nv_wo32(base, 0xfc, 0x10000010); /* 0x002350 */
+       bar->flush(bar);
+       return 0;
+}
+
+static int
+gk104_fifo_chan_init(struct nvkm_object *object)
+{
+       struct nvkm_gpuobj *base = nv_gpuobj(object->parent);
+       struct gk104_fifo_priv *priv = (void *)object->engine;
+       struct gk104_fifo_chan *chan = (void *)object;
+       u32 chid = chan->base.chid;
+       int ret;
+
+       ret = nvkm_fifo_channel_init(&chan->base);
+       if (ret)
+               return ret;
+
+       nv_mask(priv, 0x800004 + (chid * 8), 0x000f0000, chan->engine << 16);
+       nv_wr32(priv, 0x800000 + (chid * 8), 0x80000000 | base->addr >> 12);
+
+       if (chan->state == STOPPED && (chan->state = RUNNING) == RUNNING) {
+               nv_mask(priv, 0x800004 + (chid * 8), 0x00000400, 0x00000400);
+               gk104_fifo_runlist_update(priv, chan->engine);
+               nv_mask(priv, 0x800004 + (chid * 8), 0x00000400, 0x00000400);
+       }
+
+       return 0;
+}
+
+static int
+gk104_fifo_chan_fini(struct nvkm_object *object, bool suspend)
+{
+       struct gk104_fifo_priv *priv = (void *)object->engine;
+       struct gk104_fifo_chan *chan = (void *)object;
+       u32 chid = chan->base.chid;
+
+       if (chan->state == RUNNING && (chan->state = STOPPED) == STOPPED) {
+               nv_mask(priv, 0x800004 + (chid * 8), 0x00000800, 0x00000800);
+               gk104_fifo_runlist_update(priv, chan->engine);
+       }
+
+       nv_wr32(priv, 0x800000 + (chid * 8), 0x00000000);
+       return nvkm_fifo_channel_fini(&chan->base, suspend);
+}
+
+static struct nvkm_ofuncs
+gk104_fifo_ofuncs = {
+       .ctor = gk104_fifo_chan_ctor,
+       .dtor = _nvkm_fifo_channel_dtor,
+       .init = gk104_fifo_chan_init,
+       .fini = gk104_fifo_chan_fini,
+       .map  = _nvkm_fifo_channel_map,
+       .rd32 = _nvkm_fifo_channel_rd32,
+       .wr32 = _nvkm_fifo_channel_wr32,
+       .ntfy = _nvkm_fifo_channel_ntfy
+};
+
+static struct nvkm_oclass
+gk104_fifo_sclass[] = {
+       { KEPLER_CHANNEL_GPFIFO_A, &gk104_fifo_ofuncs },
+       {}
+};
+
+/*******************************************************************************
+ * FIFO context - instmem heap and vm setup
+ ******************************************************************************/
+
+static int
+gk104_fifo_context_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+                       struct nvkm_oclass *oclass, void *data, u32 size,
+                       struct nvkm_object **pobject)
+{
+       struct gk104_fifo_base *base;
+       int ret;
+
+       ret = nvkm_fifo_context_create(parent, engine, oclass, NULL, 0x1000,
+                                      0x1000, NVOBJ_FLAG_ZERO_ALLOC, &base);
+       *pobject = nv_object(base);
+       if (ret)
+               return ret;
+
+       ret = nvkm_gpuobj_new(nv_object(base), NULL, 0x10000, 0x1000, 0,
+                             &base->pgd);
+       if (ret)
+               return ret;
+
+       nv_wo32(base, 0x0200, lower_32_bits(base->pgd->addr));
+       nv_wo32(base, 0x0204, upper_32_bits(base->pgd->addr));
+       nv_wo32(base, 0x0208, 0xffffffff);
+       nv_wo32(base, 0x020c, 0x000000ff);
+
+       ret = nvkm_vm_ref(nvkm_client(parent)->vm, &base->vm, base->pgd);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+static void
+gk104_fifo_context_dtor(struct nvkm_object *object)
+{
+       struct gk104_fifo_base *base = (void *)object;
+       nvkm_vm_ref(NULL, &base->vm, base->pgd);
+       nvkm_gpuobj_ref(NULL, &base->pgd);
+       nvkm_fifo_context_destroy(&base->base);
+}
+
+static struct nvkm_oclass
+gk104_fifo_cclass = {
+       .handle = NV_ENGCTX(FIFO, 0xe0),
+       .ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = gk104_fifo_context_ctor,
+               .dtor = gk104_fifo_context_dtor,
+               .init = _nvkm_fifo_context_init,
+               .fini = _nvkm_fifo_context_fini,
+               .rd32 = _nvkm_fifo_context_rd32,
+               .wr32 = _nvkm_fifo_context_wr32,
+       },
+};
+
+/*******************************************************************************
+ * PFIFO engine
+ ******************************************************************************/
+
+static inline int
+gk104_fifo_engidx(struct gk104_fifo_priv *priv, u32 engn)
+{
+       switch (engn) {
+       case NVDEV_ENGINE_GR    :
+       case NVDEV_ENGINE_CE2   : engn = 0; break;
+       case NVDEV_ENGINE_MSVLD : engn = 1; break;
+       case NVDEV_ENGINE_MSPPP : engn = 2; break;
+       case NVDEV_ENGINE_MSPDEC: engn = 3; break;
+       case NVDEV_ENGINE_CE0   : engn = 4; break;
+       case NVDEV_ENGINE_CE1   : engn = 5; break;
+       case NVDEV_ENGINE_MSENC : engn = 6; break;
+       default:
+               return -1;
+       }
+
+       return engn;
+}
+
+static inline struct nvkm_engine *
+gk104_fifo_engine(struct gk104_fifo_priv *priv, u32 engn)
+{
+       if (engn >= ARRAY_SIZE(fifo_engine))
+               return NULL;
+       return nvkm_engine(priv, fifo_engine[engn].subdev);
+}
+
+static void
+gk104_fifo_recover_work(struct work_struct *work)
+{
+       struct gk104_fifo_priv *priv = container_of(work, typeof(*priv), fault);
+       struct nvkm_object *engine;
+       unsigned long flags;
+       u32 engn, engm = 0;
+       u64 mask, todo;
+
+       spin_lock_irqsave(&priv->base.lock, flags);
+       mask = priv->mask;
+       priv->mask = 0ULL;
+       spin_unlock_irqrestore(&priv->base.lock, flags);
+
+       for (todo = mask; engn = __ffs64(todo), todo; todo &= ~(1 << engn))
+               engm |= 1 << gk104_fifo_engidx(priv, engn);
+       nv_mask(priv, 0x002630, engm, engm);
+
+       for (todo = mask; engn = __ffs64(todo), todo; todo &= ~(1 << engn)) {
+               if ((engine = (void *)nvkm_engine(priv, engn))) {
+                       nv_ofuncs(engine)->fini(engine, false);
+                       WARN_ON(nv_ofuncs(engine)->init(engine));
+               }
+               gk104_fifo_runlist_update(priv, gk104_fifo_engidx(priv, engn));
+       }
+
+       nv_wr32(priv, 0x00262c, engm);
+       nv_mask(priv, 0x002630, engm, 0x00000000);
+}
+
+static void
+gk104_fifo_recover(struct gk104_fifo_priv *priv, struct nvkm_engine *engine,
+                 struct gk104_fifo_chan *chan)
+{
+       u32 chid = chan->base.chid;
+       unsigned long flags;
+
+       nv_error(priv, "%s engine fault on channel %d, recovering...\n",
+                      nv_subdev(engine)->name, chid);
+
+       nv_mask(priv, 0x800004 + (chid * 0x08), 0x00000800, 0x00000800);
+       chan->state = KILLED;
+
+       spin_lock_irqsave(&priv->base.lock, flags);
+       priv->mask |= 1ULL << nv_engidx(engine);
+       spin_unlock_irqrestore(&priv->base.lock, flags);
+       schedule_work(&priv->fault);
+}
+
+static int
+gk104_fifo_swmthd(struct gk104_fifo_priv *priv, u32 chid, u32 mthd, u32 data)
+{
+       struct gk104_fifo_chan *chan = NULL;
+       struct nvkm_handle *bind;
+       unsigned long flags;
+       int ret = -EINVAL;
+
+       spin_lock_irqsave(&priv->base.lock, flags);
+       if (likely(chid >= priv->base.min && chid <= priv->base.max))
+               chan = (void *)priv->base.channel[chid];
+       if (unlikely(!chan))
+               goto out;
+
+       bind = nvkm_namedb_get_class(nv_namedb(chan), 0x906e);
+       if (likely(bind)) {
+               if (!mthd || !nv_call(bind->object, mthd, data))
+                       ret = 0;
+               nvkm_namedb_put(bind);
+       }
+
+out:
+       spin_unlock_irqrestore(&priv->base.lock, flags);
+       return ret;
+}
+
+static const struct nvkm_enum
+gk104_fifo_bind_reason[] = {
+       { 0x01, "BIND_NOT_UNBOUND" },
+       { 0x02, "SNOOP_WITHOUT_BAR1" },
+       { 0x03, "UNBIND_WHILE_RUNNING" },
+       { 0x05, "INVALID_RUNLIST" },
+       { 0x06, "INVALID_CTX_TGT" },
+       { 0x0b, "UNBIND_WHILE_PARKED" },
+       {}
+};
+
+static void
+gk104_fifo_intr_bind(struct gk104_fifo_priv *priv)
+{
+       u32 intr = nv_rd32(priv, 0x00252c);
+       u32 code = intr & 0x000000ff;
+       const struct nvkm_enum *en;
+       char enunk[6] = "";
+
+       en = nvkm_enum_find(gk104_fifo_bind_reason, code);
+       if (!en)
+               snprintf(enunk, sizeof(enunk), "UNK%02x", code);
+
+       nv_error(priv, "BIND_ERROR [ %s ]\n", en ? en->name : enunk);
+}
+
+static const struct nvkm_enum
+gk104_fifo_sched_reason[] = {
+       { 0x0a, "CTXSW_TIMEOUT" },
+       {}
+};
+
+static void
+gk104_fifo_intr_sched_ctxsw(struct gk104_fifo_priv *priv)
+{
+       struct nvkm_engine *engine;
+       struct gk104_fifo_chan *chan;
+       u32 engn;
+
+       for (engn = 0; engn < ARRAY_SIZE(fifo_engine); engn++) {
+               u32 stat = nv_rd32(priv, 0x002640 + (engn * 0x04));
+               u32 busy = (stat & 0x80000000);
+               u32 next = (stat & 0x07ff0000) >> 16;
+               u32 chsw = (stat & 0x00008000);
+               u32 save = (stat & 0x00004000);
+               u32 load = (stat & 0x00002000);
+               u32 prev = (stat & 0x000007ff);
+               u32 chid = load ? next : prev;
+               (void)save;
+
+               if (busy && chsw) {
+                       if (!(chan = (void *)priv->base.channel[chid]))
+                               continue;
+                       if (!(engine = gk104_fifo_engine(priv, engn)))
+                               continue;
+                       gk104_fifo_recover(priv, engine, chan);
+               }
+       }
+}
+
+static void
+gk104_fifo_intr_sched(struct gk104_fifo_priv *priv)
+{
+       u32 intr = nv_rd32(priv, 0x00254c);
+       u32 code = intr & 0x000000ff;
+       const struct nvkm_enum *en;
+       char enunk[6] = "";
+
+       en = nvkm_enum_find(gk104_fifo_sched_reason, code);
+       if (!en)
+               snprintf(enunk, sizeof(enunk), "UNK%02x", code);
+
+       nv_error(priv, "SCHED_ERROR [ %s ]\n", en ? en->name : enunk);
+
+       switch (code) {
+       case 0x0a:
+               gk104_fifo_intr_sched_ctxsw(priv);
+               break;
+       default:
+               break;
+       }
+}
+
+static void
+gk104_fifo_intr_chsw(struct gk104_fifo_priv *priv)
+{
+       u32 stat = nv_rd32(priv, 0x00256c);
+       nv_error(priv, "CHSW_ERROR 0x%08x\n", stat);
+       nv_wr32(priv, 0x00256c, stat);
+}
+
+static void
+gk104_fifo_intr_dropped_fault(struct gk104_fifo_priv *priv)
+{
+       u32 stat = nv_rd32(priv, 0x00259c);
+       nv_error(priv, "DROPPED_MMU_FAULT 0x%08x\n", stat);
+}
+
+static const struct nvkm_enum
+gk104_fifo_fault_engine[] = {
+       { 0x00, "GR", NULL, NVDEV_ENGINE_GR },
+       { 0x03, "IFB", NULL, NVDEV_ENGINE_IFB },
+       { 0x04, "BAR1", NULL, NVDEV_SUBDEV_BAR },
+       { 0x05, "BAR3", NULL, NVDEV_SUBDEV_INSTMEM },
+       { 0x07, "PBDMA0", NULL, NVDEV_ENGINE_FIFO },
+       { 0x08, "PBDMA1", NULL, NVDEV_ENGINE_FIFO },
+       { 0x09, "PBDMA2", NULL, NVDEV_ENGINE_FIFO },
+       { 0x10, "MSVLD", NULL, NVDEV_ENGINE_MSVLD },
+       { 0x11, "MSPPP", NULL, NVDEV_ENGINE_MSPPP },
+       { 0x13, "PERF" },
+       { 0x14, "MSPDEC", NULL, NVDEV_ENGINE_MSPDEC },
+       { 0x15, "CE0", NULL, NVDEV_ENGINE_CE0 },
+       { 0x16, "CE1", NULL, NVDEV_ENGINE_CE1 },
+       { 0x17, "PMU" },
+       { 0x19, "MSENC", NULL, NVDEV_ENGINE_MSENC },
+       { 0x1b, "CE2", NULL, NVDEV_ENGINE_CE2 },
+       {}
+};
+
+static const struct nvkm_enum
+gk104_fifo_fault_reason[] = {
+       { 0x00, "PDE" },
+       { 0x01, "PDE_SIZE" },
+       { 0x02, "PTE" },
+       { 0x03, "VA_LIMIT_VIOLATION" },
+       { 0x04, "UNBOUND_INST_BLOCK" },
+       { 0x05, "PRIV_VIOLATION" },
+       { 0x06, "RO_VIOLATION" },
+       { 0x07, "WO_VIOLATION" },
+       { 0x08, "PITCH_MASK_VIOLATION" },
+       { 0x09, "WORK_CREATION" },
+       { 0x0a, "UNSUPPORTED_APERTURE" },
+       { 0x0b, "COMPRESSION_FAILURE" },
+       { 0x0c, "UNSUPPORTED_KIND" },
+       { 0x0d, "REGION_VIOLATION" },
+       { 0x0e, "BOTH_PTES_VALID" },
+       { 0x0f, "INFO_TYPE_POISONED" },
+       {}
+};
+
+static const struct nvkm_enum
+gk104_fifo_fault_hubclient[] = {
+       { 0x00, "VIP" },
+       { 0x01, "CE0" },
+       { 0x02, "CE1" },
+       { 0x03, "DNISO" },
+       { 0x04, "FE" },
+       { 0x05, "FECS" },
+       { 0x06, "HOST" },
+       { 0x07, "HOST_CPU" },
+       { 0x08, "HOST_CPU_NB" },
+       { 0x09, "ISO" },
+       { 0x0a, "MMU" },
+       { 0x0b, "MSPDEC" },
+       { 0x0c, "MSPPP" },
+       { 0x0d, "MSVLD" },
+       { 0x0e, "NISO" },
+       { 0x0f, "P2P" },
+       { 0x10, "PD" },
+       { 0x11, "PERF" },
+       { 0x12, "PMU" },
+       { 0x13, "RASTERTWOD" },
+       { 0x14, "SCC" },
+       { 0x15, "SCC_NB" },
+       { 0x16, "SEC" },
+       { 0x17, "SSYNC" },
+       { 0x18, "GR_CE" },
+       { 0x19, "CE2" },
+       { 0x1a, "XV" },
+       { 0x1b, "MMU_NB" },
+       { 0x1c, "MSENC" },
+       { 0x1d, "DFALCON" },
+       { 0x1e, "SKED" },
+       { 0x1f, "AFALCON" },
+       {}
+};
+
+static const struct nvkm_enum
+gk104_fifo_fault_gpcclient[] = {
+       { 0x00, "L1_0" }, { 0x01, "T1_0" }, { 0x02, "PE_0" },
+       { 0x03, "L1_1" }, { 0x04, "T1_1" }, { 0x05, "PE_1" },
+       { 0x06, "L1_2" }, { 0x07, "T1_2" }, { 0x08, "PE_2" },
+       { 0x09, "L1_3" }, { 0x0a, "T1_3" }, { 0x0b, "PE_3" },
+       { 0x0c, "RAST" },
+       { 0x0d, "GCC" },
+       { 0x0e, "GPCCS" },
+       { 0x0f, "PROP_0" },
+       { 0x10, "PROP_1" },
+       { 0x11, "PROP_2" },
+       { 0x12, "PROP_3" },
+       { 0x13, "L1_4" }, { 0x14, "T1_4" }, { 0x15, "PE_4" },
+       { 0x16, "L1_5" }, { 0x17, "T1_5" }, { 0x18, "PE_5" },
+       { 0x19, "L1_6" }, { 0x1a, "T1_6" }, { 0x1b, "PE_6" },
+       { 0x1c, "L1_7" }, { 0x1d, "T1_7" }, { 0x1e, "PE_7" },
+       { 0x1f, "GPM" },
+       { 0x20, "LTP_UTLB_0" },
+       { 0x21, "LTP_UTLB_1" },
+       { 0x22, "LTP_UTLB_2" },
+       { 0x23, "LTP_UTLB_3" },
+       { 0x24, "GPC_RGG_UTLB" },
+       {}
+};
+
+static void
+gk104_fifo_intr_fault(struct gk104_fifo_priv *priv, int unit)
+{
+       u32 inst = nv_rd32(priv, 0x002800 + (unit * 0x10));
+       u32 valo = nv_rd32(priv, 0x002804 + (unit * 0x10));
+       u32 vahi = nv_rd32(priv, 0x002808 + (unit * 0x10));
+       u32 stat = nv_rd32(priv, 0x00280c + (unit * 0x10));
+       u32 gpc    = (stat & 0x1f000000) >> 24;
+       u32 client = (stat & 0x00001f00) >> 8;
+       u32 write  = (stat & 0x00000080);
+       u32 hub    = (stat & 0x00000040);
+       u32 reason = (stat & 0x0000000f);
+       struct nvkm_object *engctx = NULL, *object;
+       struct nvkm_engine *engine = NULL;
+       const struct nvkm_enum *er, *eu, *ec;
+       char erunk[6] = "";
+       char euunk[6] = "";
+       char ecunk[6] = "";
+       char gpcid[3] = "";
+
+       er = nvkm_enum_find(gk104_fifo_fault_reason, reason);
+       if (!er)
+               snprintf(erunk, sizeof(erunk), "UNK%02X", reason);
+
+       eu = nvkm_enum_find(gk104_fifo_fault_engine, unit);
+       if (eu) {
+               switch (eu->data2) {
+               case NVDEV_SUBDEV_BAR:
+                       nv_mask(priv, 0x001704, 0x00000000, 0x00000000);
+                       break;
+               case NVDEV_SUBDEV_INSTMEM:
+                       nv_mask(priv, 0x001714, 0x00000000, 0x00000000);
+                       break;
+               case NVDEV_ENGINE_IFB:
+                       nv_mask(priv, 0x001718, 0x00000000, 0x00000000);
+                       break;
+               default:
+                       engine = nvkm_engine(priv, eu->data2);
+                       if (engine)
+                               engctx = nvkm_engctx_get(engine, inst);
+                       break;
+               }
+       } else {
+               snprintf(euunk, sizeof(euunk), "UNK%02x", unit);
+       }
+
+       if (hub) {
+               ec = nvkm_enum_find(gk104_fifo_fault_hubclient, client);
+       } else {
+               ec = nvkm_enum_find(gk104_fifo_fault_gpcclient, client);
+               snprintf(gpcid, sizeof(gpcid), "%d", gpc);
+       }
+
+       if (!ec)
+               snprintf(ecunk, sizeof(ecunk), "UNK%02x", client);
+
+       nv_error(priv, "%s fault at 0x%010llx [%s] from %s/%s%s%s%s on "
+                      "channel 0x%010llx [%s]\n", write ? "write" : "read",
+                (u64)vahi << 32 | valo, er ? er->name : erunk,
+                eu ? eu->name : euunk, hub ? "" : "GPC", gpcid, hub ? "" : "/",
+                ec ? ec->name : ecunk, (u64)inst << 12,
+                nvkm_client_name(engctx));
+
+       object = engctx;
+       while (object) {
+               switch (nv_mclass(object)) {
+               case KEPLER_CHANNEL_GPFIFO_A:
+                       gk104_fifo_recover(priv, engine, (void *)object);
+                       break;
+               }
+               object = object->parent;
+       }
+
+       nvkm_engctx_put(engctx);
+}
+
+static const struct nvkm_bitfield gk104_fifo_pbdma_intr_0[] = {
+       { 0x00000001, "MEMREQ" },
+       { 0x00000002, "MEMACK_TIMEOUT" },
+       { 0x00000004, "MEMACK_EXTRA" },
+       { 0x00000008, "MEMDAT_TIMEOUT" },
+       { 0x00000010, "MEMDAT_EXTRA" },
+       { 0x00000020, "MEMFLUSH" },
+       { 0x00000040, "MEMOP" },
+       { 0x00000080, "LBCONNECT" },
+       { 0x00000100, "LBREQ" },
+       { 0x00000200, "LBACK_TIMEOUT" },
+       { 0x00000400, "LBACK_EXTRA" },
+       { 0x00000800, "LBDAT_TIMEOUT" },
+       { 0x00001000, "LBDAT_EXTRA" },
+       { 0x00002000, "GPFIFO" },
+       { 0x00004000, "GPPTR" },
+       { 0x00008000, "GPENTRY" },
+       { 0x00010000, "GPCRC" },
+       { 0x00020000, "PBPTR" },
+       { 0x00040000, "PBENTRY" },
+       { 0x00080000, "PBCRC" },
+       { 0x00100000, "XBARCONNECT" },
+       { 0x00200000, "METHOD" },
+       { 0x00400000, "METHODCRC" },
+       { 0x00800000, "DEVICE" },
+       { 0x02000000, "SEMAPHORE" },
+       { 0x04000000, "ACQUIRE" },
+       { 0x08000000, "PRI" },
+       { 0x20000000, "NO_CTXSW_SEG" },
+       { 0x40000000, "PBSEG" },
+       { 0x80000000, "SIGNATURE" },
+       {}
+};
+
+static void
+gk104_fifo_intr_pbdma_0(struct gk104_fifo_priv *priv, int unit)
+{
+       u32 mask = nv_rd32(priv, 0x04010c + (unit * 0x2000));
+       u32 stat = nv_rd32(priv, 0x040108 + (unit * 0x2000)) & mask;
+       u32 addr = nv_rd32(priv, 0x0400c0 + (unit * 0x2000));
+       u32 data = nv_rd32(priv, 0x0400c4 + (unit * 0x2000));
+       u32 chid = nv_rd32(priv, 0x040120 + (unit * 0x2000)) & 0xfff;
+       u32 subc = (addr & 0x00070000) >> 16;
+       u32 mthd = (addr & 0x00003ffc);
+       u32 show = stat;
+
+       if (stat & 0x00800000) {
+               if (!gk104_fifo_swmthd(priv, chid, mthd, data))
+                       show &= ~0x00800000;
+               nv_wr32(priv, 0x0400c0 + (unit * 0x2000), 0x80600008);
+       }
+
+       if (show) {
+               nv_error(priv, "PBDMA%d:", unit);
+               nvkm_bitfield_print(gk104_fifo_pbdma_intr_0, show);
+               pr_cont("\n");
+               nv_error(priv,
+                        "PBDMA%d: ch %d [%s] subc %d mthd 0x%04x data 0x%08x\n",
+                        unit, chid,
+                        nvkm_client_name_for_fifo_chid(&priv->base, chid),
+                        subc, mthd, data);
+       }
+
+       nv_wr32(priv, 0x040108 + (unit * 0x2000), stat);
+}
+
+static const struct nvkm_bitfield gk104_fifo_pbdma_intr_1[] = {
+       { 0x00000001, "HCE_RE_ILLEGAL_OP" },
+       { 0x00000002, "HCE_RE_ALIGNB" },
+       { 0x00000004, "HCE_PRIV" },
+       { 0x00000008, "HCE_ILLEGAL_MTHD" },
+       { 0x00000010, "HCE_ILLEGAL_CLASS" },
+       {}
+};
+
+static void
+gk104_fifo_intr_pbdma_1(struct gk104_fifo_priv *priv, int unit)
+{
+       u32 mask = nv_rd32(priv, 0x04014c + (unit * 0x2000));
+       u32 stat = nv_rd32(priv, 0x040148 + (unit * 0x2000)) & mask;
+       u32 chid = nv_rd32(priv, 0x040120 + (unit * 0x2000)) & 0xfff;
+
+       if (stat) {
+               nv_error(priv, "PBDMA%d:", unit);
+               nvkm_bitfield_print(gk104_fifo_pbdma_intr_1, stat);
+               pr_cont("\n");
+               nv_error(priv, "PBDMA%d: ch %d %08x %08x\n", unit, chid,
+                        nv_rd32(priv, 0x040150 + (unit * 0x2000)),
+                        nv_rd32(priv, 0x040154 + (unit * 0x2000)));
+       }
+
+       nv_wr32(priv, 0x040148 + (unit * 0x2000), stat);
+}
+
+static void
+gk104_fifo_intr_runlist(struct gk104_fifo_priv *priv)
+{
+       u32 mask = nv_rd32(priv, 0x002a00);
+       while (mask) {
+               u32 engn = __ffs(mask);
+               wake_up(&priv->engine[engn].wait);
+               nv_wr32(priv, 0x002a00, 1 << engn);
+               mask &= ~(1 << engn);
+       }
+}
+
+static void
+gk104_fifo_intr_engine(struct gk104_fifo_priv *priv)
+{
+       nvkm_fifo_uevent(&priv->base);
+}
+
+static void
+gk104_fifo_intr(struct nvkm_subdev *subdev)
+{
+       struct gk104_fifo_priv *priv = (void *)subdev;
+       u32 mask = nv_rd32(priv, 0x002140);
+       u32 stat = nv_rd32(priv, 0x002100) & mask;
+
+       if (stat & 0x00000001) {
+               gk104_fifo_intr_bind(priv);
+               nv_wr32(priv, 0x002100, 0x00000001);
+               stat &= ~0x00000001;
+       }
+
+       if (stat & 0x00000010) {
+               nv_error(priv, "PIO_ERROR\n");
+               nv_wr32(priv, 0x002100, 0x00000010);
+               stat &= ~0x00000010;
+       }
+
+       if (stat & 0x00000100) {
+               gk104_fifo_intr_sched(priv);
+               nv_wr32(priv, 0x002100, 0x00000100);
+               stat &= ~0x00000100;
+       }
+
+       if (stat & 0x00010000) {
+               gk104_fifo_intr_chsw(priv);
+               nv_wr32(priv, 0x002100, 0x00010000);
+               stat &= ~0x00010000;
+       }
+
+       if (stat & 0x00800000) {
+               nv_error(priv, "FB_FLUSH_TIMEOUT\n");
+               nv_wr32(priv, 0x002100, 0x00800000);
+               stat &= ~0x00800000;
+       }
+
+       if (stat & 0x01000000) {
+               nv_error(priv, "LB_ERROR\n");
+               nv_wr32(priv, 0x002100, 0x01000000);
+               stat &= ~0x01000000;
+       }
+
+       if (stat & 0x08000000) {
+               gk104_fifo_intr_dropped_fault(priv);
+               nv_wr32(priv, 0x002100, 0x08000000);
+               stat &= ~0x08000000;
+       }
+
+       if (stat & 0x10000000) {
+               u32 mask = nv_rd32(priv, 0x00259c);
+               while (mask) {
+                       u32 unit = __ffs(mask);
+                       gk104_fifo_intr_fault(priv, unit);
+                       nv_wr32(priv, 0x00259c, (1 << unit));
+                       mask &= ~(1 << unit);
+               }
+               stat &= ~0x10000000;
+       }
+
+       if (stat & 0x20000000) {
+               u32 mask = nv_rd32(priv, 0x0025a0);
+               while (mask) {
+                       u32 unit = __ffs(mask);
+                       gk104_fifo_intr_pbdma_0(priv, unit);
+                       gk104_fifo_intr_pbdma_1(priv, unit);
+                       nv_wr32(priv, 0x0025a0, (1 << unit));
+                       mask &= ~(1 << unit);
+               }
+               stat &= ~0x20000000;
+       }
+
+       if (stat & 0x40000000) {
+               gk104_fifo_intr_runlist(priv);
+               stat &= ~0x40000000;
+       }
+
+       if (stat & 0x80000000) {
+               nv_wr32(priv, 0x002100, 0x80000000);
+               gk104_fifo_intr_engine(priv);
+               stat &= ~0x80000000;
+       }
+
+       if (stat) {
+               nv_error(priv, "INTR 0x%08x\n", stat);
+               nv_mask(priv, 0x002140, stat, 0x00000000);
+               nv_wr32(priv, 0x002100, stat);
+       }
+}
+
+static void
+gk104_fifo_uevent_init(struct nvkm_event *event, int type, int index)
+{
+       struct nvkm_fifo *fifo = container_of(event, typeof(*fifo), uevent);
+       nv_mask(fifo, 0x002140, 0x80000000, 0x80000000);
+}
+
+static void
+gk104_fifo_uevent_fini(struct nvkm_event *event, int type, int index)
+{
+       struct nvkm_fifo *fifo = container_of(event, typeof(*fifo), uevent);
+       nv_mask(fifo, 0x002140, 0x80000000, 0x00000000);
+}
+
+static const struct nvkm_event_func
+gk104_fifo_uevent_func = {
+       .ctor = nvkm_fifo_uevent_ctor,
+       .init = gk104_fifo_uevent_init,
+       .fini = gk104_fifo_uevent_fini,
+};
+
+int
+gk104_fifo_fini(struct nvkm_object *object, bool suspend)
+{
+       struct gk104_fifo_priv *priv = (void *)object;
+       int ret;
+
+       ret = nvkm_fifo_fini(&priv->base, suspend);
+       if (ret)
+               return ret;
+
+       /* allow mmu fault interrupts, even when we're not using fifo */
+       nv_mask(priv, 0x002140, 0x10000000, 0x10000000);
+       return 0;
+}
+
+int
+gk104_fifo_init(struct nvkm_object *object)
+{
+       struct gk104_fifo_priv *priv = (void *)object;
+       int ret, i;
+
+       ret = nvkm_fifo_init(&priv->base);
+       if (ret)
+               return ret;
+
+       /* enable all available PBDMA units */
+       nv_wr32(priv, 0x000204, 0xffffffff);
+       priv->spoon_nr = hweight32(nv_rd32(priv, 0x000204));
+       nv_debug(priv, "%d PBDMA unit(s)\n", priv->spoon_nr);
+
+       /* PBDMA[n] */
+       for (i = 0; i < priv->spoon_nr; i++) {
+               nv_mask(priv, 0x04013c + (i * 0x2000), 0x10000100, 0x00000000);
+               nv_wr32(priv, 0x040108 + (i * 0x2000), 0xffffffff); /* INTR */
+               nv_wr32(priv, 0x04010c + (i * 0x2000), 0xfffffeff); /* INTREN */
+       }
+
+       /* PBDMA[n].HCE */
+       for (i = 0; i < priv->spoon_nr; i++) {
+               nv_wr32(priv, 0x040148 + (i * 0x2000), 0xffffffff); /* INTR */
+               nv_wr32(priv, 0x04014c + (i * 0x2000), 0xffffffff); /* INTREN */
+       }
+
+       nv_wr32(priv, 0x002254, 0x10000000 | priv->user.bar.offset >> 12);
+
+       nv_wr32(priv, 0x002100, 0xffffffff);
+       nv_wr32(priv, 0x002140, 0x7fffffff);
+       return 0;
+}
+
+void
+gk104_fifo_dtor(struct nvkm_object *object)
+{
+       struct gk104_fifo_priv *priv = (void *)object;
+       int i;
+
+       nvkm_gpuobj_unmap(&priv->user.bar);
+       nvkm_gpuobj_ref(NULL, &priv->user.mem);
+
+       for (i = 0; i < FIFO_ENGINE_NR; i++) {
+               nvkm_gpuobj_ref(NULL, &priv->engine[i].runlist[1]);
+               nvkm_gpuobj_ref(NULL, &priv->engine[i].runlist[0]);
+       }
+
+       nvkm_fifo_destroy(&priv->base);
+}
+
+int
+gk104_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+               struct nvkm_oclass *oclass, void *data, u32 size,
+               struct nvkm_object **pobject)
+{
+       struct gk104_fifo_impl *impl = (void *)oclass;
+       struct gk104_fifo_priv *priv;
+       int ret, i;
+
+       ret = nvkm_fifo_create(parent, engine, oclass, 0,
+                              impl->channels - 1, &priv);
+       *pobject = nv_object(priv);
+       if (ret)
+               return ret;
+
+       INIT_WORK(&priv->fault, gk104_fifo_recover_work);
+
+       for (i = 0; i < FIFO_ENGINE_NR; i++) {
+               ret = nvkm_gpuobj_new(nv_object(priv), NULL, 0x8000, 0x1000,
+                                     0, &priv->engine[i].runlist[0]);
+               if (ret)
+                       return ret;
+
+               ret = nvkm_gpuobj_new(nv_object(priv), NULL, 0x8000, 0x1000,
+                                     0, &priv->engine[i].runlist[1]);
+               if (ret)
+                       return ret;
+
+               init_waitqueue_head(&priv->engine[i].wait);
+       }
+
+       ret = nvkm_gpuobj_new(nv_object(priv), NULL, impl->channels * 0x200,
+                             0x1000, NVOBJ_FLAG_ZERO_ALLOC, &priv->user.mem);
+       if (ret)
+               return ret;
+
+       ret = nvkm_gpuobj_map(priv->user.mem, NV_MEM_ACCESS_RW,
+                             &priv->user.bar);
+       if (ret)
+               return ret;
+
+       ret = nvkm_event_init(&gk104_fifo_uevent_func, 1, 1, &priv->base.uevent);
+       if (ret)
+               return ret;
+
+       nv_subdev(priv)->unit = 0x00000100;
+       nv_subdev(priv)->intr = gk104_fifo_intr;
+       nv_engine(priv)->cclass = &gk104_fifo_cclass;
+       nv_engine(priv)->sclass = gk104_fifo_sclass;
+       return 0;
+}
+
+struct nvkm_oclass *
+gk104_fifo_oclass = &(struct gk104_fifo_impl) {
+       .base.handle = NV_ENGINE(FIFO, 0xe0),
+       .base.ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = gk104_fifo_ctor,
+               .dtor = gk104_fifo_dtor,
+               .init = gk104_fifo_init,
+               .fini = gk104_fifo_fini,
+       },
+       .channels = 4096,
+}.base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h
new file mode 100644 (file)
index 0000000..3046e00
--- /dev/null
@@ -0,0 +1,16 @@
+#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;
+};
+#endif
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk208.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk208.c
new file mode 100644 (file)
index 0000000..9270922
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs
+ */
+#include "gk104.h"
+
+struct nvkm_oclass *
+gk208_fifo_oclass = &(struct gk104_fifo_impl) {
+       .base.handle = NV_ENGINE(FIFO, 0x08),
+       .base.ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = gk104_fifo_ctor,
+               .dtor = gk104_fifo_dtor,
+               .init = gk104_fifo_init,
+               .fini = _nvkm_fifo_fini,
+       },
+       .channels = 1024,
+}.base;
index 327456eae963cfbadccb145a78775aaa4fc2b19b..b30dc87a1357c6bda79ba3a4b98c3bb5405197b0 100644 (file)
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+#include "gk104.h"
 
-#include "nve0.h"
-
-struct nouveau_oclass *
-gk20a_fifo_oclass = &(struct nve0_fifo_impl) {
+struct nvkm_oclass *
+gk20a_fifo_oclass = &(struct gk104_fifo_impl) {
        .base.handle = NV_ENGINE(FIFO, 0xea),
-       .base.ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nve0_fifo_ctor,
-               .dtor = nve0_fifo_dtor,
-               .init = nve0_fifo_init,
-               .fini = nve0_fifo_fini,
+       .base.ofuncs = &(struct nvkm_ofuncs) {
+               .ctor = gk104_fifo_ctor,
+               .dtor = gk104_fifo_dtor,
+               .init = gk104_fifo_init,
+               .fini = gk104_fifo_fini,
        },
        .channels = 128,
 }.base;
index 1b384bd5994e4ed69e96273a6d0157cb14d643c9..b038b6eb51db2f3104dea58562d14913f4c794ed 100644 (file)
  *
  * Authors: Ben Skeggs
  */
+#include "nv04.h"
 
 #include <core/client.h>
 #include <core/device.h>
-#include <nvif/unpack.h>
-#include <nvif/class.h>
 #include <core/engctx.h>
-#include <core/namedb.h>
 #include <core/handle.h>
 #include <core/ramht.h>
-#include <core/event.h>
-
-#include <subdev/instmem.h>
 #include <subdev/instmem/nv04.h>
 #include <subdev/timer.h>
-#include <subdev/fb.h>
 
-#include <engine/fifo.h>
-
-#include "nv04.h"
+#include <nvif/class.h>
+#include <nvif/unpack.h>
 
 static struct ramfc_desc
 nv04_ramfc[] = {
@@ -59,8 +52,8 @@ nv04_ramfc[] = {
  ******************************************************************************/
 
 int
-nv04_fifo_object_attach(struct nouveau_object *parent,
-                       struct nouveau_object *object, u32 handle)
+nv04_fifo_object_attach(struct nvkm_object *parent,
+                       struct nvkm_object *object, u32 handle)
 {
        struct nv04_fifo_priv *priv = (void *)parent->engine;
        struct nv04_fifo_chan *chan = (void *)parent;
@@ -91,33 +84,33 @@ nv04_fifo_object_attach(struct nouveau_object *parent,
        context |= chid << 24;
 
        mutex_lock(&nv_subdev(priv)->mutex);
-       ret = nouveau_ramht_insert(priv->ramht, chid, handle, context);
+       ret = nvkm_ramht_insert(priv->ramht, chid, handle, context);
        mutex_unlock(&nv_subdev(priv)->mutex);
        return ret;
 }
 
 void
-nv04_fifo_object_detach(struct nouveau_object *parent, int cookie)
+nv04_fifo_object_detach(struct nvkm_object *parent, int cookie)
 {
        struct nv04_fifo_priv *priv = (void *)parent->engine;
        mutex_lock(&nv_subdev(priv)->mutex);
-       nouveau_ramht_remove(priv->ramht, cookie);
+       nvkm_ramht_remove(priv->ramht, cookie);
        mutex_unlock(&nv_subdev(priv)->mutex);
 }
 
 int
-nv04_fifo_context_attach(struct nouveau_object *parent,
-                        struct nouveau_object *object)
+nv04_fifo_context_attach(struct nvkm_object *parent,
+                        struct nvkm_object *object)
 {
-       nv_engctx(object)->addr = nouveau_fifo_chan(parent)->chid;
+       nv_engctx(object)->addr = nvkm_fifo_chan(parent)->chid;
        return 0;
 }
 
 static int
-nv04_fifo_chan_ctor(struct nouveau_object *parent,
-                   struct nouveau_object *engine,
-                   struct nouveau_oclass *oclass, void *data, u32 size,
-                   struct nouveau_object **pobject)
+nv04_fifo_chan_ctor(struct nvkm_object *parent,
+                   struct nvkm_object *engine,
+                   struct nvkm_oclass *oclass, void *data, u32 size,
+                   struct nvkm_object **pobject)
 {
        union {
                struct nv03_channel_dma_v0 v0;
@@ -134,11 +127,11 @@ nv04_fifo_chan_ctor(struct nouveau_object *parent,
        } else
                return ret;
 
-       ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0x800000,
-                                         0x10000, args->v0.pushbuf,
-                                         (1ULL << NVDEV_ENGINE_DMAOBJ) |
-                                         (1ULL << NVDEV_ENGINE_SW) |
-                                         (1ULL << NVDEV_ENGINE_GR), &chan);
+       ret = nvkm_fifo_channel_create(parent, engine, oclass, 0, 0x800000,
+                                      0x10000, args->v0.pushbuf,
+                                      (1ULL << NVDEV_ENGINE_DMAOBJ) |
+                                      (1ULL << NVDEV_ENGINE_SW) |
+                                      (1ULL << NVDEV_ENGINE_GR), &chan);
        *pobject = nv_object(chan);
        if (ret)
                return ret;
@@ -164,7 +157,7 @@ nv04_fifo_chan_ctor(struct nouveau_object *parent,
 }
 
 void
-nv04_fifo_chan_dtor(struct nouveau_object *object)
+nv04_fifo_chan_dtor(struct nvkm_object *object)
 {
        struct nv04_fifo_priv *priv = (void *)object->engine;
        struct nv04_fifo_chan *chan = (void *)object;
@@ -174,11 +167,11 @@ nv04_fifo_chan_dtor(struct nouveau_object *object)
                nv_wo32(priv->ramfc, chan->ramfc + c->ctxp, 0x00000000);
        } while ((++c)->bits);
 
-       nouveau_fifo_channel_destroy(&chan->base);
+       nvkm_fifo_channel_destroy(&chan->base);
 }
 
 int
-nv04_fifo_chan_init(struct nouveau_object *object)
+nv04_fifo_chan_init(struct nvkm_object *object)
 {
        struct nv04_fifo_priv *priv = (void *)object->engine;
        struct nv04_fifo_chan *chan = (void *)object;
@@ -186,7 +179,7 @@ nv04_fifo_chan_init(struct nouveau_object *object)
        unsigned long flags;
        int ret;
 
-       ret = nouveau_fifo_channel_init(&chan->base);
+       ret = nvkm_fifo_channel_init(&chan->base);
        if (ret)
                return ret;
 
@@ -197,11 +190,11 @@ nv04_fifo_chan_init(struct nouveau_object *object)
 }
 
 int
-nv04_fifo_chan_fini(struct nouveau_object *object, bool suspend)
+nv04_fifo_chan_fini(struct nvkm_object *object, bool suspend)
 {
        struct nv04_fifo_priv *priv = (void *)object->engine;
        struct nv04_fifo_chan *chan = (void *)object;
-       struct nouveau_gpuobj *fctx = priv->ramfc;
+       struct nvkm_gpuobj *fctx = priv->ramfc;
        struct ramfc_desc *c;
        unsigned long flags;
        u32 data = chan->ramfc;
@@ -244,22 +237,22 @@ nv04_fifo_chan_fini(struct nouveau_object *object, bool suspend)
        nv_wr32(priv, NV03_PFIFO_CACHES, 1);
        spin_unlock_irqrestore(&priv->base.lock, flags);
 
-       return nouveau_fifo_channel_fini(&chan->base, suspend);
+       return nvkm_fifo_channel_fini(&chan->base, suspend);
 }
 
-static struct nouveau_ofuncs
+static struct nvkm_ofuncs
 nv04_fifo_ofuncs = {
        .ctor = nv04_fifo_chan_ctor,
        .dtor = nv04_fifo_chan_dtor,
        .init = nv04_fifo_chan_init,
        .fini = nv04_fifo_chan_fini,
-       .map  = _nouveau_fifo_channel_map,
-       .rd32 = _nouveau_fifo_channel_rd32,
-       .wr32 = _nouveau_fifo_channel_wr32,
-       .ntfy = _nouveau_fifo_channel_ntfy
+       .map  = _nvkm_fifo_channel_map,
+       .rd32 = _nvkm_fifo_channel_rd32,
+       .wr32 = _nvkm_fifo_channel_wr32,
+       .ntfy = _nvkm_fifo_channel_ntfy
 };
 
-static struct nouveau_oclass
+static struct nvkm_oclass
 nv04_fifo_sclass[] = {
        { NV03_CHANNEL_DMA, &nv04_fifo_ofuncs },
        {}
@@ -270,16 +263,16 @@ nv04_fifo_sclass[] = {
  ******************************************************************************/
 
 int
-nv04_fifo_context_ctor(struct nouveau_object *parent,
-                      struct nouveau_object *engine,
-                      struct nouveau_oclass *oclass, void *data, u32 size,
-                      struct nouveau_object **pobject)
+nv04_fifo_context_ctor(struct nvkm_object *parent,
+                      struct nvkm_object *engine,
+                      struct nvkm_oclass *oclass, void *data, u32 size,
+                      struct nvkm_object **pobject)
 {
        struct nv04_fifo_base *base;
        int ret;
 
-       ret = nouveau_fifo_context_create(parent, engine, oclass, NULL, 0x1000,
-                                         0x1000, NVOBJ_FLAG_HEAP, &base);
+       ret = nvkm_fifo_context_create(parent, engine, oclass, NULL, 0x1000,
+                                      0x1000, NVOBJ_FLAG_HEAP, &base);
        *pobject = nv_object(base);
        if (ret)
                return ret;
@@ -287,16 +280,16 @@ nv04_fifo_context_ctor(struct nouveau_object *parent,
        return 0;
 }
 
-static struct nouveau_oclass
+static struct nvkm_oclass
 nv04_fifo_cclass = {
        .handle = NV_ENGCTX(FIFO, 0x04),
-       .ofuncs = &(struct nouveau_ofuncs) {
+       .ofuncs = &(struct nvkm_ofuncs) {
                .ctor = nv04_fifo_context_ctor,
-               .dtor = _nouveau_fifo_context_dtor,
-               .init = _nouveau_fifo_context_init,
-               .fini = _nouveau_fifo_context_fini,
-               .rd32 = _nouveau_fifo_context_rd32,
-               .wr32 = _nouveau_fifo_context_wr32,
+               .dtor = _nvkm_fifo_context_dtor,
+               .init = _nvkm_fifo_context_init,
+               .fini = _nvkm_fifo_context_fini,
+               .rd32 = _nvkm_fifo_context_rd32,
+               .wr32 = _nvkm_fifo_context_wr32,
        },
 };
 
@@ -305,7 +298,7 @@ nv04_fifo_cclass = {
  ******************************************************************************/
 
 void
-nv04_fifo_pause(struct nouveau_fifo *pfifo, unsigned long *pflags)
+nv04_fifo_pause(struct nvkm_fifo *pfifo, unsigned long *pflags)
 __acquires(priv->base.lock)
 {
        struct nv04_fifo_priv *priv = (void *)pfifo;
@@ -338,7 +331,7 @@ __acquires(priv->base.lock)
 }
 
 void
-nv04_fifo_start(struct nouveau_fifo *pfifo, unsigned long *pflags)
+nv04_fifo_start(struct nvkm_fifo *pfifo, unsigned long *pflags)
 __releases(priv->base.lock)
 {
        struct nv04_fifo_priv *priv = (void *)pfifo;
@@ -364,7 +357,7 @@ static bool
 nv04_fifo_swmthd(struct nv04_fifo_priv *priv, u32 chid, u32 addr, u32 data)
 {
        struct nv04_fifo_chan *chan = NULL;
-       struct nouveau_handle *bind;
+       struct nvkm_handle *bind;
        const int subc = (addr >> 13) & 0x7;
        const int mthd = addr & 0x1ffc;
        bool handled = false;
@@ -379,7 +372,7 @@ nv04_fifo_swmthd(struct nv04_fifo_priv *priv, u32 chid, u32 addr, u32 data)
 
        switch (mthd) {
        case 0x0000:
-               bind = nouveau_namedb_get(nv_namedb(chan), data);
+               bind = nvkm_namedb_get(nv_namedb(chan), data);
                if (unlikely(!bind))
                        break;
 
@@ -391,18 +384,18 @@ nv04_fifo_swmthd(struct nv04_fifo_priv *priv, u32 chid, u32 addr, u32 data)
                        nv_mask(priv, NV04_PFIFO_CACHE1_ENGINE, engine, 0);
                }
 
-               nouveau_namedb_put(bind);
+               nvkm_namedb_put(bind);
                break;
        default:
                engine = nv_rd32(priv, NV04_PFIFO_CACHE1_ENGINE);
                if (unlikely(((engine >> (subc * 4)) & 0xf) != 0))
                        break;
 
-               bind = nouveau_namedb_get(nv_namedb(chan), chan->subc[subc]);
+               bind = nvkm_namedb_get(nv_namedb(chan), chan->subc[subc]);
                if (likely(bind)) {
                        if (!nv_call(bind->object, mthd, data))
                                handled = true;
-                       nouveau_namedb_put(bind);
+                       nvkm_namedb_put(bind);
                }
                break;
        }
@@ -413,8 +406,8 @@ out:
 }
 
 static void
-nv04_fifo_cache_error(struct nouveau_device *device,
-               struct nv04_fifo_priv *priv, u32 chid, u32 get)
+nv04_fifo_cache_error(struct nvkm_device *device,
+                     struct nv04_fifo_priv *priv, u32 chid, u32 get)
 {
        u32 mthd, data;
        int ptr;
@@ -436,7 +429,7 @@ nv04_fifo_cache_error(struct nouveau_device *device,
 
        if (!nv04_fifo_swmthd(priv, chid, mthd, data)) {
                const char *client_name =
-                       nouveau_client_name_for_fifo_chid(&priv->base, chid);
+                       nvkm_client_name_for_fifo_chid(&priv->base, chid);
                nv_error(priv,
                         "CACHE_ERROR - ch %d [%s] subc %d mthd 0x%04x data 0x%08x\n",
                         chid, client_name, (mthd >> 13) & 7, mthd & 0x1ffc,
@@ -459,8 +452,8 @@ nv04_fifo_cache_error(struct nouveau_device *device,
 }
 
 static void
-nv04_fifo_dma_pusher(struct nouveau_device *device, struct nv04_fifo_priv *priv,
-               u32 chid)
+nv04_fifo_dma_pusher(struct nvkm_device *device,
+                    struct nv04_fifo_priv *priv, u32 chid)
 {
        const char *client_name;
        u32 dma_get = nv_rd32(priv, 0x003244);
@@ -468,7 +461,7 @@ nv04_fifo_dma_pusher(struct nouveau_device *device, struct nv04_fifo_priv *priv,
        u32 push = nv_rd32(priv, 0x003220);
        u32 state = nv_rd32(priv, 0x003228);
 
-       client_name = nouveau_client_name_for_fifo_chid(&priv->base, chid);
+       client_name = nvkm_client_name_for_fifo_chid(&priv->base, chid);
 
        if (device->card_type == NV_50) {
                u32 ho_get = nv_rd32(priv, 0x003328);
@@ -505,9 +498,9 @@ nv04_fifo_dma_pusher(struct nouveau_device *device, struct nv04_fifo_priv *priv,
 }
 
 void
-nv04_fifo_intr(struct nouveau_subdev *subdev)
+nv04_fifo_intr(struct nvkm_subdev *subdev)
 {
-       struct nouveau_device *device = nv_device(subdev);
+       struct nvkm_device *device = nv_device(subdev);
        struct nv04_fifo_priv *priv = (void *)subdev;
        uint32_t status, reassign;
        int cnt = 0;
@@ -553,7 +546,7 @@ nv04_fifo_intr(struct nouveau_subdev *subdev)
 
                        if (status & 0x40000000) {
                                nv_wr32(priv, 0x002100, 0x40000000);
-                               nouveau_fifo_uevent(&priv->base);
+                               nvkm_fifo_uevent(&priv->base);
                                status &= ~0x40000000;
                        }
                }
@@ -578,22 +571,22 @@ nv04_fifo_intr(struct nouveau_subdev *subdev)
 }
 
 static int
-nv04_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
-              struct nouveau_oclass *oclass, void *data, u32 size,
-              struct nouveau_object **pobject)
+nv04_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+              struct nvkm_oclass *oclass, void *data, u32 size,
+              struct nvkm_object **pobject)
 {
        struct nv04_instmem_priv *imem = nv04_instmem(parent);
        struct nv04_fifo_priv *priv;
        int ret;
 
-       ret = nouveau_fifo_create(parent, engine, oclass, 0, 15, &priv);
+       ret = nvkm_fifo_create(parent, engine, oclass, 0, 15, &priv);
        *pobject = nv_object(priv);
        if (ret)
                return ret;
 
-       nouveau_ramht_ref(imem->ramht, &priv->ramht);
-       nouveau_gpuobj_ref(imem->ramro, &priv->ramro);
-       nouveau_gpuobj_ref(imem->ramfc, &priv->ramfc);
+       nvkm_ramht_ref(imem->ramht, &priv->ramht);
+       nvkm_gpuobj_ref(imem->ramro, &priv->ramro);
+       nvkm_gpuobj_ref(imem->ramfc, &priv->ramfc);
 
        nv_subdev(priv)->unit = 0x00000100;
        nv_subdev(priv)->intr = nv04_fifo_intr;
@@ -606,22 +599,22 @@ nv04_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
 }
 
 void
-nv04_fifo_dtor(struct nouveau_object *object)
+nv04_fifo_dtor(struct nvkm_object *object)
 {
        struct nv04_fifo_priv *priv = (void *)object;
-       nouveau_gpuobj_ref(NULL, &priv->ramfc);
-       nouveau_gpuobj_ref(NULL, &priv->ramro);
-       nouveau_ramht_ref(NULL, &priv->ramht);
-       nouveau_fifo_destroy(&priv->base);
+       nvkm_gpuobj_ref(NULL, &priv->ramfc);
+       nvkm_gpuobj_ref(NULL, &priv->ramro);
+       nvkm_ramht_ref(NULL, &priv->ramht);
+       nvkm_fifo_destroy(&priv->base);
 }
 
 int
-nv04_fifo_init(struct nouveau_object *object)
+nv04_fifo_init(struct nvkm_object *object)
 {
        struct nv04_fifo_priv *priv = (void *)object;
        int ret;
 
-       ret = nouveau_fifo_init(&priv->base);
+       ret = nvkm_fifo_init(&priv->base);
        if (ret)
                return ret;
 
@@ -645,13 +638,13 @@ nv04_fifo_init(struct nouveau_object *object)
        return 0;
 }
 
-struct nouveau_oclass *
-nv04_fifo_oclass = &(struct nouveau_oclass) {
+struct nvkm_oclass *
+nv04_fifo_oclass = &(struct nvkm_oclass) {
        .handle = NV_ENGINE(FIFO, 0x04),
-       .ofuncs = &(struct nouveau_ofuncs) {
+       .ofuncs = &(struct nvkm_ofuncs) {
                .ctor = nv04_fifo_ctor,
                .dtor = nv04_fifo_dtor,
                .init = nv04_fifo_init,
-               .fini = _nouveau_fifo_fini,
+               .fini = _nvkm_fifo_fini,
        },
 };
index 496a4b4fdfafa07e4df261d2d23326aa2d817541..e0e0c47cb4ca64d20a4751ca002ef6f1790422c3 100644 (file)
@@ -1,6 +1,5 @@
 #ifndef __NV04_FIFO_H__
 #define __NV04_FIFO_H__
-
 #include <engine/fifo.h>
 
 #define NV04_PFIFO_DELAY_0                                 0x00002040
@@ -141,38 +140,36 @@ struct ramfc_desc {
 };
 
 struct nv04_fifo_priv {
-       struct nouveau_fifo base;
+       struct nvkm_fifo base;
        struct ramfc_desc *ramfc_desc;
-       struct nouveau_ramht  *ramht;
-       struct nouveau_gpuobj *ramro;
-       struct nouveau_gpuobj *ramfc;
+       struct nvkm_ramht  *ramht;
+       struct nvkm_gpuobj *ramro;
+       struct nvkm_gpuobj *ramfc;
 };
 
 struct nv04_fifo_base {
-       struct nouveau_fifo_base base;
+       struct nvkm_fifo_base base;
 };
 
 struct nv04_fifo_chan {
-       struct nouveau_fifo_chan base;
+       struct nvkm_fifo_chan base;
        u32 subc[8];
        u32 ramfc;
 };
 
-int  nv04_fifo_object_attach(struct nouveau_object *,
-                            struct nouveau_object *, u32);
-void nv04_fifo_object_detach(struct nouveau_object *, int);
-
-void nv04_fifo_chan_dtor(struct nouveau_object *);
-int  nv04_fifo_chan_init(struct nouveau_object *);
-int  nv04_fifo_chan_fini(struct nouveau_object *, bool suspend);
+int  nv04_fifo_object_attach(struct nvkm_object *, struct nvkm_object *, u32);
+void nv04_fifo_object_detach(struct nvkm_object *, int);
 
-int  nv04_fifo_context_ctor(struct nouveau_object *, struct nouveau_object *,
-                           struct nouveau_oclass *, void *, u32,
-                           struct nouveau_object **);
+void nv04_fifo_chan_dtor(struct nvkm_object *);
+int  nv04_fifo_chan_init(struct nvkm_object *);
+int  nv04_fifo_chan_fini(struct nvkm_object *, bool suspend);
 
-void nv04_fifo_dtor(struct nouveau_object *);
-int  nv04_fifo_init(struct nouveau_object *);
-void nv04_fifo_pause(struct nouveau_fifo *, unsigned long *);
-void nv04_fifo_start(struct nouveau_fifo *, unsigned long *);
+int  nv04_fifo_context_ctor(struct nvkm_object *, struct nvkm_object *,
+                           struct nvkm_oclass *, void *, u32,
+                           struct nvkm_object **);
 
+void nv04_fifo_dtor(struct nvkm_object *);
+int  nv04_fifo_init(struct nvkm_object *);
+void nv04_fifo_pause(struct nvkm_fifo *, unsigned long *);
+void nv04_fifo_start(struct nvkm_fifo *, unsigned long *);
 #endif
index 2a32add51c819e0bb8642bbaa2ff2c3f1f3a98c4..48ce4af6f543cf11e5575dfc844850c918d6c699 100644 (file)
  *
  * Authors: Ben Skeggs
  */
+#include "nv04.h"
 
 #include <core/client.h>
-#include <nvif/unpack.h>
-#include <nvif/class.h>
 #include <core/engctx.h>
 #include <core/ramht.h>
-
-#include <subdev/instmem.h>
 #include <subdev/instmem/nv04.h>
-#include <subdev/fb.h>
 
-#include <engine/fifo.h>
-
-#include "nv04.h"
+#include <nvif/class.h>
+#include <nvif/unpack.h>
 
 static struct ramfc_desc
 nv10_ramfc[] = {
@@ -55,10 +50,10 @@ nv10_ramfc[] = {
  ******************************************************************************/
 
 static int
-nv10_fifo_chan_ctor(struct nouveau_object *parent,
-                   struct nouveau_object *engine,
-                   struct nouveau_oclass *oclass, void *data, u32 size,
-                   struct nouveau_object **pobject)
+nv10_fifo_chan_ctor(struct nvkm_object *parent,
+                   struct nvkm_object *engine,
+                   struct nvkm_oclass *oclass, void *data, u32 size,
+                   struct nvkm_object **pobject)
 {
        union {
                struct nv03_channel_dma_v0 v0;
@@ -75,11 +70,11 @@ nv10_fifo_chan_ctor(struct nouveau_object *parent,
        } else
                return ret;
 
-       ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0x800000,
-                                         0x10000, args->v0.pushbuf,
-                                         (1ULL << NVDEV_ENGINE_DMAOBJ) |
-                                         (1ULL << NVDEV_ENGINE_SW) |
-                                         (1ULL << NVDEV_ENGINE_GR), &chan);
+       ret = nvkm_fifo_channel_create(parent, engine, oclass, 0, 0x800000,
+                                      0x10000, args->v0.pushbuf,
+                                      (1ULL << NVDEV_ENGINE_DMAOBJ) |
+                                      (1ULL << NVDEV_ENGINE_SW) |
+                                      (1ULL << NVDEV_ENGINE_GR), &chan);
        *pobject = nv_object(chan);
        if (ret)
                return ret;
@@ -104,19 +99,19 @@ nv10_fifo_chan_ctor(struct nouveau_object *parent,
        return 0;
 }
 
-static struct nouveau_ofuncs
+static struct nvkm_ofuncs
 nv10_fifo_ofuncs = {
        .ctor = nv10_fifo_chan_ctor,
        .dtor = nv04_fifo_chan_dtor,
        .init = nv04_fifo_chan_init,
        .fini = nv04_fifo_chan_fini,
-       .map  = _nouveau_fifo_channel_map,
-       .rd32 = _nouveau_fifo_channel_rd32,
-       .wr32 = _nouveau_fifo_channel_wr32,
-       .ntfy = _nouveau_fifo_channel_ntfy
+       .map  = _nvkm_fifo_channel_map,
+       .rd32 = _nvkm_fifo_channel_rd32,
+       .wr32 = _nvkm_fifo_channel_wr32,
+       .ntfy = _nvkm_fifo_channel_ntfy
 };
 
-static struct nouveau_oclass
+static struct nvkm_oclass
 nv10_fifo_sclass[] = {
        { NV10_CHANNEL_DMA, &nv10_fifo_ofuncs },
        {}
@@ -126,16 +121,16 @@ nv10_fifo_sclass[] = {
  * FIFO context - basically just the instmem reserved for the channel
  ******************************************************************************/
 
-static struct nouveau_oclass
+static struct nvkm_oclass
 nv10_fifo_cclass = {
        .handle = NV_ENGCTX(FIFO, 0x10),
-       .ofuncs = &(struct nouveau_ofuncs) {
+       .ofuncs = &(struct nvkm_ofuncs) {
                .ctor = nv04_fifo_context_ctor,
-               .dtor = _nouveau_fifo_context_dtor,
-               .init = _nouveau_fifo_context_init,
-               .fini = _nouveau_fifo_context_fini,
-               .rd32 = _nouveau_fifo_context_rd32,
-               .wr32 = _nouveau_fifo_context_wr32,
+               .dtor = _nvkm_fifo_context_dtor,
+               .init = _nvkm_fifo_context_init,
+               .fini = _nvkm_fifo_context_fini,
+               .rd32 = _nvkm_fifo_context_rd32,
+               .wr32 = _nvkm_fifo_context_wr32,
        },
 };
 
@@ -144,22 +139,22 @@ nv10_fifo_cclass = {
  ******************************************************************************/
 
 static int
-nv10_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
-              struct nouveau_oclass *oclass, void *data, u32 size,
-              struct nouveau_object **pobject)
+nv10_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+              struct nvkm_oclass *oclass, void *data, u32 size,
+              struct nvkm_object **pobject)
 {
        struct nv04_instmem_priv *imem = nv04_instmem(parent);
        struct nv04_fifo_priv *priv;
        int ret;
 
-       ret = nouveau_fifo_create(parent, engine, oclass, 0, 31, &priv);
+       ret = nvkm_fifo_create(parent, engine, oclass, 0, 31, &priv);
        *pobject = nv_object(priv);
        if (ret)
                return ret;
 
-       nouveau_ramht_ref(imem->ramht, &priv->ramht);
-       nouveau_gpuobj_ref(imem->ramro, &priv->ramro);
-       nouveau_gpuobj_ref(imem->ramfc, &priv->ramfc);
+       nvkm_ramht_ref(imem->ramht, &priv->ramht);
+       nvkm_gpuobj_ref(imem->ramro, &priv->ramro);
+       nvkm_gpuobj_ref(imem->ramfc, &priv->ramfc);
 
        nv_subdev(priv)->unit = 0x00000100;
        nv_subdev(priv)->intr = nv04_fifo_intr;
@@ -171,13 +166,13 @@ nv10_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        return 0;
 }
 
-struct nouveau_oclass *
-nv10_fifo_oclass = &(struct nouveau_oclass) {
+struct nvkm_oclass *
+nv10_fifo_oclass = &(struct nvkm_oclass) {
        .handle = NV_ENGINE(FIFO, 0x10),
-       .ofuncs = &(struct nouveau_ofuncs) {
+       .ofuncs = &(struct nvkm_ofuncs) {
                .ctor = nv10_fifo_ctor,
                .dtor = nv04_fifo_dtor,
                .init = nv04_fifo_init,
-               .fini = _nouveau_fifo_fini,
+               .fini = _nvkm_fifo_fini,
        },
 };
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv108.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv108.c
deleted file mode 100644 (file)
index 09362a5..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2013 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Ben Skeggs
- */
-
-#include "nve0.h"
-
-struct nouveau_oclass *
-nv108_fifo_oclass = &(struct nve0_fifo_impl) {
-       .base.handle = NV_ENGINE(FIFO, 0x08),
-       .base.ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nve0_fifo_ctor,
-               .dtor = nve0_fifo_dtor,
-               .init = nve0_fifo_init,
-               .fini = _nouveau_fifo_fini,
-       },
-       .channels = 1024,
-}.base;
index 01fbb11af00df33bf9e5ffde7afad635bd929a6a..4a20a6fd3887bea0a9b64982be7c61fa63d4a4f7 100644 (file)
  *
  * Authors: Ben Skeggs
  */
+#include "nv04.h"
 
 #include <core/client.h>
-#include <nvif/unpack.h>
-#include <nvif/class.h>
 #include <core/engctx.h>
 #include <core/ramht.h>
-
-#include <subdev/instmem.h>
 #include <subdev/instmem/nv04.h>
-#include <subdev/fb.h>
 
-#include <engine/fifo.h>
-
-#include "nv04.h"
+#include <nvif/class.h>
+#include <nvif/unpack.h>
 
 static struct ramfc_desc
 nv17_ramfc[] = {
@@ -60,10 +55,10 @@ nv17_ramfc[] = {
  ******************************************************************************/
 
 static int
-nv17_fifo_chan_ctor(struct nouveau_object *parent,
-                   struct nouveau_object *engine,
-                   struct nouveau_oclass *oclass, void *data, u32 size,
-                   struct nouveau_object **pobject)
+nv17_fifo_chan_ctor(struct nvkm_object *parent,
+                   struct nvkm_object *engine,
+                   struct nvkm_oclass *oclass, void *data, u32 size,
+                   struct nvkm_object **pobject)
 {
        union {
                struct nv03_channel_dma_v0 v0;
@@ -80,13 +75,13 @@ nv17_fifo_chan_ctor(struct nouveau_object *parent,
        } else
                return ret;
 
-       ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0x800000,
-                                         0x10000, args->v0.pushbuf,
-                                         (1ULL << NVDEV_ENGINE_DMAOBJ) |
-                                         (1ULL << NVDEV_ENGINE_SW) |
-                                         (1ULL << NVDEV_ENGINE_GR) |
-                                         (1ULL << NVDEV_ENGINE_MPEG), /* NV31- */
-                                         &chan);
+       ret = nvkm_fifo_channel_create(parent, engine, oclass, 0, 0x800000,
+                                      0x10000, args->v0.pushbuf,
+                                      (1ULL << NVDEV_ENGINE_DMAOBJ) |
+                                      (1ULL << NVDEV_ENGINE_SW) |
+                                      (1ULL << NVDEV_ENGINE_GR) |
+                                      (1ULL << NVDEV_ENGINE_MPEG), /* NV31- */
+                                      &chan);
        *pobject = nv_object(chan);
        if (ret)
                return ret;
@@ -111,19 +106,19 @@ nv17_fifo_chan_ctor(struct nouveau_object *parent,
        return 0;
 }
 
-static struct nouveau_ofuncs
+static struct nvkm_ofuncs
 nv17_fifo_ofuncs = {
        .ctor = nv17_fifo_chan_ctor,
        .dtor = nv04_fifo_chan_dtor,
        .init = nv04_fifo_chan_init,
        .fini = nv04_fifo_chan_fini,
-       .map  = _nouveau_fifo_channel_map,
-       .rd32 = _nouveau_fifo_channel_rd32,
-       .wr32 = _nouveau_fifo_channel_wr32,
-       .ntfy = _nouveau_fifo_channel_ntfy
+       .map  = _nvkm_fifo_channel_map,
+       .rd32 = _nvkm_fifo_channel_rd32,
+       .wr32 = _nvkm_fifo_channel_wr32,
+       .ntfy = _nvkm_fifo_channel_ntfy
 };
 
-static struct nouveau_oclass
+static struct nvkm_oclass
 nv17_fifo_sclass[] = {
        { NV17_CHANNEL_DMA, &nv17_fifo_ofuncs },
        {}
@@ -133,16 +128,16 @@ nv17_fifo_sclass[] = {
  * FIFO context - basically just the instmem reserved for the channel
  ******************************************************************************/
 
-static struct nouveau_oclass
+static struct nvkm_oclass
 nv17_fifo_cclass = {
        .handle = NV_ENGCTX(FIFO, 0x17),
-       .ofuncs = &(struct nouveau_ofuncs) {
+       .ofuncs = &(struct nvkm_ofuncs) {
                .ctor = nv04_fifo_context_ctor,
-               .dtor = _nouveau_fifo_context_dtor,
-               .init = _nouveau_fifo_context_init,
-               .fini = _nouveau_fifo_context_fini,
-               .rd32 = _nouveau_fifo_context_rd32,
-               .wr32 = _nouveau_fifo_context_wr32,
+               .dtor = _nvkm_fifo_context_dtor,
+               .init = _nvkm_fifo_context_init,
+               .fini = _nvkm_fifo_context_fini,
+               .rd32 = _nvkm_fifo_context_rd32,
+               .wr32 = _nvkm_fifo_context_wr32,
        },
 };
 
@@ -151,22 +146,22 @@ nv17_fifo_cclass = {
  ******************************************************************************/
 
 static int
-nv17_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
-              struct nouveau_oclass *oclass, void *data, u32 size,
-              struct nouveau_object **pobject)
+nv17_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+              struct nvkm_oclass *oclass, void *data, u32 size,
+              struct nvkm_object **pobject)
 {
        struct nv04_instmem_priv *imem = nv04_instmem(parent);
        struct nv04_fifo_priv *priv;
        int ret;
 
-       ret = nouveau_fifo_create(parent, engine, oclass, 0, 31, &priv);
+       ret = nvkm_fifo_create(parent, engine, oclass, 0, 31, &priv);
        *pobject = nv_object(priv);
        if (ret)
                return ret;
 
-       nouveau_ramht_ref(imem->ramht, &priv->ramht);
-       nouveau_gpuobj_ref(imem->ramro, &priv->ramro);
-       nouveau_gpuobj_ref(imem->ramfc, &priv->ramfc);
+       nvkm_ramht_ref(imem->ramht, &priv->ramht);
+       nvkm_gpuobj_ref(imem->ramro, &priv->ramro);
+       nvkm_gpuobj_ref(imem->ramfc, &priv->ramfc);
 
        nv_subdev(priv)->unit = 0x00000100;
        nv_subdev(priv)->intr = nv04_fifo_intr;
@@ -179,12 +174,12 @@ nv17_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
 }
 
 static int
-nv17_fifo_init(struct nouveau_object *object)
+nv17_fifo_init(struct nvkm_object *object)
 {
        struct nv04_fifo_priv *priv = (void *)object;
        int ret;
 
-       ret = nouveau_fifo_init(&priv->base);
+       ret = nvkm_fifo_init(&priv->base);
        if (ret)
                return ret;
 
@@ -208,13 +203,13 @@ nv17_fifo_init(struct nouveau_object *object)
        return 0;
 }
 
-struct nouveau_oclass *
-nv17_fifo_oclass = &(struct nouveau_oclass) {
+struct nvkm_oclass *
+nv17_fifo_oclass = &(struct nvkm_oclass) {
        .handle = NV_ENGINE(FIFO, 0x17),
-       .ofuncs = &(struct nouveau_ofuncs) {
+       .ofuncs = &(struct nvkm_ofuncs) {
                .ctor = nv17_fifo_ctor,
                .dtor = nv04_fifo_dtor,
                .init = nv17_fifo_init,
-               .fini = _nouveau_fifo_fini,
+               .fini = _nvkm_fifo_fini,
        },
 };
index be0293476279a65f0c0277a72c410a01df92b930..5bfc96265f3bf4c2d209226aed944e88f5013df5 100644 (file)
  *
  * Authors: Ben Skeggs
  */
+#include "nv04.h"
 
 #include <core/client.h>
 #include <core/device.h>
-#include <nvif/unpack.h>
-#include <nvif/class.h>
 #include <core/engctx.h>
 #include <core/ramht.h>
-
-#include <subdev/instmem.h>
-#include <subdev/instmem/nv04.h>
 #include <subdev/fb.h>
+#include <subdev/instmem/nv04.h>
 
-#include <engine/fifo.h>
-
-#include "nv04.h"
+#include <nvif/class.h>
+#include <nvif/unpack.h>
 
 static struct ramfc_desc
 nv40_ramfc[] = {
@@ -69,8 +65,8 @@ nv40_ramfc[] = {
  ******************************************************************************/
 
 static int
-nv40_fifo_object_attach(struct nouveau_object *parent,
-                       struct nouveau_object *object, u32 handle)
+nv40_fifo_object_attach(struct nvkm_object *parent,
+                       struct nvkm_object *object, u32 handle)
 {
        struct nv04_fifo_priv *priv = (void *)parent->engine;
        struct nv04_fifo_chan *chan = (void *)parent;
@@ -100,14 +96,13 @@ nv40_fifo_object_attach(struct nouveau_object *parent,
        context |= chid << 23;
 
        mutex_lock(&nv_subdev(priv)->mutex);
-       ret = nouveau_ramht_insert(priv->ramht, chid, handle, context);
+       ret = nvkm_ramht_insert(priv->ramht, chid, handle, context);
        mutex_unlock(&nv_subdev(priv)->mutex);
        return ret;
 }
 
 static int
-nv40_fifo_context_attach(struct nouveau_object *parent,
-                        struct nouveau_object *engctx)
+nv40_fifo_context_attach(struct nvkm_object *parent, struct nvkm_object *engctx)
 {
        struct nv04_fifo_priv *priv = (void *)parent->engine;
        struct nv04_fifo_chan *chan = (void *)parent;
@@ -143,8 +138,8 @@ nv40_fifo_context_attach(struct nouveau_object *parent,
 }
 
 static int
-nv40_fifo_context_detach(struct nouveau_object *parent, bool suspend,
-                        struct nouveau_object *engctx)
+nv40_fifo_context_detach(struct nvkm_object *parent, bool suspend,
+                        struct nvkm_object *engctx)
 {
        struct nv04_fifo_priv *priv = (void *)parent->engine;
        struct nv04_fifo_chan *chan = (void *)parent;
@@ -179,10 +174,9 @@ nv40_fifo_context_detach(struct nouveau_object *parent, bool suspend,
 }
 
 static int
-nv40_fifo_chan_ctor(struct nouveau_object *parent,
-                   struct nouveau_object *engine,
-                   struct nouveau_oclass *oclass, void *data, u32 size,
-                   struct nouveau_object **pobject)
+nv40_fifo_chan_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+                   struct nvkm_oclass *oclass, void *data, u32 size,
+                   struct nvkm_object **pobject)
 {
        union {
                struct nv03_channel_dma_v0 v0;
@@ -199,12 +193,12 @@ nv40_fifo_chan_ctor(struct nouveau_object *parent,
        } else
                return ret;
 
-       ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
-                                         0x1000, args->v0.pushbuf,
-                                         (1ULL << NVDEV_ENGINE_DMAOBJ) |
-                                         (1ULL << NVDEV_ENGINE_SW) |
-                                         (1ULL << NVDEV_ENGINE_GR) |
-                                         (1ULL << NVDEV_ENGINE_MPEG), &chan);
+       ret = nvkm_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
+                                      0x1000, args->v0.pushbuf,
+                                      (1ULL << NVDEV_ENGINE_DMAOBJ) |
+                                      (1ULL << NVDEV_ENGINE_SW) |
+                                      (1ULL << NVDEV_ENGINE_GR) |
+                                      (1ULL << NVDEV_ENGINE_MPEG), &chan);
        *pobject = nv_object(chan);
        if (ret)
                return ret;
@@ -231,19 +225,19 @@ nv40_fifo_chan_ctor(struct nouveau_object *parent,
        return 0;
 }
 
-static struct nouveau_ofuncs
+static struct nvkm_ofuncs
 nv40_fifo_ofuncs = {
        .ctor = nv40_fifo_chan_ctor,
        .dtor = nv04_fifo_chan_dtor,
        .init = nv04_fifo_chan_init,
        .fini = nv04_fifo_chan_fini,
-       .map  = _nouveau_fifo_channel_map,
-       .rd32 = _nouveau_fifo_channel_rd32,
-       .wr32 = _nouveau_fifo_channel_wr32,
-       .ntfy = _nouveau_fifo_channel_ntfy
+       .map  = _nvkm_fifo_channel_map,
+       .rd32 = _nvkm_fifo_channel_rd32,
+       .wr32 = _nvkm_fifo_channel_wr32,
+       .ntfy = _nvkm_fifo_channel_ntfy
 };
 
-static struct nouveau_oclass
+static struct nvkm_oclass
 nv40_fifo_sclass[] = {
        { NV40_CHANNEL_DMA, &nv40_fifo_ofuncs },
        {}
@@ -253,16 +247,16 @@ nv40_fifo_sclass[] = {
  * FIFO context - basically just the instmem reserved for the channel
  ******************************************************************************/
 
-static struct nouveau_oclass
+static struct nvkm_oclass
 nv40_fifo_cclass = {
        .handle = NV_ENGCTX(FIFO, 0x40),
-       .ofuncs = &(struct nouveau_ofuncs) {
+       .ofuncs = &(struct nvkm_ofuncs) {
                .ctor = nv04_fifo_context_ctor,
-               .dtor = _nouveau_fifo_context_dtor,
-               .init = _nouveau_fifo_context_init,
-               .fini = _nouveau_fifo_context_fini,
-               .rd32 = _nouveau_fifo_context_rd32,
-               .wr32 = _nouveau_fifo_context_wr32,
+               .dtor = _nvkm_fifo_context_dtor,
+               .init = _nvkm_fifo_context_init,
+               .fini = _nvkm_fifo_context_fini,
+               .rd32 = _nvkm_fifo_context_rd32,
+               .wr32 = _nvkm_fifo_context_wr32,
        },
 };
 
@@ -271,22 +265,22 @@ nv40_fifo_cclass = {
  ******************************************************************************/
 
 static int
-nv40_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
-              struct nouveau_oclass *oclass, void *data, u32 size,
-              struct nouveau_object **pobject)
+nv40_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+              struct nvkm_oclass *oclass, void *data, u32 size,
+              struct nvkm_object **pobject)
 {
        struct nv04_instmem_priv *imem = nv04_instmem(parent);
        struct nv04_fifo_priv *priv;
        int ret;
 
-       ret = nouveau_fifo_create(parent, engine, oclass, 0, 31, &priv);
+       ret = nvkm_fifo_create(parent, engine, oclass, 0, 31, &priv);
        *pobject = nv_object(priv);
        if (ret)
                return ret;
 
-       nouveau_ramht_ref(imem->ramht, &priv->ramht);
-       nouveau_gpuobj_ref(imem->ramro, &priv->ramro);
-       nouveau_gpuobj_ref(imem->ramfc, &priv->ramfc);
+       nvkm_ramht_ref(imem->ramht, &priv->ramht);
+       nvkm_gpuobj_ref(imem->ramro, &priv->ramro);
+       nvkm_gpuobj_ref(imem->ramfc, &priv->ramfc);
 
        nv_subdev(priv)->unit = 0x00000100;
        nv_subdev(priv)->intr = nv04_fifo_intr;
@@ -299,13 +293,13 @@ nv40_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
 }
 
 static int
-nv40_fifo_init(struct nouveau_object *object)
+nv40_fifo_init(struct nvkm_object *object)
 {
        struct nv04_fifo_priv *priv = (void *)object;
-       struct nouveau_fb *pfb = nouveau_fb(object);
+       struct nvkm_fb *pfb = nvkm_fb(object);
        int ret;
 
-       ret = nouveau_fifo_init(&priv->base);
+       ret = nvkm_fifo_init(&priv->base);
        if (ret)
                return ret;
 
@@ -350,13 +344,13 @@ nv40_fifo_init(struct nouveau_object *object)
        return 0;
 }
 
-struct nouveau_oclass *
-nv40_fifo_oclass = &(struct nouveau_oclass) {
+struct nvkm_oclass *
+nv40_fifo_oclass = &(struct nvkm_oclass) {
        .handle = NV_ENGINE(FIFO, 0x40),
-       .ofuncs = &(struct nouveau_ofuncs) {
+       .ofuncs = &(struct nvkm_ofuncs) {
                .ctor = nv40_fifo_ctor,
                .dtor = nv04_fifo_dtor,
                .init = nv40_fifo_init,
-               .fini = _nouveau_fifo_fini,
+               .fini = _nvkm_fifo_fini,
        },
 };
index 403fafc0507256378ff08ed5c2d708aa0663c72f..f25f0fd0655d5445efa1cdb56479ab1989b6f9ed 100644 (file)
  *
  * Authors: Ben Skeggs
  */
+#include "nv50.h"
+#include "nv04.h"
 
 #include <core/client.h>
 #include <core/engctx.h>
 #include <core/ramht.h>
-#include <nvif/unpack.h>
-#include <nvif/class.h>
-
-#include <subdev/timer.h>
 #include <subdev/bar.h>
+#include <subdev/mmu.h>
+#include <subdev/timer.h>
 
-#include <engine/dmaobj.h>
-#include <engine/fifo.h>
-
-#include "nv04.h"
-#include "nv50.h"
+#include <nvif/class.h>
+#include <nvif/unpack.h>
 
 /*******************************************************************************
  * FIFO channel objects
@@ -44,8 +41,8 @@
 static void
 nv50_fifo_playlist_update_locked(struct nv50_fifo_priv *priv)
 {
-       struct nouveau_bar *bar = nouveau_bar(priv);
-       struct nouveau_gpuobj *cur;
+       struct nvkm_bar *bar = nvkm_bar(priv);
+       struct nvkm_gpuobj *cur;
        int i, p;
 
        cur = priv->playlist[priv->cur_playlist];
@@ -72,12 +69,11 @@ nv50_fifo_playlist_update(struct nv50_fifo_priv *priv)
 }
 
 static int
-nv50_fifo_context_attach(struct nouveau_object *parent,
-                        struct nouveau_object *object)
+nv50_fifo_context_attach(struct nvkm_object *parent, struct nvkm_object *object)
 {
-       struct nouveau_bar *bar = nouveau_bar(parent);
+       struct nvkm_bar *bar = nvkm_bar(parent);
        struct nv50_fifo_base *base = (void *)parent->parent;
-       struct nouveau_gpuobj *ectx = (void *)object;
+       struct nvkm_gpuobj *ectx = (void *)object;
        u64 limit = ectx->addr + ectx->size - 1;
        u64 start = ectx->addr;
        u32 addr;
@@ -103,10 +99,10 @@ nv50_fifo_context_attach(struct nouveau_object *parent,
 }
 
 static int
-nv50_fifo_context_detach(struct nouveau_object *parent, bool suspend,
-                        struct nouveau_object *object)
+nv50_fifo_context_detach(struct nvkm_object *parent, bool suspend,
+                        struct nvkm_object *object)
 {
-       struct nouveau_bar *bar = nouveau_bar(parent);
+       struct nvkm_bar *bar = nvkm_bar(parent);
        struct nv50_fifo_priv *priv = (void *)parent->engine;
        struct nv50_fifo_base *base = (void *)parent->parent;
        struct nv50_fifo_chan *chan = (void *)parent;
@@ -139,7 +135,7 @@ nv50_fifo_context_detach(struct nouveau_object *parent, bool suspend,
        nv_wr32(priv, 0x0032fc, nv_gpuobj(base)->addr >> 12);
        if (!nv_wait_ne(priv, 0x0032fc, 0xffffffff, 0xffffffff)) {
                nv_error(priv, "channel %d [%s] unload timeout\n",
-                        chan->base.chid, nouveau_client_name(chan));
+                        chan->base.chid, nvkm_client_name(chan));
                if (suspend)
                        ret = -EBUSY;
        }
@@ -159,8 +155,8 @@ nv50_fifo_context_detach(struct nouveau_object *parent, bool suspend,
 }
 
 static int
-nv50_fifo_object_attach(struct nouveau_object *parent,
-                       struct nouveau_object *object, u32 handle)
+nv50_fifo_object_attach(struct nvkm_object *parent,
+                       struct nvkm_object *object, u32 handle)
 {
        struct nv50_fifo_chan *chan = (void *)parent;
        u32 context;
@@ -179,26 +175,25 @@ nv50_fifo_object_attach(struct nouveau_object *parent,
                return -EINVAL;
        }
 
-       return nouveau_ramht_insert(chan->ramht, 0, handle, context);
+       return nvkm_ramht_insert(chan->ramht, 0, handle, context);
 }
 
 void
-nv50_fifo_object_detach(struct nouveau_object *parent, int cookie)
+nv50_fifo_object_detach(struct nvkm_object *parent, int cookie)
 {
        struct nv50_fifo_chan *chan = (void *)parent;
-       nouveau_ramht_remove(chan->ramht, cookie);
+       nvkm_ramht_remove(chan->ramht, cookie);
 }
 
 static int
-nv50_fifo_chan_ctor_dma(struct nouveau_object *parent,
-                       struct nouveau_object *engine,
-                       struct nouveau_oclass *oclass, void *data, u32 size,
-                       struct nouveau_object **pobject)
+nv50_fifo_chan_ctor_dma(struct nvkm_object *parent, struct nvkm_object *engine,
+                       struct nvkm_oclass *oclass, void *data, u32 size,
+                       struct nvkm_object **pobject)
 {
        union {
                struct nv03_channel_dma_v0 v0;
        } *args = data;
-       struct nouveau_bar *bar = nouveau_bar(parent);
+       struct nvkm_bar *bar = nvkm_bar(parent);
        struct nv50_fifo_base *base = (void *)parent;
        struct nv50_fifo_chan *chan;
        int ret;
@@ -211,12 +206,12 @@ nv50_fifo_chan_ctor_dma(struct nouveau_object *parent,
        } else
                return ret;
 
-       ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
-                                         0x2000, args->v0.pushbuf,
-                                         (1ULL << NVDEV_ENGINE_DMAOBJ) |
-                                         (1ULL << NVDEV_ENGINE_SW) |
-                                         (1ULL << NVDEV_ENGINE_GR) |
-                                         (1ULL << NVDEV_ENGINE_MPEG), &chan);
+       ret = nvkm_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
+                                      0x2000, args->v0.pushbuf,
+                                      (1ULL << NVDEV_ENGINE_DMAOBJ) |
+                                      (1ULL << NVDEV_ENGINE_SW) |
+                                      (1ULL << NVDEV_ENGINE_GR) |
+                                      (1ULL << NVDEV_ENGINE_MPEG), &chan);
        *pobject = nv_object(chan);
        if (ret)
                return ret;
@@ -228,8 +223,8 @@ nv50_fifo_chan_ctor_dma(struct nouveau_object *parent,
        nv_parent(chan)->object_attach = nv50_fifo_object_attach;
        nv_parent(chan)->object_detach = nv50_fifo_object_detach;
 
-       ret = nouveau_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
-                               &chan->ramht);
+       ret = nvkm_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
+                            &chan->ramht);
        if (ret)
                return ret;
 
@@ -252,15 +247,14 @@ nv50_fifo_chan_ctor_dma(struct nouveau_object *parent,
 }
 
 static int
-nv50_fifo_chan_ctor_ind(struct nouveau_object *parent,
-                       struct nouveau_object *engine,
-                       struct nouveau_oclass *oclass, void *data, u32 size,
-                       struct nouveau_object **pobject)
+nv50_fifo_chan_ctor_ind(struct nvkm_object *parent, struct nvkm_object *engine,
+                       struct nvkm_oclass *oclass, void *data, u32 size,
+                       struct nvkm_object **pobject)
 {
        union {
                struct nv50_channel_gpfifo_v0 v0;
        } *args = data;
-       struct nouveau_bar *bar = nouveau_bar(parent);
+       struct nvkm_bar *bar = nvkm_bar(parent);
        struct nv50_fifo_base *base = (void *)parent;
        struct nv50_fifo_chan *chan;
        u64 ioffset, ilength;
@@ -275,12 +269,12 @@ nv50_fifo_chan_ctor_ind(struct nouveau_object *parent,
        } else
                return ret;
 
-       ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
-                                         0x2000, args->v0.pushbuf,
-                                         (1ULL << NVDEV_ENGINE_DMAOBJ) |
-                                         (1ULL << NVDEV_ENGINE_SW) |
-                                         (1ULL << NVDEV_ENGINE_GR) |
-                                         (1ULL << NVDEV_ENGINE_MPEG), &chan);
+       ret = nvkm_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
+                                      0x2000, args->v0.pushbuf,
+                                      (1ULL << NVDEV_ENGINE_DMAOBJ) |
+                                      (1ULL << NVDEV_ENGINE_SW) |
+                                      (1ULL << NVDEV_ENGINE_GR) |
+                                      (1ULL << NVDEV_ENGINE_MPEG), &chan);
        *pobject = nv_object(chan);
        if (ret)
                return ret;
@@ -292,8 +286,8 @@ nv50_fifo_chan_ctor_ind(struct nouveau_object *parent,
        nv_parent(chan)->object_attach = nv50_fifo_object_attach;
        nv_parent(chan)->object_detach = nv50_fifo_object_detach;
 
-       ret = nouveau_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
-                              &chan->ramht);
+       ret = nvkm_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
+                            &chan->ramht);
        if (ret)
                return ret;
 
@@ -316,24 +310,24 @@ nv50_fifo_chan_ctor_ind(struct nouveau_object *parent,
 }
 
 void
-nv50_fifo_chan_dtor(struct nouveau_object *object)
+nv50_fifo_chan_dtor(struct nvkm_object *object)
 {
        struct nv50_fifo_chan *chan = (void *)object;
-       nouveau_ramht_ref(NULL, &chan->ramht);
-       nouveau_fifo_channel_destroy(&chan->base);
+       nvkm_ramht_ref(NULL, &chan->ramht);
+       nvkm_fifo_channel_destroy(&chan->base);
 }
 
 static int
-nv50_fifo_chan_init(struct nouveau_object *object)
+nv50_fifo_chan_init(struct nvkm_object *object)
 {
        struct nv50_fifo_priv *priv = (void *)object->engine;
        struct nv50_fifo_base *base = (void *)object->parent;
        struct nv50_fifo_chan *chan = (void *)object;
-       struct nouveau_gpuobj *ramfc = base->ramfc;
+       struct nvkm_gpuobj *ramfc = base->ramfc;
        u32 chid = chan->base.chid;
        int ret;
 
-       ret = nouveau_fifo_channel_init(&chan->base);
+       ret = nvkm_fifo_channel_init(&chan->base);
        if (ret)
                return ret;
 
@@ -343,7 +337,7 @@ nv50_fifo_chan_init(struct nouveau_object *object)
 }
 
 int
-nv50_fifo_chan_fini(struct nouveau_object *object, bool suspend)
+nv50_fifo_chan_fini(struct nvkm_object *object, bool suspend)
 {
        struct nv50_fifo_priv *priv = (void *)object->engine;
        struct nv50_fifo_chan *chan = (void *)object;
@@ -354,34 +348,34 @@ nv50_fifo_chan_fini(struct nouveau_object *object, bool suspend)
        nv50_fifo_playlist_update(priv);
        nv_wr32(priv, 0x002600 + (chid * 4), 0x00000000);
 
-       return nouveau_fifo_channel_fini(&chan->base, suspend);
+       return nvkm_fifo_channel_fini(&chan->base, suspend);
 }
 
-static struct nouveau_ofuncs
+static struct nvkm_ofuncs
 nv50_fifo_ofuncs_dma = {
        .ctor = nv50_fifo_chan_ctor_dma,
        .dtor = nv50_fifo_chan_dtor,
        .init = nv50_fifo_chan_init,
        .fini = nv50_fifo_chan_fini,
-       .map  = _nouveau_fifo_channel_map,
-       .rd32 = _nouveau_fifo_channel_rd32,
-       .wr32 = _nouveau_fifo_channel_wr32,
-       .ntfy = _nouveau_fifo_channel_ntfy
+       .map  = _nvkm_fifo_channel_map,
+       .rd32 = _nvkm_fifo_channel_rd32,
+       .wr32 = _nvkm_fifo_channel_wr32,
+       .ntfy = _nvkm_fifo_channel_ntfy
 };
 
-static struct nouveau_ofuncs
+static struct nvkm_ofuncs
 nv50_fifo_ofuncs_ind = {
        .ctor = nv50_fifo_chan_ctor_ind,
        .dtor = nv50_fifo_chan_dtor,
        .init = nv50_fifo_chan_init,
        .fini = nv50_fifo_chan_fini,
-       .map  = _nouveau_fifo_channel_map,
-       .rd32 = _nouveau_fifo_channel_rd32,
-       .wr32 = _nouveau_fifo_channel_wr32,
-       .ntfy = _nouveau_fifo_channel_ntfy
+       .map  = _nvkm_fifo_channel_map,
+       .rd32 = _nvkm_fifo_channel_rd32,
+       .wr32 = _nvkm_fifo_channel_wr32,
+       .ntfy = _nvkm_fifo_channel_ntfy
 };
 
-static struct nouveau_oclass
+static struct nvkm_oclass
 nv50_fifo_sclass[] = {
        { NV50_CHANNEL_DMA, &nv50_fifo_ofuncs_dma },
        { NV50_CHANNEL_GPFIFO, &nv50_fifo_ofuncs_ind },
@@ -393,36 +387,35 @@ nv50_fifo_sclass[] = {
  ******************************************************************************/
 
 static int
-nv50_fifo_context_ctor(struct nouveau_object *parent,
-                      struct nouveau_object *engine,
-                      struct nouveau_oclass *oclass, void *data, u32 size,
-                      struct nouveau_object **pobject)
+nv50_fifo_context_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+                      struct nvkm_oclass *oclass, void *data, u32 size,
+                      struct nvkm_object **pobject)
 {
        struct nv50_fifo_base *base;
        int ret;
 
-       ret = nouveau_fifo_context_create(parent, engine, oclass, NULL, 0x10000,
-                                         0x1000, NVOBJ_FLAG_HEAP, &base);
+       ret = nvkm_fifo_context_create(parent, engine, oclass, NULL, 0x10000,
+                                      0x1000, NVOBJ_FLAG_HEAP, &base);
        *pobject = nv_object(base);
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x0200,
-                                0x1000, NVOBJ_FLAG_ZERO_ALLOC, &base->ramfc);
+       ret = nvkm_gpuobj_new(nv_object(base), nv_object(base), 0x0200,
+                             0x1000, NVOBJ_FLAG_ZERO_ALLOC, &base->ramfc);
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x1200, 0,
-                                NVOBJ_FLAG_ZERO_ALLOC, &base->eng);
+       ret = nvkm_gpuobj_new(nv_object(base), nv_object(base), 0x1200, 0,
+                             NVOBJ_FLAG_ZERO_ALLOC, &base->eng);
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x4000, 0, 0,
-                               &base->pgd);
+       ret = nvkm_gpuobj_new(nv_object(base), nv_object(base), 0x4000, 0, 0,
+                             &base->pgd);
        if (ret)
                return ret;
 
-       ret = nouveau_vm_ref(nouveau_client(parent)->vm, &base->vm, base->pgd);
+       ret = nvkm_vm_ref(nvkm_client(parent)->vm, &base->vm, base->pgd);
        if (ret)
                return ret;
 
@@ -430,27 +423,27 @@ nv50_fifo_context_ctor(struct nouveau_object *parent,
 }
 
 void
-nv50_fifo_context_dtor(struct nouveau_object *object)
+nv50_fifo_context_dtor(struct nvkm_object *object)
 {
        struct nv50_fifo_base *base = (void *)object;
-       nouveau_vm_ref(NULL, &base->vm, base->pgd);
-       nouveau_gpuobj_ref(NULL, &base->pgd);
-       nouveau_gpuobj_ref(NULL, &base->eng);
-       nouveau_gpuobj_ref(NULL, &base->ramfc);
-       nouveau_gpuobj_ref(NULL, &base->cache);
-       nouveau_fifo_context_destroy(&base->base);
+       nvkm_vm_ref(NULL, &base->vm, base->pgd);
+       nvkm_gpuobj_ref(NULL, &base->pgd);
+       nvkm_gpuobj_ref(NULL, &base->eng);
+       nvkm_gpuobj_ref(NULL, &base->ramfc);
+       nvkm_gpuobj_ref(NULL, &base->cache);
+       nvkm_fifo_context_destroy(&base->base);
 }
 
-static struct nouveau_oclass
+static struct nvkm_oclass
 nv50_fifo_cclass = {
        .handle = NV_ENGCTX(FIFO, 0x50),
-       .ofuncs = &(struct nouveau_ofuncs) {
+       .ofuncs = &(struct nvkm_ofuncs) {
                .ctor = nv50_fifo_context_ctor,
                .dtor = nv50_fifo_context_dtor,
-               .init = _nouveau_fifo_context_init,
-               .fini = _nouveau_fifo_context_fini,
-               .rd32 = _nouveau_fifo_context_rd32,
-               .wr32 = _nouveau_fifo_context_wr32,
+               .init = _nvkm_fifo_context_init,
+               .fini = _nvkm_fifo_context_fini,
+               .rd32 = _nvkm_fifo_context_rd32,
+               .wr32 = _nvkm_fifo_context_wr32,
        },
 };
 
@@ -459,25 +452,25 @@ nv50_fifo_cclass = {
  ******************************************************************************/
 
 static int
-nv50_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
-              struct nouveau_oclass *oclass, void *data, u32 size,
-              struct nouveau_object **pobject)
+nv50_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
+              struct nvkm_oclass *oclass, void *data, u32 size,
+              struct nvkm_object **pobject)
 {
        struct nv50_fifo_priv *priv;
        int ret;
 
-       ret = nouveau_fifo_create(parent, engine, oclass, 1, 127, &priv);
+       ret = nvkm_fifo_create(parent, engine, oclass, 1, 127, &priv);
        *pobject = nv_object(priv);
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
-                               &priv->playlist[0]);
+       ret = nvkm_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
+                             &priv->playlist[0]);
        if (ret)
                return ret;
 
-       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
-                               &priv->playlist[1]);
+       ret = nvkm_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
+                             &priv->playlist[1]);
        if (ret)
                return ret;
 
@@ -491,23 +484,23 @@ nv50_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
 }
 
 void
-nv50_fifo_dtor(struct nouveau_object *object)
+nv50_fifo_dtor(struct nvkm_object *object)
 {
        struct nv50_fifo_priv *priv = (void *)object;
 
-       nouveau_gpuobj_ref(NULL, &priv->playlist[1]);
-       nouveau_gpuobj_ref(NULL, &priv->playlist[0]);
+       nvkm_gpuobj_ref(NULL, &priv->playlist[1]);
+       nvkm_gpuobj_ref(NULL, &priv->playlist[0]);
 
-       nouveau_fifo_destroy(&priv->base);
+       nvkm_fifo_destroy(&priv->base);
 }
 
 int
-nv50_fifo_init(struct nouveau_object *object)
+nv50_fifo_init(struct nvkm_object *object)
 {
        struct nv50_fifo_priv *priv = (void *)object;
        int ret, i;
 
-       ret = nouveau_fifo_init(&priv->base);
+       ret = nvkm_fifo_init(&priv->base);
        if (ret)
                return ret;
 
@@ -529,13 +522,13 @@ nv50_fifo_init(struct nouveau_object *object)
        return 0;
 }
 
-struct nouveau_oclass *
-nv50_fifo_oclass = &(struct nouveau_oclass) {
+struct nvkm_oclass *
+nv50_fifo_oclass = &(struct nvkm_oclass) {
        .handle = NV_ENGINE(FIFO, 0x50),
-       .ofuncs = &(struct nouveau_ofuncs) {
+       .ofuncs = &(struct nvkm_ofuncs) {
                .ctor = nv50_fifo_ctor,
                .dtor = nv50_fifo_dtor,
                .init = nv50_fifo_init,
-               .fini = _nouveau_fifo_fini,
+               .fini = _nvkm_fifo_fini,
        },
 };
index 3a9ceb315c20fbebebfa3308e97ae33a6a78ac66..09ed93c665671b574df74c51fe883be20efeeafd 100644 (file)
@@ -1,36 +1,36 @@
 #ifndef __NV50_FIFO_H__
 #define __NV50_FIFO_H__
+#include <engine/fifo.h>
 
 struct nv50_fifo_priv {
-       struct nouveau_fifo base;
-       struct nouveau_gpuobj *playlist[2];
+       struct nvkm_fifo base;
+       struct nvkm_gpuobj *playlist[2];
        int cur_playlist;
 };
 
 struct nv50_fifo_base {
-       struct nouveau_fifo_base base;
-       struct nouveau_gpuobj *ramfc;
-       struct nouveau_gpuobj *cache;
-       struct nouveau_gpuobj *eng;
-       struct nouveau_gpuobj *pgd;
-       struct nouveau_vm *vm;
+       struct nvkm_fifo_base base;
+       struct nvkm_gpuobj *ramfc;
+       struct nvkm_gpuobj *cache;
+       struct nvkm_gpuobj *eng;
+       struct nvkm_gpuobj *pgd;
+       struct nvkm_vm *vm;
 };
 
 struct nv50_fifo_chan {
-       struct nouveau_fifo_chan base;
+       struct nvkm_fifo_chan base;
        u32 subc[8];
-       struct nouveau_ramht *ramht;
+       struct nvkm_ramht *ramht;
 };
 
 void nv50_fifo_playlist_update(struct nv50_fifo_priv *);
 
-void nv50_fifo_object_detach(struct nouveau_object *, int);
-void nv50_fifo_chan_dtor(struct nouveau_object *);
-int  nv50_fifo_chan_fini(struct nouveau_object *, bool);
+void nv50_fifo_object_detach(struct nvkm_object *, int);
+void nv50_fifo_chan_dtor(struct nvkm_object *);
+int  nv50_fifo_chan_fini(struct nvkm_object *, bool);
 
-void nv50_fifo_context_dtor(struct nouveau_object *);
-
-void nv50_fifo_dtor(struct nouveau_object *);
-int  nv50_fifo_init(struct nouveau_object *);
+void nv50_fifo_context_dtor(struct nvkm_object *);
 
+void nv50_fifo_dtor(struct nvkm_object *);
+int  nv50_fifo_init(struct nvkm_object *);
 #endif
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv84.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv84.c
deleted file mode 100644 (file)
index 727358d..0000000
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * Copyright 2012 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Ben Skeggs
- */
-
-#include <core/os.h>
-#include <core/client.h>
-#include <core/engctx.h>
-#include <core/ramht.h>
-#include <core/event.h>
-#include <nvif/unpack.h>
-#include <nvif/class.h>
-
-#include <subdev/timer.h>
-#include <subdev/bar.h>
-
-#include <engine/dmaobj.h>
-#include <engine/fifo.h>
-
-#include "nv04.h"
-#include "nv50.h"
-
-/*******************************************************************************
- * FIFO channel objects
- ******************************************************************************/
-
-static int
-nv84_fifo_context_attach(struct nouveau_object *parent,
-                        struct nouveau_object *object)
-{
-       struct nouveau_bar *bar = nouveau_bar(parent);
-       struct nv50_fifo_base *base = (void *)parent->parent;
-       struct nouveau_gpuobj *ectx = (void *)object;
-       u64 limit = ectx->addr + ectx->size - 1;
-       u64 start = ectx->addr;
-       u32 addr;
-
-       switch (nv_engidx(object->engine)) {
-       case NVDEV_ENGINE_SW    : return 0;
-       case NVDEV_ENGINE_GR    : addr = 0x0020; break;
-       case NVDEV_ENGINE_VP    :
-       case NVDEV_ENGINE_MSPDEC: addr = 0x0040; break;
-       case NVDEV_ENGINE_MSPPP :
-       case NVDEV_ENGINE_MPEG  : addr = 0x0060; break;
-       case NVDEV_ENGINE_BSP   :
-       case NVDEV_ENGINE_MSVLD : addr = 0x0080; break;
-       case NVDEV_ENGINE_CIPHER:
-       case NVDEV_ENGINE_SEC   : addr = 0x00a0; break;
-       case NVDEV_ENGINE_CE0   : addr = 0x00c0; break;
-       default:
-               return -EINVAL;
-       }
-
-       nv_engctx(ectx)->addr = nv_gpuobj(base)->addr >> 12;
-       nv_wo32(base->eng, addr + 0x00, 0x00190000);
-       nv_wo32(base->eng, addr + 0x04, lower_32_bits(limit));
-       nv_wo32(base->eng, addr + 0x08, lower_32_bits(start));
-       nv_wo32(base->eng, addr + 0x0c, upper_32_bits(limit) << 24 |
-                                       upper_32_bits(start));
-       nv_wo32(base->eng, addr + 0x10, 0x00000000);
-       nv_wo32(base->eng, addr + 0x14, 0x00000000);
-       bar->flush(bar);
-       return 0;
-}
-
-static int
-nv84_fifo_context_detach(struct nouveau_object *parent, bool suspend,
-                        struct nouveau_object *object)
-{
-       struct nouveau_bar *bar = nouveau_bar(parent);
-       struct nv50_fifo_priv *priv = (void *)parent->engine;
-       struct nv50_fifo_base *base = (void *)parent->parent;
-       struct nv50_fifo_chan *chan = (void *)parent;
-       u32 addr, save, engn;
-       bool done;
-
-       switch (nv_engidx(object->engine)) {
-       case NVDEV_ENGINE_SW    : return 0;
-       case NVDEV_ENGINE_GR    : engn = 0; addr = 0x0020; break;
-       case NVDEV_ENGINE_VP    :
-       case NVDEV_ENGINE_MSPDEC: engn = 3; addr = 0x0040; break;
-       case NVDEV_ENGINE_MSPPP :
-       case NVDEV_ENGINE_MPEG  : engn = 1; addr = 0x0060; break;
-       case NVDEV_ENGINE_BSP   :
-       case NVDEV_ENGINE_MSVLD : engn = 5; addr = 0x0080; break;
-       case NVDEV_ENGINE_CIPHER:
-       case NVDEV_ENGINE_SEC   : engn = 4; addr = 0x00a0; break;
-       case NVDEV_ENGINE_CE0   : engn = 2; addr = 0x00c0; break;
-       default:
-               return -EINVAL;
-       }
-
-       save = nv_mask(priv, 0x002520, 0x0000003f, 1 << engn);
-       nv_wr32(priv, 0x0032fc, nv_gpuobj(base)->addr >> 12);
-       done = nv_wait_ne(priv, 0x0032fc, 0xffffffff, 0xffffffff);
-       nv_wr32(priv, 0x002520, save);
-       if (!done) {
-               nv_error(priv, "channel %d [%s] unload timeout\n",
-                        chan->base.chid, nouveau_client_name(chan));
-               if (suspend)
-                       return -EBUSY;
-       }
-
-       nv_wo32(base->eng, addr + 0x00, 0x00000000);
-       nv_wo32(base->eng, addr + 0x04, 0x00000000);
-       nv_wo32(base->eng, addr + 0x08, 0x00000000);
-       nv_wo32(base->eng, addr + 0x0c, 0x00000000);
-       nv_wo32(base->eng, addr + 0x10, 0x00000000);
-       nv_wo32(base->eng, addr + 0x14, 0x00000000);
-       bar->flush(bar);
-       return 0;
-}
-
-static int
-nv84_fifo_object_attach(struct nouveau_object *parent,
-                       struct nouveau_object *object, u32 handle)
-{
-       struct nv50_fifo_chan *chan = (void *)parent;
-       u32 context;
-
-       if (nv_iclass(object, NV_GPUOBJ_CLASS))
-               context = nv_gpuobj(object)->node->offset >> 4;
-       else
-               context = 0x00000004; /* just non-zero */
-
-       switch (nv_engidx(object->engine)) {
-       case NVDEV_ENGINE_DMAOBJ:
-       case NVDEV_ENGINE_SW    : context |= 0x00000000; break;
-       case NVDEV_ENGINE_GR    : context |= 0x00100000; break;
-       case NVDEV_ENGINE_MPEG  :
-       case NVDEV_ENGINE_MSPPP : context |= 0x00200000; break;
-       case NVDEV_ENGINE_ME    :
-       case NVDEV_ENGINE_CE0   : context |= 0x00300000; break;
-       case NVDEV_ENGINE_VP    :
-       case NVDEV_ENGINE_MSPDEC: context |= 0x00400000; break;
-       case NVDEV_ENGINE_CIPHER:
-       case NVDEV_ENGINE_SEC   :
-       case NVDEV_ENGINE_VIC   : context |= 0x00500000; break;
-       case NVDEV_ENGINE_BSP   :
-       case NVDEV_ENGINE_MSVLD : context |= 0x00600000; break;
-       default:
-               return -EINVAL;
-       }
-
-       return nouveau_ramht_insert(chan->ramht, 0, handle, context);
-}
-
-static int
-nv84_fifo_chan_ctor_dma(struct nouveau_object *parent,
-                       struct nouveau_object *engine,
-                       struct nouveau_oclass *oclass, void *data, u32 size,
-                       struct nouveau_object **pobject)
-{
-       union {
-               struct nv03_channel_dma_v0 v0;
-       } *args = data;
-       struct nouveau_bar *bar = nouveau_bar(parent);
-       struct nv50_fifo_base *base = (void *)parent;
-       struct nv50_fifo_chan *chan;
-       int ret;
-
-       nv_ioctl(parent, "create channel dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
-               nv_ioctl(parent, "create channel dma vers %d pushbuf %08x "
-                                "offset %016llx\n", args->v0.version,
-                        args->v0.pushbuf, args->v0.offset);
-       } else
-               return ret;
-
-       ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
-                                         0x2000, args->v0.pushbuf,
-                                         (1ULL << NVDEV_ENGINE_DMAOBJ) |
-                                         (1ULL << NVDEV_ENGINE_SW) |
-                                         (1ULL << NVDEV_ENGINE_GR) |
-                                         (1ULL << NVDEV_ENGINE_MPEG) |
-                                         (1ULL << NVDEV_ENGINE_ME) |
-                                         (1ULL << NVDEV_ENGINE_VP) |
-                                         (1ULL << NVDEV_ENGINE_CIPHER) |
-                                         (1ULL << NVDEV_ENGINE_SEC) |
-                                         (1ULL << NVDEV_ENGINE_BSP) |
-                                         (1ULL << NVDEV_ENGINE_MSVLD) |
-                                         (1ULL << NVDEV_ENGINE_MSPDEC) |
-                                         (1ULL << NVDEV_ENGINE_MSPPP) |
-                                         (1ULL << NVDEV_ENGINE_CE0) |
-                                         (1ULL << NVDEV_ENGINE_VIC), &chan);
-       *pobject = nv_object(chan);
-       if (ret)
-               return ret;
-
-       args->v0.chid = chan->base.chid;
-
-       ret = nouveau_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
-                              &chan->ramht);
-       if (ret)
-               return ret;
-
-       nv_parent(chan)->context_attach = nv84_fifo_context_attach;
-       nv_parent(chan)->context_detach = nv84_fifo_context_detach;
-       nv_parent(chan)->object_attach = nv84_fifo_object_attach;
-       nv_parent(chan)->object_detach = nv50_fifo_object_detach;
-
-       nv_wo32(base->ramfc, 0x08, lower_32_bits(args->v0.offset));
-       nv_wo32(base->ramfc, 0x0c, upper_32_bits(args->v0.offset));
-       nv_wo32(base->ramfc, 0x10, lower_32_bits(args->v0.offset));
-       nv_wo32(base->ramfc, 0x14, upper_32_bits(args->v0.offset));
-       nv_wo32(base->ramfc, 0x3c, 0x003f6078);
-       nv_wo32(base->ramfc, 0x44, 0x01003fff);
-       nv_wo32(base->ramfc, 0x48, chan->base.pushgpu->node->offset >> 4);
-       nv_wo32(base->ramfc, 0x4c, 0xffffffff);
-       nv_wo32(base->ramfc, 0x60, 0x7fffffff);
-       nv_wo32(base->ramfc, 0x78, 0x00000000);
-       nv_wo32(base->ramfc, 0x7c, 0x30000001);
-       nv_wo32(base->ramfc, 0x80, ((chan->ramht->bits - 9) << 27) |
-                                  (4 << 24) /* SEARCH_FULL */ |
-                                  (chan->ramht->gpuobj.node->offset >> 4));
-       nv_wo32(base->ramfc, 0x88, base->cache->addr >> 10);
-       nv_wo32(base->ramfc, 0x98, nv_gpuobj(base)->addr >> 12);
-       bar->flush(bar);
-       return 0;
-}
-
-static int
-nv84_fifo_chan_ctor_ind(struct nouveau_object *parent,
-                       struct nouveau_object *engine,
-                       struct nouveau_oclass *oclass, void *data, u32 size,
-                       struct nouveau_object **pobject)
-{
-       union {
-               struct nv50_channel_gpfifo_v0 v0;
-       } *args = data;
-       struct nouveau_bar *bar = nouveau_bar(parent);
-       struct nv50_fifo_base *base = (void *)parent;
-       struct nv50_fifo_chan *chan;
-       u64 ioffset, ilength;
-       int ret;
-
-       nv_ioctl(parent, "create channel gpfifo size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
-               nv_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
-                                "ioffset %016llx ilength %08x\n",
-                        args->v0.version, args->v0.pushbuf, args->v0.ioffset,
-                        args->v0.ilength);
-       } else
-               return ret;
-
-       ret = nouveau_fifo_channel_create(parent, engine, oclass, 0, 0xc00000,
-                                         0x2000, args->v0.pushbuf,
-                                         (1ULL << NVDEV_ENGINE_DMAOBJ) |
-                                         (1ULL << NVDEV_ENGINE_SW) |
-                                         (1ULL << NVDEV_ENGINE_GR) |
-                                         (1ULL << NVDEV_ENGINE_MPEG) |
-                                         (1ULL << NVDEV_ENGINE_ME) |
-                                         (1ULL << NVDEV_ENGINE_VP) |
-                                         (1ULL << NVDEV_ENGINE_CIPHER) |
-                                         (1ULL << NVDEV_ENGINE_SEC) |
-                                         (1ULL << NVDEV_ENGINE_BSP) |
-                                         (1ULL << NVDEV_ENGINE_MSVLD) |
-                                         (1ULL << NVDEV_ENGINE_MSPDEC) |
-                                         (1ULL << NVDEV_ENGINE_MSPPP) |
-                                         (1ULL << NVDEV_ENGINE_CE0) |
-                                         (1ULL << NVDEV_ENGINE_VIC), &chan);
-       *pobject = nv_object(chan);
-       if (ret)
-               return ret;
-
-       args->v0.chid = chan->base.chid;
-
-       ret = nouveau_ramht_new(nv_object(chan), nv_object(chan), 0x8000, 16,
-                              &chan->ramht);
-       if (ret)
-               return ret;
-
-       nv_parent(chan)->context_attach = nv84_fifo_context_attach;
-       nv_parent(chan)->context_detach = nv84_fifo_context_detach;
-       nv_parent(chan)->object_attach = nv84_fifo_object_attach;
-       nv_parent(chan)->object_detach = nv50_fifo_object_detach;
-
-       ioffset = args->v0.ioffset;
-       ilength = order_base_2(args->v0.ilength / 8);
-
-       nv_wo32(base->ramfc, 0x3c, 0x403f6078);
-       nv_wo32(base->ramfc, 0x44, 0x01003fff);
-       nv_wo32(base->ramfc, 0x48, chan->base.pushgpu->node->offset >> 4);
-       nv_wo32(base->ramfc, 0x50, lower_32_bits(ioffset));
-       nv_wo32(base->ramfc, 0x54, upper_32_bits(ioffset) | (ilength << 16));
-       nv_wo32(base->ramfc, 0x60, 0x7fffffff);
-       nv_wo32(base->ramfc, 0x78, 0x00000000);
-       nv_wo32(base->ramfc, 0x7c, 0x30000001);
-       nv_wo32(base->ramfc, 0x80, ((chan->ramht->bits - 9) << 27) |
-                                  (4 << 24) /* SEARCH_FULL */ |
-                                  (chan->ramht->gpuobj.node->offset >> 4));
-       nv_wo32(base->ramfc, 0x88, base->cache->addr >> 10);
-       nv_wo32(base->ramfc, 0x98, nv_gpuobj(base)->addr >> 12);
-       bar->flush(bar);
-       return 0;
-}
-
-static int
-nv84_fifo_chan_init(struct nouveau_object *object)
-{
-       struct nv50_fifo_priv *priv = (void *)object->engine;
-       struct nv50_fifo_base *base = (void *)object->parent;
-       struct nv50_fifo_chan *chan = (void *)object;
-       struct nouveau_gpuobj *ramfc = base->ramfc;
-       u32 chid = chan->base.chid;
-       int ret;
-
-       ret = nouveau_fifo_channel_init(&chan->base);
-       if (ret)
-               return ret;
-
-       nv_wr32(priv, 0x002600 + (chid * 4), 0x80000000 | ramfc->addr >> 8);
-       nv50_fifo_playlist_update(priv);
-       return 0;
-}
-
-static struct nouveau_ofuncs
-nv84_fifo_ofuncs_dma = {
-       .ctor = nv84_fifo_chan_ctor_dma,
-       .dtor = nv50_fifo_chan_dtor,
-       .init = nv84_fifo_chan_init,
-       .fini = nv50_fifo_chan_fini,
-       .map  = _nouveau_fifo_channel_map,
-       .rd32 = _nouveau_fifo_channel_rd32,
-       .wr32 = _nouveau_fifo_channel_wr32,
-       .ntfy = _nouveau_fifo_channel_ntfy
-};
-
-static struct nouveau_ofuncs
-nv84_fifo_ofuncs_ind = {
-       .ctor = nv84_fifo_chan_ctor_ind,
-       .dtor = nv50_fifo_chan_dtor,
-       .init = nv84_fifo_chan_init,
-       .fini = nv50_fifo_chan_fini,
-       .map  = _nouveau_fifo_channel_map,
-       .rd32 = _nouveau_fifo_channel_rd32,
-       .wr32 = _nouveau_fifo_channel_wr32,
-       .ntfy = _nouveau_fifo_channel_ntfy
-};
-
-static struct nouveau_oclass
-nv84_fifo_sclass[] = {
-       { G82_CHANNEL_DMA, &nv84_fifo_ofuncs_dma },
-       { G82_CHANNEL_GPFIFO, &nv84_fifo_ofuncs_ind },
-       {}
-};
-
-/*******************************************************************************
- * FIFO context - basically just the instmem reserved for the channel
- ******************************************************************************/
-
-static int
-nv84_fifo_context_ctor(struct nouveau_object *parent,
-                      struct nouveau_object *engine,
-                      struct nouveau_oclass *oclass, void *data, u32 size,
-                      struct nouveau_object **pobject)
-{
-       struct nv50_fifo_base *base;
-       int ret;
-
-       ret = nouveau_fifo_context_create(parent, engine, oclass, NULL, 0x10000,
-                                         0x1000, NVOBJ_FLAG_HEAP, &base);
-       *pobject = nv_object(base);
-       if (ret)
-               return ret;
-
-       ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x0200, 0,
-                                NVOBJ_FLAG_ZERO_ALLOC, &base->eng);
-       if (ret)
-               return ret;
-
-       ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x4000, 0,
-                                0, &base->pgd);
-       if (ret)
-               return ret;
-
-       ret = nouveau_vm_ref(nouveau_client(parent)->vm, &base->vm, base->pgd);
-       if (ret)
-               return ret;
-
-       ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x1000,
-                                0x400, NVOBJ_FLAG_ZERO_ALLOC, &base->cache);
-       if (ret)
-               return ret;
-
-       ret = nouveau_gpuobj_new(nv_object(base), nv_object(base), 0x0100,
-                                0x100, NVOBJ_FLAG_ZERO_ALLOC, &base->ramfc);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
-static struct nouveau_oclass
-nv84_fifo_cclass = {
-       .handle = NV_ENGCTX(FIFO, 0x84),
-       .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nv84_fifo_context_ctor,
-               .dtor = nv50_fifo_context_dtor,
-               .init = _nouveau_fifo_context_init,
-               .fini = _nouveau_fifo_context_fini,
-               .rd32 = _nouveau_fifo_context_rd32,
-               .wr32 = _nouveau_fifo_context_wr32,
-       },
-};
-
-/*******************************************************************************
- * PFIFO engine
- ******************************************************************************/
-
-static void
-nv84_fifo_uevent_init(struct nvkm_event *event, int type, int index)
-{
-       struct nouveau_fifo *fifo = container_of(event, typeof(*fifo), uevent);
-       nv_mask(fifo, 0x002140, 0x40000000, 0x40000000);
-}
-
-static void
-nv84_fifo_uevent_fini(struct nvkm_event *event, int type, int index)
-{
-       struct nouveau_fifo *fifo = container_of(event, typeof(*fifo), uevent);
-       nv_mask(fifo, 0x002140, 0x40000000, 0x00000000);
-}
-
-static const struct nvkm_event_func
-nv84_fifo_uevent_func = {
-       .ctor = nouveau_fifo_uevent_ctor,
-       .init = nv84_fifo_uevent_init,
-       .fini = nv84_fifo_uevent_fini,
-};
-
-static int
-nv84_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
-              struct nouveau_oclass *oclass, void *data, u32 size,
-              struct nouveau_object **pobject)
-{
-       struct nv50_fifo_priv *priv;
-       int ret;
-
-       ret = nouveau_fifo_create(parent, engine, oclass, 1, 127, &priv);
-       *pobject = nv_object(priv);
-       if (ret)
-               return ret;
-
-       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
-                               &priv->playlist[0]);
-       if (ret)
-               return ret;
-
-       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 4, 0x1000, 0,
-                               &priv->playlist[1]);
-       if (ret)
-               return ret;
-
-       ret = nvkm_event_init(&nv84_fifo_uevent_func, 1, 1, &priv->base.uevent);
-       if (ret)
-               return ret;
-
-       nv_subdev(priv)->unit = 0x00000100;
-       nv_subdev(priv)->intr = nv04_fifo_intr;
-       nv_engine(priv)->cclass = &nv84_fifo_cclass;
-       nv_engine(priv)->sclass = nv84_fifo_sclass;
-       priv->base.pause = nv04_fifo_pause;
-       priv->base.start = nv04_fifo_start;
-       return 0;
-}
-
-struct nouveau_oclass *
-nv84_fifo_oclass = &(struct nouveau_oclass) {
-       .handle = NV_ENGINE(FIFO, 0x84),
-       .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nv84_fifo_ctor,
-               .dtor = nv50_fifo_dtor,
-               .init = nv50_fifo_init,
-               .fini = _nouveau_fifo_fini,
-       },
-};
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nvc0.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nvc0.c
deleted file mode 100644 (file)
index 6e05b0b..0000000
+++ /dev/null
@@ -1,974 +0,0 @@
-/*
- * Copyright 2012 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Ben Skeggs
- */
-
-#include <core/client.h>
-#include <core/handle.h>
-#include <core/namedb.h>
-#include <core/gpuobj.h>
-#include <core/engctx.h>
-#include <core/event.h>
-#include <nvif/unpack.h>
-#include <nvif/class.h>
-#include <core/enum.h>
-
-#include <subdev/timer.h>
-#include <subdev/bar.h>
-#include <subdev/fb.h>
-#include <subdev/mmu.h>
-
-#include <engine/dmaobj.h>
-#include <engine/fifo.h>
-
-struct nvc0_fifo_priv {
-       struct nouveau_fifo base;
-
-       struct work_struct fault;
-       u64 mask;
-
-       struct {
-               struct nouveau_gpuobj *mem[2];
-               int active;
-               wait_queue_head_t wait;
-       } runlist;
-
-       struct {
-               struct nouveau_gpuobj *mem;
-               struct nouveau_vma bar;
-       } user;
-       int spoon_nr;
-};
-
-struct nvc0_fifo_base {
-       struct nouveau_fifo_base base;
-       struct nouveau_gpuobj *pgd;
-       struct nouveau_vm *vm;
-};
-
-struct nvc0_fifo_chan {
-       struct nouveau_fifo_chan base;
-       enum {
-               STOPPED,
-               RUNNING,
-               KILLED
-       } state;
-};
-
-/*******************************************************************************
- * FIFO channel objects
- ******************************************************************************/
-
-static void
-nvc0_fifo_runlist_update(struct nvc0_fifo_priv *priv)
-{
-       struct nouveau_bar *bar = nouveau_bar(priv);
-       struct nouveau_gpuobj *cur;
-       int i, p;
-
-       mutex_lock(&nv_subdev(priv)->mutex);
-       cur = priv->runlist.mem[priv->runlist.active];
-       priv->runlist.active = !priv->runlist.active;
-
-       for (i = 0, p = 0; i < 128; i++) {
-               struct nvc0_fifo_chan *chan = (void *)priv->base.channel[i];
-               if (chan && chan->state == RUNNING) {
-                       nv_wo32(cur, p + 0, i);
-                       nv_wo32(cur, p + 4, 0x00000004);
-                       p += 8;
-               }
-       }
-       bar->flush(bar);
-
-       nv_wr32(priv, 0x002270, cur->addr >> 12);
-       nv_wr32(priv, 0x002274, 0x01f00000 | (p >> 3));
-
-       if (wait_event_timeout(priv->runlist.wait,
-                              !(nv_rd32(priv, 0x00227c) & 0x00100000),
-                              msecs_to_jiffies(2000)) == 0)
-               nv_error(priv, "runlist update timeout\n");
-       mutex_unlock(&nv_subdev(priv)->mutex);
-}
-
-static int
-nvc0_fifo_context_attach(struct nouveau_object *parent,
-                        struct nouveau_object *object)
-{
-       struct nouveau_bar *bar = nouveau_bar(parent);
-       struct nvc0_fifo_base *base = (void *)parent->parent;
-       struct nouveau_engctx *ectx = (void *)object;
-       u32 addr;
-       int ret;
-
-       switch (nv_engidx(object->engine)) {
-       case NVDEV_ENGINE_SW    : return 0;
-       case NVDEV_ENGINE_GR    : addr = 0x0210; break;
-       case NVDEV_ENGINE_CE0   : addr = 0x0230; break;
-       case NVDEV_ENGINE_CE1   : addr = 0x0240; break;
-       case NVDEV_ENGINE_MSVLD : addr = 0x0270; break;
-       case NVDEV_ENGINE_MSPDEC: addr = 0x0250; break;
-       case NVDEV_ENGINE_MSPPP : addr = 0x0260; break;
-       default:
-               return -EINVAL;
-       }
-
-       if (!ectx->vma.node) {
-               ret = nouveau_gpuobj_map_vm(nv_gpuobj(ectx), base->vm,
-                                           NV_MEM_ACCESS_RW, &ectx->vma);
-               if (ret)
-                       return ret;
-
-               nv_engctx(ectx)->addr = nv_gpuobj(base)->addr >> 12;
-       }
-
-       nv_wo32(base, addr + 0x00, lower_32_bits(ectx->vma.offset) | 4);
-       nv_wo32(base, addr + 0x04, upper_32_bits(ectx->vma.offset));
-       bar->flush(bar);
-       return 0;
-}
-
-static int
-nvc0_fifo_context_detach(struct nouveau_object *parent, bool suspend,
-                        struct nouveau_object *object)
-{
-       struct nouveau_bar *bar = nouveau_bar(parent);
-       struct nvc0_fifo_priv *priv = (void *)parent->engine;
-       struct nvc0_fifo_base *base = (void *)parent->parent;
-       struct nvc0_fifo_chan *chan = (void *)parent;
-       u32 addr;
-
-       switch (nv_engidx(object->engine)) {
-       case NVDEV_ENGINE_SW    : return 0;
-       case NVDEV_ENGINE_GR    : addr = 0x0210; break;
-       case NVDEV_ENGINE_CE0   : addr = 0x0230; break;
-       case NVDEV_ENGINE_CE1   : addr = 0x0240; break;
-       case NVDEV_ENGINE_MSVLD : addr = 0x0270; break;
-       case NVDEV_ENGINE_MSPDEC: addr = 0x0250; break;
-       case NVDEV_ENGINE_MSPPP : addr = 0x0260; break;
-       default:
-               return -EINVAL;
-       }
-
-       nv_wr32(priv, 0x002634, chan->base.chid);
-       if (!nv_wait(priv, 0x002634, 0xffffffff, chan->base.chid)) {
-               nv_error(priv, "channel %d [%s] kick timeout\n",
-                        chan->base.chid, nouveau_client_name(chan));
-               if (suspend)
-                       return -EBUSY;
-       }
-
-       nv_wo32(base, addr + 0x00, 0x00000000);
-       nv_wo32(base, addr + 0x04, 0x00000000);
-       bar->flush(bar);
-       return 0;
-}
-
-static int
-nvc0_fifo_chan_ctor(struct nouveau_object *parent,
-                   struct nouveau_object *engine,
-                   struct nouveau_oclass *oclass, void *data, u32 size,
-                   struct nouveau_object **pobject)
-{
-       union {
-               struct nv50_channel_gpfifo_v0 v0;
-       } *args = data;
-       struct nouveau_bar *bar = nouveau_bar(parent);
-       struct nvc0_fifo_priv *priv = (void *)engine;
-       struct nvc0_fifo_base *base = (void *)parent;
-       struct nvc0_fifo_chan *chan;
-       u64 usermem, ioffset, ilength;
-       int ret, i;
-
-       nv_ioctl(parent, "create channel gpfifo size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
-               nv_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
-                                "ioffset %016llx ilength %08x\n",
-                        args->v0.version, args->v0.pushbuf, args->v0.ioffset,
-                        args->v0.ilength);
-       } else
-               return ret;
-
-       ret = nouveau_fifo_channel_create(parent, engine, oclass, 1,
-                                         priv->user.bar.offset, 0x1000,
-                                         args->v0.pushbuf,
-                                         (1ULL << NVDEV_ENGINE_SW) |
-                                         (1ULL << NVDEV_ENGINE_GR) |
-                                         (1ULL << NVDEV_ENGINE_CE0) |
-                                         (1ULL << NVDEV_ENGINE_CE1) |
-                                         (1ULL << NVDEV_ENGINE_MSVLD) |
-                                         (1ULL << NVDEV_ENGINE_MSPDEC) |
-                                         (1ULL << NVDEV_ENGINE_MSPPP), &chan);
-       *pobject = nv_object(chan);
-       if (ret)
-               return ret;
-
-       args->v0.chid = chan->base.chid;
-
-       nv_parent(chan)->context_attach = nvc0_fifo_context_attach;
-       nv_parent(chan)->context_detach = nvc0_fifo_context_detach;
-
-       usermem = chan->base.chid * 0x1000;
-       ioffset = args->v0.ioffset;
-       ilength = order_base_2(args->v0.ilength / 8);
-
-       for (i = 0; i < 0x1000; i += 4)
-               nv_wo32(priv->user.mem, usermem + i, 0x00000000);
-
-       nv_wo32(base, 0x08, lower_32_bits(priv->user.mem->addr + usermem));
-       nv_wo32(base, 0x0c, upper_32_bits(priv->user.mem->addr + usermem));
-       nv_wo32(base, 0x10, 0x0000face);
-       nv_wo32(base, 0x30, 0xfffff902);
-       nv_wo32(base, 0x48, lower_32_bits(ioffset));
-       nv_wo32(base, 0x4c, upper_32_bits(ioffset) | (ilength << 16));
-       nv_wo32(base, 0x54, 0x00000002);
-       nv_wo32(base, 0x84, 0x20400000);
-       nv_wo32(base, 0x94, 0x30000001);
-       nv_wo32(base, 0x9c, 0x00000100);
-       nv_wo32(base, 0xa4, 0x1f1f1f1f);
-       nv_wo32(base, 0xa8, 0x1f1f1f1f);
-       nv_wo32(base, 0xac, 0x0000001f);
-       nv_wo32(base, 0xb8, 0xf8000000);
-       nv_wo32(base, 0xf8, 0x10003080); /* 0x002310 */
-       nv_wo32(base, 0xfc, 0x10000010); /* 0x002350 */
-       bar->flush(bar);
-       return 0;
-}
-
-static int
-nvc0_fifo_chan_init(struct nouveau_object *object)
-{
-       struct nouveau_gpuobj *base = nv_gpuobj(object->parent);
-       struct nvc0_fifo_priv *priv = (void *)object->engine;
-       struct nvc0_fifo_chan *chan = (void *)object;
-       u32 chid = chan->base.chid;
-       int ret;
-
-       ret = nouveau_fifo_channel_init(&chan->base);
-       if (ret)
-               return ret;
-
-       nv_wr32(priv, 0x003000 + (chid * 8), 0xc0000000 | base->addr >> 12);
-
-       if (chan->state == STOPPED && (chan->state = RUNNING) == RUNNING) {
-               nv_wr32(priv, 0x003004 + (chid * 8), 0x001f0001);
-               nvc0_fifo_runlist_update(priv);
-       }
-
-       return 0;
-}
-
-static void nvc0_fifo_intr_engine(struct nvc0_fifo_priv *priv);
-
-static int
-nvc0_fifo_chan_fini(struct nouveau_object *object, bool suspend)
-{
-       struct nvc0_fifo_priv *priv = (void *)object->engine;
-       struct nvc0_fifo_chan *chan = (void *)object;
-       u32 chid = chan->base.chid;
-
-       if (chan->state == RUNNING && (chan->state = STOPPED) == STOPPED) {
-               nv_mask(priv, 0x003004 + (chid * 8), 0x00000001, 0x00000000);
-               nvc0_fifo_runlist_update(priv);
-       }
-
-       nvc0_fifo_intr_engine(priv);
-
-       nv_wr32(priv, 0x003000 + (chid * 8), 0x00000000);
-       return nouveau_fifo_channel_fini(&chan->base, suspend);
-}
-
-static struct nouveau_ofuncs
-nvc0_fifo_ofuncs = {
-       .ctor = nvc0_fifo_chan_ctor,
-       .dtor = _nouveau_fifo_channel_dtor,
-       .init = nvc0_fifo_chan_init,
-       .fini = nvc0_fifo_chan_fini,
-       .map  = _nouveau_fifo_channel_map,
-       .rd32 = _nouveau_fifo_channel_rd32,
-       .wr32 = _nouveau_fifo_channel_wr32,
-       .ntfy = _nouveau_fifo_channel_ntfy
-};
-
-static struct nouveau_oclass
-nvc0_fifo_sclass[] = {
-       { FERMI_CHANNEL_GPFIFO, &nvc0_fifo_ofuncs },
-       {}
-};
-
-/*******************************************************************************
- * FIFO context - instmem heap and vm setup
- ******************************************************************************/
-
-static int
-nvc0_fifo_context_ctor(struct nouveau_object *parent,
-                      struct nouveau_object *engine,
-                      struct nouveau_oclass *oclass, void *data, u32 size,
-                      struct nouveau_object **pobject)
-{
-       struct nvc0_fifo_base *base;
-       int ret;
-
-       ret = nouveau_fifo_context_create(parent, engine, oclass, NULL, 0x1000,
-                                         0x1000, NVOBJ_FLAG_ZERO_ALLOC |
-                                         NVOBJ_FLAG_HEAP, &base);
-       *pobject = nv_object(base);
-       if (ret)
-               return ret;
-
-       ret = nouveau_gpuobj_new(nv_object(base), NULL, 0x10000, 0x1000, 0,
-                               &base->pgd);
-       if (ret)
-               return ret;
-
-       nv_wo32(base, 0x0200, lower_32_bits(base->pgd->addr));
-       nv_wo32(base, 0x0204, upper_32_bits(base->pgd->addr));
-       nv_wo32(base, 0x0208, 0xffffffff);
-       nv_wo32(base, 0x020c, 0x000000ff);
-
-       ret = nouveau_vm_ref(nouveau_client(parent)->vm, &base->vm, base->pgd);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
-static void
-nvc0_fifo_context_dtor(struct nouveau_object *object)
-{
-       struct nvc0_fifo_base *base = (void *)object;
-       nouveau_vm_ref(NULL, &base->vm, base->pgd);
-       nouveau_gpuobj_ref(NULL, &base->pgd);
-       nouveau_fifo_context_destroy(&base->base);
-}
-
-static struct nouveau_oclass
-nvc0_fifo_cclass = {
-       .handle = NV_ENGCTX(FIFO, 0xc0),
-       .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nvc0_fifo_context_ctor,
-               .dtor = nvc0_fifo_context_dtor,
-               .init = _nouveau_fifo_context_init,
-               .fini = _nouveau_fifo_context_fini,
-               .rd32 = _nouveau_fifo_context_rd32,
-               .wr32 = _nouveau_fifo_context_wr32,
-       },
-};
-
-/*******************************************************************************
- * PFIFO engine
- ******************************************************************************/
-
-static inline int
-nvc0_fifo_engidx(struct nvc0_fifo_priv *priv, u32 engn)
-{
-       switch (engn) {
-       case NVDEV_ENGINE_GR    : engn = 0; break;
-       case NVDEV_ENGINE_MSVLD : engn = 1; break;
-       case NVDEV_ENGINE_MSPPP : engn = 2; break;
-       case NVDEV_ENGINE_MSPDEC: engn = 3; break;
-       case NVDEV_ENGINE_CE0   : engn = 4; break;
-       case NVDEV_ENGINE_CE1   : engn = 5; break;
-       default:
-               return -1;
-       }
-
-       return engn;
-}
-
-static inline struct nouveau_engine *
-nvc0_fifo_engine(struct nvc0_fifo_priv *priv, u32 engn)
-{
-       switch (engn) {
-       case 0: engn = NVDEV_ENGINE_GR; break;
-       case 1: engn = NVDEV_ENGINE_MSVLD; break;
-       case 2: engn = NVDEV_ENGINE_MSPPP; break;
-       case 3: engn = NVDEV_ENGINE_MSPDEC; break;
-       case 4: engn = NVDEV_ENGINE_CE0; break;
-       case 5: engn = NVDEV_ENGINE_CE1; break;
-       default:
-               return NULL;
-       }
-
-       return nouveau_engine(priv, engn);
-}
-
-static void
-nvc0_fifo_recover_work(struct work_struct *work)
-{
-       struct nvc0_fifo_priv *priv = container_of(work, typeof(*priv), fault);
-       struct nouveau_object *engine;
-       unsigned long flags;
-       u32 engn, engm = 0;
-       u64 mask, todo;
-
-       spin_lock_irqsave(&priv->base.lock, flags);
-       mask = priv->mask;
-       priv->mask = 0ULL;
-       spin_unlock_irqrestore(&priv->base.lock, flags);
-
-       for (todo = mask; engn = __ffs64(todo), todo; todo &= ~(1 << engn))
-               engm |= 1 << nvc0_fifo_engidx(priv, engn);
-       nv_mask(priv, 0x002630, engm, engm);
-
-       for (todo = mask; engn = __ffs64(todo), todo; todo &= ~(1 << engn)) {
-               if ((engine = (void *)nouveau_engine(priv, engn))) {
-                       nv_ofuncs(engine)->fini(engine, false);
-                       WARN_ON(nv_ofuncs(engine)->init(engine));
-               }
-       }
-
-       nvc0_fifo_runlist_update(priv);
-       nv_wr32(priv, 0x00262c, engm);
-       nv_mask(priv, 0x002630, engm, 0x00000000);
-}
-
-static void
-nvc0_fifo_recover(struct nvc0_fifo_priv *priv, struct nouveau_engine *engine,
-                 struct nvc0_fifo_chan *chan)
-{
-       u32 chid = chan->base.chid;
-       unsigned long flags;
-
-       nv_error(priv, "%s engine fault on channel %d, recovering...\n",
-                      nv_subdev(engine)->name, chid);
-
-       nv_mask(priv, 0x003004 + (chid * 0x08), 0x00000001, 0x00000000);
-       chan->state = KILLED;
-
-       spin_lock_irqsave(&priv->base.lock, flags);
-       priv->mask |= 1ULL << nv_engidx(engine);
-       spin_unlock_irqrestore(&priv->base.lock, flags);
-       schedule_work(&priv->fault);
-}
-
-static int
-nvc0_fifo_swmthd(struct nvc0_fifo_priv *priv, u32 chid, u32 mthd, u32 data)
-{
-       struct nvc0_fifo_chan *chan = NULL;
-       struct nouveau_handle *bind;
-       unsigned long flags;
-       int ret = -EINVAL;
-
-       spin_lock_irqsave(&priv->base.lock, flags);
-       if (likely(chid >= priv->base.min && chid <= priv->base.max))
-               chan = (void *)priv->base.channel[chid];
-       if (unlikely(!chan))
-               goto out;
-
-       bind = nouveau_namedb_get_class(nv_namedb(chan), 0x906e);
-       if (likely(bind)) {
-               if (!mthd || !nv_call(bind->object, mthd, data))
-                       ret = 0;
-               nouveau_namedb_put(bind);
-       }
-
-out:
-       spin_unlock_irqrestore(&priv->base.lock, flags);
-       return ret;
-}
-
-static const struct nouveau_enum
-nvc0_fifo_sched_reason[] = {
-       { 0x0a, "CTXSW_TIMEOUT" },
-       {}
-};
-
-static void
-nvc0_fifo_intr_sched_ctxsw(struct nvc0_fifo_priv *priv)
-{
-       struct nouveau_engine *engine;
-       struct nvc0_fifo_chan *chan;
-       u32 engn;
-
-       for (engn = 0; engn < 6; engn++) {
-               u32 stat = nv_rd32(priv, 0x002640 + (engn * 0x04));
-               u32 busy = (stat & 0x80000000);
-               u32 save = (stat & 0x00100000); /* maybe? */
-               u32 unk0 = (stat & 0x00040000);
-               u32 unk1 = (stat & 0x00001000);
-               u32 chid = (stat & 0x0000007f);
-               (void)save;
-
-               if (busy && unk0 && unk1) {
-                       if (!(chan = (void *)priv->base.channel[chid]))
-                               continue;
-                       if (!(engine = nvc0_fifo_engine(priv, engn)))
-                               continue;
-                       nvc0_fifo_recover(priv, engine, chan);
-               }
-       }
-}
-
-static void
-nvc0_fifo_intr_sched(struct nvc0_fifo_priv *priv)
-{
-       u32 intr = nv_rd32(priv, 0x00254c);
-       u32 code = intr & 0x000000ff;
-       const struct nouveau_enum *en;
-       char enunk[6] = "";
-
-       en = nouveau_enum_find(nvc0_fifo_sched_reason, code);
-       if (!en)
-               snprintf(enunk, sizeof(enunk), "UNK%02x", code);
-
-       nv_error(priv, "SCHED_ERROR [ %s ]\n", en ? en->name : enunk);
-
-       switch (code) {
-       case 0x0a:
-               nvc0_fifo_intr_sched_ctxsw(priv);
-               break;
-       default:
-               break;
-       }
-}
-
-static const struct nouveau_enum
-nvc0_fifo_fault_engine[] = {
-       { 0x00, "PGRAPH", NULL, NVDEV_ENGINE_GR },
-       { 0x03, "PEEPHOLE", NULL, NVDEV_ENGINE_IFB },
-       { 0x04, "BAR1", NULL, NVDEV_SUBDEV_BAR },
-       { 0x05, "BAR3", NULL, NVDEV_SUBDEV_INSTMEM },
-       { 0x07, "PFIFO", NULL, NVDEV_ENGINE_FIFO },
-       { 0x10, "PMSVLD", NULL, NVDEV_ENGINE_MSVLD },
-       { 0x11, "PMSPPP", NULL, NVDEV_ENGINE_MSPPP },
-       { 0x13, "PCOUNTER" },
-       { 0x14, "PMSPDEC", NULL, NVDEV_ENGINE_MSPDEC },
-       { 0x15, "PCE0", NULL, NVDEV_ENGINE_CE0 },
-       { 0x16, "PCE1", NULL, NVDEV_ENGINE_CE1 },
-       { 0x17, "PDAEMON" },
-       {}
-};
-
-static const struct nouveau_enum
-nvc0_fifo_fault_reason[] = {
-       { 0x00, "PT_NOT_PRESENT" },
-       { 0x01, "PT_TOO_SHORT" },
-       { 0x02, "PAGE_NOT_PRESENT" },
-       { 0x03, "VM_LIMIT_EXCEEDED" },
-       { 0x04, "NO_CHANNEL" },
-       { 0x05, "PAGE_SYSTEM_ONLY" },
-       { 0x06, "PAGE_READ_ONLY" },
-       { 0x0a, "COMPRESSED_SYSRAM" },
-       { 0x0c, "INVALID_STORAGE_TYPE" },
-       {}
-};
-
-static const struct nouveau_enum
-nvc0_fifo_fault_hubclient[] = {
-       { 0x01, "PCOPY0" },
-       { 0x02, "PCOPY1" },
-       { 0x04, "DISPATCH" },
-       { 0x05, "CTXCTL" },
-       { 0x06, "PFIFO" },
-       { 0x07, "BAR_READ" },
-       { 0x08, "BAR_WRITE" },
-       { 0x0b, "PVP" },
-       { 0x0c, "PMSPPP" },
-       { 0x0d, "PMSVLD" },
-       { 0x11, "PCOUNTER" },
-       { 0x12, "PDAEMON" },
-       { 0x14, "CCACHE" },
-       { 0x15, "CCACHE_POST" },
-       {}
-};
-
-static const struct nouveau_enum
-nvc0_fifo_fault_gpcclient[] = {
-       { 0x01, "TEX" },
-       { 0x0c, "ESETUP" },
-       { 0x0e, "CTXCTL" },
-       { 0x0f, "PROP" },
-       {}
-};
-
-static void
-nvc0_fifo_intr_fault(struct nvc0_fifo_priv *priv, int unit)
-{
-       u32 inst = nv_rd32(priv, 0x002800 + (unit * 0x10));
-       u32 valo = nv_rd32(priv, 0x002804 + (unit * 0x10));
-       u32 vahi = nv_rd32(priv, 0x002808 + (unit * 0x10));
-       u32 stat = nv_rd32(priv, 0x00280c + (unit * 0x10));
-       u32 gpc    = (stat & 0x1f000000) >> 24;
-       u32 client = (stat & 0x00001f00) >> 8;
-       u32 write  = (stat & 0x00000080);
-       u32 hub    = (stat & 0x00000040);
-       u32 reason = (stat & 0x0000000f);
-       struct nouveau_object *engctx = NULL, *object;
-       struct nouveau_engine *engine = NULL;
-       const struct nouveau_enum *er, *eu, *ec;
-       char erunk[6] = "";
-       char euunk[6] = "";
-       char ecunk[6] = "";
-       char gpcid[3] = "";
-
-       er = nouveau_enum_find(nvc0_fifo_fault_reason, reason);
-       if (!er)
-               snprintf(erunk, sizeof(erunk), "UNK%02X", reason);
-
-       eu = nouveau_enum_find(nvc0_fifo_fault_engine, unit);
-       if (eu) {
-               switch (eu->data2) {
-               case NVDEV_SUBDEV_BAR:
-                       nv_mask(priv, 0x001704, 0x00000000, 0x00000000);
-                       break;
-               case NVDEV_SUBDEV_INSTMEM:
-                       nv_mask(priv, 0x001714, 0x00000000, 0x00000000);
-                       break;
-               case NVDEV_ENGINE_IFB:
-                       nv_mask(priv, 0x001718, 0x00000000, 0x00000000);
-                       break;
-               default:
-                       engine = nouveau_engine(priv, eu->data2);
-                       if (engine)
-                               engctx = nouveau_engctx_get(engine, inst);
-                       break;
-               }
-       } else {
-               snprintf(euunk, sizeof(euunk), "UNK%02x", unit);
-       }
-
-       if (hub) {
-               ec = nouveau_enum_find(nvc0_fifo_fault_hubclient, client);
-       } else {
-               ec = nouveau_enum_find(nvc0_fifo_fault_gpcclient, client);
-               snprintf(gpcid, sizeof(gpcid), "%d", gpc);
-       }
-
-       if (!ec)
-               snprintf(ecunk, sizeof(ecunk), "UNK%02x", client);
-
-       nv_error(priv, "%s fault at 0x%010llx [%s] from %s/%s%s%s%s on "
-                      "channel 0x%010llx [%s]\n", write ? "write" : "read",
-                (u64)vahi << 32 | valo, er ? er->name : erunk,
-                eu ? eu->name : euunk, hub ? "" : "GPC", gpcid, hub ? "" : "/",
-                ec ? ec->name : ecunk, (u64)inst << 12,
-                nouveau_client_name(engctx));
-
-       object = engctx;
-       while (object) {
-               switch (nv_mclass(object)) {
-               case FERMI_CHANNEL_GPFIFO:
-                       nvc0_fifo_recover(priv, engine, (void *)object);
-                       break;
-               }
-               object = object->parent;
-       }
-
-       nouveau_engctx_put(engctx);
-}
-
-static const struct nouveau_bitfield
-nvc0_fifo_pbdma_intr[] = {
-/*     { 0x00008000, "" }      seen with null ib push */
-       { 0x00200000, "ILLEGAL_MTHD" },
-       { 0x00800000, "EMPTY_SUBC" },
-       {}
-};
-
-static void
-nvc0_fifo_intr_pbdma(struct nvc0_fifo_priv *priv, int unit)
-{
-       u32 stat = nv_rd32(priv, 0x040108 + (unit * 0x2000));
-       u32 addr = nv_rd32(priv, 0x0400c0 + (unit * 0x2000));
-       u32 data = nv_rd32(priv, 0x0400c4 + (unit * 0x2000));
-       u32 chid = nv_rd32(priv, 0x040120 + (unit * 0x2000)) & 0x7f;
-       u32 subc = (addr & 0x00070000) >> 16;
-       u32 mthd = (addr & 0x00003ffc);
-       u32 show = stat;
-
-       if (stat & 0x00800000) {
-               if (!nvc0_fifo_swmthd(priv, chid, mthd, data))
-                       show &= ~0x00800000;
-       }
-
-       if (show) {
-               nv_error(priv, "PBDMA%d:", unit);
-               nouveau_bitfield_print(nvc0_fifo_pbdma_intr, show);
-               pr_cont("\n");
-               nv_error(priv,
-                        "PBDMA%d: ch %d [%s] subc %d mthd 0x%04x data 0x%08x\n",
-                        unit, chid,
-                        nouveau_client_name_for_fifo_chid(&priv->base, chid),
-                        subc, mthd, data);
-       }
-
-       nv_wr32(priv, 0x0400c0 + (unit * 0x2000), 0x80600008);
-       nv_wr32(priv, 0x040108 + (unit * 0x2000), stat);
-}
-
-static void
-nvc0_fifo_intr_runlist(struct nvc0_fifo_priv *priv)
-{
-       u32 intr = nv_rd32(priv, 0x002a00);
-
-       if (intr & 0x10000000) {
-               wake_up(&priv->runlist.wait);
-               nv_wr32(priv, 0x002a00, 0x10000000);
-               intr &= ~0x10000000;
-       }
-
-       if (intr) {
-               nv_error(priv, "RUNLIST 0x%08x\n", intr);
-               nv_wr32(priv, 0x002a00, intr);
-       }
-}
-
-static void
-nvc0_fifo_intr_engine_unit(struct nvc0_fifo_priv *priv, int engn)
-{
-       u32 intr = nv_rd32(priv, 0x0025a8 + (engn * 0x04));
-       u32 inte = nv_rd32(priv, 0x002628);
-       u32 unkn;
-
-       nv_wr32(priv, 0x0025a8 + (engn * 0x04), intr);
-
-       for (unkn = 0; unkn < 8; unkn++) {
-               u32 ints = (intr >> (unkn * 0x04)) & inte;
-               if (ints & 0x1) {
-                       nouveau_fifo_uevent(&priv->base);
-                       ints &= ~1;
-               }
-               if (ints) {
-                       nv_error(priv, "ENGINE %d %d %01x", engn, unkn, ints);
-                       nv_mask(priv, 0x002628, ints, 0);
-               }
-       }
-}
-
-static void
-nvc0_fifo_intr_engine(struct nvc0_fifo_priv *priv)
-{
-       u32 mask = nv_rd32(priv, 0x0025a4);
-       while (mask) {
-               u32 unit = __ffs(mask);
-               nvc0_fifo_intr_engine_unit(priv, unit);
-               mask &= ~(1 << unit);
-       }
-}
-
-static void
-nvc0_fifo_intr(struct nouveau_subdev *subdev)
-{
-       struct nvc0_fifo_priv *priv = (void *)subdev;
-       u32 mask = nv_rd32(priv, 0x002140);
-       u32 stat = nv_rd32(priv, 0x002100) & mask;
-
-       if (stat & 0x00000001) {
-               u32 intr = nv_rd32(priv, 0x00252c);
-               nv_warn(priv, "INTR 0x00000001: 0x%08x\n", intr);
-               nv_wr32(priv, 0x002100, 0x00000001);
-               stat &= ~0x00000001;
-       }
-
-       if (stat & 0x00000100) {
-               nvc0_fifo_intr_sched(priv);
-               nv_wr32(priv, 0x002100, 0x00000100);
-               stat &= ~0x00000100;
-       }
-
-       if (stat & 0x00010000) {
-               u32 intr = nv_rd32(priv, 0x00256c);
-               nv_warn(priv, "INTR 0x00010000: 0x%08x\n", intr);
-               nv_wr32(priv, 0x002100, 0x00010000);
-               stat &= ~0x00010000;
-       }
-
-       if (stat & 0x01000000) {
-               u32 intr = nv_rd32(priv, 0x00258c);
-               nv_warn(priv, "INTR 0x01000000: 0x%08x\n", intr);
-               nv_wr32(priv, 0x002100, 0x01000000);
-               stat &= ~0x01000000;
-       }
-
-       if (stat & 0x10000000) {
-               u32 mask = nv_rd32(priv, 0x00259c);
-               while (mask) {
-                       u32 unit = __ffs(mask);
-                       nvc0_fifo_intr_fault(priv, unit);
-                       nv_wr32(priv, 0x00259c, (1 << unit));
-                       mask &= ~(1 << unit);
-               }
-               stat &= ~0x10000000;
-       }
-
-       if (stat & 0x20000000) {
-               u32 mask = nv_rd32(priv, 0x0025a0);
-               while (mask) {
-                       u32 unit = __ffs(mask);
-                       nvc0_fifo_intr_pbdma(priv, unit);
-                       nv_wr32(priv, 0x0025a0, (1 << unit));
-                       mask &= ~(1 << unit);
-               }
-               stat &= ~0x20000000;
-       }
-
-       if (stat & 0x40000000) {
-               nvc0_fifo_intr_runlist(priv);
-               stat &= ~0x40000000;
-       }
-
-       if (stat & 0x80000000) {
-               nvc0_fifo_intr_engine(priv);
-               stat &= ~0x80000000;
-       }
-
-       if (stat) {
-               nv_error(priv, "INTR 0x%08x\n", stat);
-               nv_mask(priv, 0x002140, stat, 0x00000000);
-               nv_wr32(priv, 0x002100, stat);
-       }
-}
-
-static void
-nvc0_fifo_uevent_init(struct nvkm_event *event, int type, int index)
-{
-       struct nouveau_fifo *fifo = container_of(event, typeof(*fifo), uevent);
-       nv_mask(fifo, 0x002140, 0x80000000, 0x80000000);
-}
-
-static void
-nvc0_fifo_uevent_fini(struct nvkm_event *event, int type, int index)
-{
-       struct nouveau_fifo *fifo = container_of(event, typeof(*fifo), uevent);
-       nv_mask(fifo, 0x002140, 0x80000000, 0x00000000);
-}
-
-static const struct nvkm_event_func
-nvc0_fifo_uevent_func = {
-       .ctor = nouveau_fifo_uevent_ctor,
-       .init = nvc0_fifo_uevent_init,
-       .fini = nvc0_fifo_uevent_fini,
-};
-
-static int
-nvc0_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
-              struct nouveau_oclass *oclass, void *data, u32 size,
-              struct nouveau_object **pobject)
-{
-       struct nvc0_fifo_priv *priv;
-       int ret;
-
-       ret = nouveau_fifo_create(parent, engine, oclass, 0, 127, &priv);
-       *pobject = nv_object(priv);
-       if (ret)
-               return ret;
-
-       INIT_WORK(&priv->fault, nvc0_fifo_recover_work);
-
-       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x1000, 0x1000, 0,
-                               &priv->runlist.mem[0]);
-       if (ret)
-               return ret;
-
-       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x1000, 0x1000, 0,
-                               &priv->runlist.mem[1]);
-       if (ret)
-               return ret;
-
-       init_waitqueue_head(&priv->runlist.wait);
-
-       ret = nouveau_gpuobj_new(nv_object(priv), NULL, 128 * 0x1000, 0x1000, 0,
-                               &priv->user.mem);
-       if (ret)
-               return ret;
-
-       ret = nouveau_gpuobj_map(priv->user.mem, NV_MEM_ACCESS_RW,
-                               &priv->user.bar);
-       if (ret)
-               return ret;
-
-       ret = nvkm_event_init(&nvc0_fifo_uevent_func, 1, 1, &priv->base.uevent);
-       if (ret)
-               return ret;
-
-       nv_subdev(priv)->unit = 0x00000100;
-       nv_subdev(priv)->intr = nvc0_fifo_intr;
-       nv_engine(priv)->cclass = &nvc0_fifo_cclass;
-       nv_engine(priv)->sclass = nvc0_fifo_sclass;
-       return 0;
-}
-
-static void
-nvc0_fifo_dtor(struct nouveau_object *object)
-{
-       struct nvc0_fifo_priv *priv = (void *)object;
-
-       nouveau_gpuobj_unmap(&priv->user.bar);
-       nouveau_gpuobj_ref(NULL, &priv->user.mem);
-       nouveau_gpuobj_ref(NULL, &priv->runlist.mem[0]);
-       nouveau_gpuobj_ref(NULL, &priv->runlist.mem[1]);
-
-       nouveau_fifo_destroy(&priv->base);
-}
-
-static int
-nvc0_fifo_init(struct nouveau_object *object)
-{
-       struct nvc0_fifo_priv *priv = (void *)object;
-       int ret, i;
-
-       ret = nouveau_fifo_init(&priv->base);
-       if (ret)
-               return ret;
-
-       nv_wr32(priv, 0x000204, 0xffffffff);
-       nv_wr32(priv, 0x002204, 0xffffffff);
-
-       priv->spoon_nr = hweight32(nv_rd32(priv, 0x002204));
-       nv_debug(priv, "%d PBDMA unit(s)\n", priv->spoon_nr);
-
-       /* assign engines to PBDMAs */
-       if (priv->spoon_nr >= 3) {
-               nv_wr32(priv, 0x002208, ~(1 << 0)); /* PGRAPH */
-               nv_wr32(priv, 0x00220c, ~(1 << 1)); /* PVP */
-               nv_wr32(priv, 0x002210, ~(1 << 1)); /* PMSPP */
-               nv_wr32(priv, 0x002214, ~(1 << 1)); /* PMSVLD */
-               nv_wr32(priv, 0x002218, ~(1 << 2)); /* PCE0 */
-               nv_wr32(priv, 0x00221c, ~(1 << 1)); /* PCE1 */
-       }
-
-       /* PBDMA[n] */
-       for (i = 0; i < priv->spoon_nr; i++) {
-               nv_mask(priv, 0x04013c + (i * 0x2000), 0x10000100, 0x00000000);
-               nv_wr32(priv, 0x040108 + (i * 0x2000), 0xffffffff); /* INTR */
-               nv_wr32(priv, 0x04010c + (i * 0x2000), 0xfffffeff); /* INTREN */
-       }
-
-       nv_mask(priv, 0x002200, 0x00000001, 0x00000001);
-       nv_wr32(priv, 0x002254, 0x10000000 | priv->user.bar.offset >> 12);
-
-       nv_wr32(priv, 0x002100, 0xffffffff);
-       nv_wr32(priv, 0x002140, 0x7fffffff);
-       nv_wr32(priv, 0x002628, 0x00000001); /* ENGINE_INTR_EN */
-       return 0;
-}
-
-struct nouveau_oclass *
-nvc0_fifo_oclass = &(struct nouveau_oclass) {
-       .handle = NV_ENGINE(FIFO, 0xc0),
-       .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nvc0_fifo_ctor,
-               .dtor = nvc0_fifo_dtor,
-               .init = nvc0_fifo_init,
-               .fini = _nouveau_fifo_fini,
-       },
-};
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.c
deleted file mode 100644 (file)
index f5965eb..0000000
+++ /dev/null
@@ -1,1146 +0,0 @@
-/*
- * Copyright 2012 Red Hat Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors: Ben Skeggs
- */
-
-#include <core/client.h>
-#include <core/handle.h>
-#include <core/namedb.h>
-#include <core/gpuobj.h>
-#include <core/engctx.h>
-#include <core/event.h>
-#include <nvif/unpack.h>
-#include <nvif/class.h>
-#include <core/enum.h>
-
-#include <subdev/timer.h>
-#include <subdev/bar.h>
-#include <subdev/fb.h>
-#include <subdev/mmu.h>
-
-#include <engine/dmaobj.h>
-
-#include "nve0.h"
-
-#define _(a,b) { (a), ((1ULL << (a)) | (b)) }
-static const struct {
-       u64 subdev;
-       u64 mask;
-} fifo_engine[] = {
-       _(NVDEV_ENGINE_GR      , (1ULL << NVDEV_ENGINE_SW) |
-                                (1ULL << NVDEV_ENGINE_CE2)),
-       _(NVDEV_ENGINE_MSPDEC  , 0),
-       _(NVDEV_ENGINE_MSPPP   , 0),
-       _(NVDEV_ENGINE_MSVLD   , 0),
-       _(NVDEV_ENGINE_CE0     , 0),
-       _(NVDEV_ENGINE_CE1     , 0),
-       _(NVDEV_ENGINE_MSENC   , 0),
-};
-#undef _
-#define FIFO_ENGINE_NR ARRAY_SIZE(fifo_engine)
-
-struct nve0_fifo_engn {
-       struct nouveau_gpuobj *runlist[2];
-       int cur_runlist;
-       wait_queue_head_t wait;
-};
-
-struct nve0_fifo_priv {
-       struct nouveau_fifo base;
-
-       struct work_struct fault;
-       u64 mask;
-
-       struct nve0_fifo_engn engine[FIFO_ENGINE_NR];
-       struct {
-               struct nouveau_gpuobj *mem;
-               struct nouveau_vma bar;
-       } user;
-       int spoon_nr;
-};
-
-struct nve0_fifo_base {
-       struct nouveau_fifo_base base;
-       struct nouveau_gpuobj *pgd;
-       struct nouveau_vm *vm;
-};
-
-struct nve0_fifo_chan {
-       struct nouveau_fifo_chan base;
-       u32 engine;
-       enum {
-               STOPPED,
-               RUNNING,
-               KILLED
-       } state;
-};
-
-/*******************************************************************************
- * FIFO channel objects
- ******************************************************************************/
-
-static void
-nve0_fifo_runlist_update(struct nve0_fifo_priv *priv, u32 engine)
-{
-       struct nouveau_bar *bar = nouveau_bar(priv);
-       struct nve0_fifo_engn *engn = &priv->engine[engine];
-       struct nouveau_gpuobj *cur;
-       int i, p;
-
-       mutex_lock(&nv_subdev(priv)->mutex);
-       cur = engn->runlist[engn->cur_runlist];
-       engn->cur_runlist = !engn->cur_runlist;
-
-       for (i = 0, p = 0; i < priv->base.max; i++) {
-               struct nve0_fifo_chan *chan = (void *)priv->base.channel[i];
-               if (chan && chan->state == RUNNING && chan->engine == engine) {
-                       nv_wo32(cur, p + 0, i);
-                       nv_wo32(cur, p + 4, 0x00000000);
-                       p += 8;
-               }
-       }
-       bar->flush(bar);
-
-       nv_wr32(priv, 0x002270, cur->addr >> 12);
-       nv_wr32(priv, 0x002274, (engine << 20) | (p >> 3));
-
-       if (wait_event_timeout(engn->wait, !(nv_rd32(priv, 0x002284 +
-                              (engine * 0x08)) & 0x00100000),
-                               msecs_to_jiffies(2000)) == 0)
-               nv_error(priv, "runlist %d update timeout\n", engine);
-       mutex_unlock(&nv_subdev(priv)->mutex);
-}
-
-static int
-nve0_fifo_context_attach(struct nouveau_object *parent,
-                        struct nouveau_object *object)
-{
-       struct nouveau_bar *bar = nouveau_bar(parent);
-       struct nve0_fifo_base *base = (void *)parent->parent;
-       struct nouveau_engctx *ectx = (void *)object;
-       u32 addr;
-       int ret;
-
-       switch (nv_engidx(object->engine)) {
-       case NVDEV_ENGINE_SW   :
-               return 0;
-       case NVDEV_ENGINE_CE0:
-       case NVDEV_ENGINE_CE1:
-       case NVDEV_ENGINE_CE2:
-               nv_engctx(ectx)->addr = nv_gpuobj(base)->addr >> 12;
-               return 0;
-       case NVDEV_ENGINE_GR    : addr = 0x0210; break;
-       case NVDEV_ENGINE_MSVLD : addr = 0x0270; break;
-       case NVDEV_ENGINE_MSPDEC: addr = 0x0250; break;
-       case NVDEV_ENGINE_MSPPP : addr = 0x0260; break;
-       default:
-               return -EINVAL;
-       }
-
-       if (!ectx->vma.node) {
-               ret = nouveau_gpuobj_map_vm(nv_gpuobj(ectx), base->vm,
-                                           NV_MEM_ACCESS_RW, &ectx->vma);
-               if (ret)
-                       return ret;
-
-               nv_engctx(ectx)->addr = nv_gpuobj(base)->addr >> 12;
-       }
-
-       nv_wo32(base, addr + 0x00, lower_32_bits(ectx->vma.offset) | 4);
-       nv_wo32(base, addr + 0x04, upper_32_bits(ectx->vma.offset));
-       bar->flush(bar);
-       return 0;
-}
-
-static int
-nve0_fifo_context_detach(struct nouveau_object *parent, bool suspend,
-                        struct nouveau_object *object)
-{
-       struct nouveau_bar *bar = nouveau_bar(parent);
-       struct nve0_fifo_priv *priv = (void *)parent->engine;
-       struct nve0_fifo_base *base = (void *)parent->parent;
-       struct nve0_fifo_chan *chan = (void *)parent;
-       u32 addr;
-
-       switch (nv_engidx(object->engine)) {
-       case NVDEV_ENGINE_SW    : return 0;
-       case NVDEV_ENGINE_CE0   :
-       case NVDEV_ENGINE_CE1   :
-       case NVDEV_ENGINE_CE2   : addr = 0x0000; break;
-       case NVDEV_ENGINE_GR    : addr = 0x0210; break;
-       case NVDEV_ENGINE_MSVLD : addr = 0x0270; break;
-       case NVDEV_ENGINE_MSPDEC: addr = 0x0250; break;
-       case NVDEV_ENGINE_MSPPP : addr = 0x0260; break;
-       default:
-               return -EINVAL;
-       }
-
-       nv_wr32(priv, 0x002634, chan->base.chid);
-       if (!nv_wait(priv, 0x002634, 0xffffffff, chan->base.chid)) {
-               nv_error(priv, "channel %d [%s] kick timeout\n",
-                        chan->base.chid, nouveau_client_name(chan));
-               if (suspend)
-                       return -EBUSY;
-       }
-
-       if (addr) {
-               nv_wo32(base, addr + 0x00, 0x00000000);
-               nv_wo32(base, addr + 0x04, 0x00000000);
-               bar->flush(bar);
-       }
-
-       return 0;
-}
-
-static int
-nve0_fifo_chan_ctor(struct nouveau_object *parent,
-                   struct nouveau_object *engine,
-                   struct nouveau_oclass *oclass, void *data, u32 size,
-                   struct nouveau_object **pobject)
-{
-       union {
-               struct kepler_channel_gpfifo_a_v0 v0;
-       } *args = data;
-       struct nouveau_bar *bar = nouveau_bar(parent);
-       struct nve0_fifo_priv *priv = (void *)engine;
-       struct nve0_fifo_base *base = (void *)parent;
-       struct nve0_fifo_chan *chan;
-       u64 usermem, ioffset, ilength;
-       int ret, i;
-
-       nv_ioctl(parent, "create channel gpfifo size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
-               nv_ioctl(parent, "create channel gpfifo vers %d pushbuf %08x "
-                                "ioffset %016llx ilength %08x engine %08x\n",
-                        args->v0.version, args->v0.pushbuf, args->v0.ioffset,
-                        args->v0.ilength, args->v0.engine);
-       } else
-               return ret;
-
-       for (i = 0; i < FIFO_ENGINE_NR; i++) {
-               if (args->v0.engine & (1 << i)) {
-                       if (nouveau_engine(parent, fifo_engine[i].subdev)) {
-                               args->v0.engine = (1 << i);
-                               break;
-                       }
-               }
-       }
-
-       if (i == FIFO_ENGINE_NR) {
-               nv_error(priv, "unsupported engines 0x%08x\n", args->v0.engine);
-               return -ENODEV;
-       }
-
-       ret = nouveau_fifo_channel_create(parent, engine, oclass, 1,
-                                         priv->user.bar.offset, 0x200,
-                                         args->v0.pushbuf,
-                                         fifo_engine[i].mask, &chan);
-       *pobject = nv_object(chan);
-       if (ret)
-               return ret;
-
-       args->v0.chid = chan->base.chid;
-
-       nv_parent(chan)->context_attach = nve0_fifo_context_attach;
-       nv_parent(chan)->context_detach = nve0_fifo_context_detach;
-       chan->engine = i;
-
-       usermem = chan->base.chid * 0x200;
-       ioffset = args->v0.ioffset;
-       ilength = order_base_2(args->v0.ilength / 8);
-
-       for (i = 0; i < 0x200; i += 4)
-               nv_wo32(priv->user.mem, usermem + i, 0x00000000);
-
-       nv_wo32(base, 0x08, lower_32_bits(priv->user.mem->addr + usermem));
-       nv_wo32(base, 0x0c, upper_32_bits(priv->user.mem->addr + usermem));
-       nv_wo32(base, 0x10, 0x0000face);
-       nv_wo32(base, 0x30, 0xfffff902);
-       nv_wo32(base, 0x48, lower_32_bits(ioffset));
-       nv_wo32(base, 0x4c, upper_32_bits(ioffset) | (ilength << 16));
-       nv_wo32(base, 0x84, 0x20400000);
-       nv_wo32(base, 0x94, 0x30000001);
-       nv_wo32(base, 0x9c, 0x00000100);
-       nv_wo32(base, 0xac, 0x0000001f);
-       nv_wo32(base, 0xe8, chan->base.chid);
-       nv_wo32(base, 0xb8, 0xf8000000);
-       nv_wo32(base, 0xf8, 0x10003080); /* 0x002310 */
-       nv_wo32(base, 0xfc, 0x10000010); /* 0x002350 */
-       bar->flush(bar);
-       return 0;
-}
-
-static int
-nve0_fifo_chan_init(struct nouveau_object *object)
-{
-       struct nouveau_gpuobj *base = nv_gpuobj(object->parent);
-       struct nve0_fifo_priv *priv = (void *)object->engine;
-       struct nve0_fifo_chan *chan = (void *)object;
-       u32 chid = chan->base.chid;
-       int ret;
-
-       ret = nouveau_fifo_channel_init(&chan->base);
-       if (ret)
-               return ret;
-
-       nv_mask(priv, 0x800004 + (chid * 8), 0x000f0000, chan->engine << 16);
-       nv_wr32(priv, 0x800000 + (chid * 8), 0x80000000 | base->addr >> 12);
-
-       if (chan->state == STOPPED && (chan->state = RUNNING) == RUNNING) {
-               nv_mask(priv, 0x800004 + (chid * 8), 0x00000400, 0x00000400);
-               nve0_fifo_runlist_update(priv, chan->engine);
-               nv_mask(priv, 0x800004 + (chid * 8), 0x00000400, 0x00000400);
-       }
-
-       return 0;
-}
-
-static int
-nve0_fifo_chan_fini(struct nouveau_object *object, bool suspend)
-{
-       struct nve0_fifo_priv *priv = (void *)object->engine;
-       struct nve0_fifo_chan *chan = (void *)object;
-       u32 chid = chan->base.chid;
-
-       if (chan->state == RUNNING && (chan->state = STOPPED) == STOPPED) {
-               nv_mask(priv, 0x800004 + (chid * 8), 0x00000800, 0x00000800);
-               nve0_fifo_runlist_update(priv, chan->engine);
-       }
-
-       nv_wr32(priv, 0x800000 + (chid * 8), 0x00000000);
-       return nouveau_fifo_channel_fini(&chan->base, suspend);
-}
-
-static struct nouveau_ofuncs
-nve0_fifo_ofuncs = {
-       .ctor = nve0_fifo_chan_ctor,
-       .dtor = _nouveau_fifo_channel_dtor,
-       .init = nve0_fifo_chan_init,
-       .fini = nve0_fifo_chan_fini,
-       .map  = _nouveau_fifo_channel_map,
-       .rd32 = _nouveau_fifo_channel_rd32,
-       .wr32 = _nouveau_fifo_channel_wr32,
-       .ntfy = _nouveau_fifo_channel_ntfy
-};
-
-static struct nouveau_oclass
-nve0_fifo_sclass[] = {
-       { KEPLER_CHANNEL_GPFIFO_A, &nve0_fifo_ofuncs },
-       {}
-};
-
-/*******************************************************************************
- * FIFO context - instmem heap and vm setup
- ******************************************************************************/
-
-static int
-nve0_fifo_context_ctor(struct nouveau_object *parent,
-                   struct nouveau_object *engine,
-                   struct nouveau_oclass *oclass, void *data, u32 size,
-                   struct nouveau_object **pobject)
-{
-       struct nve0_fifo_base *base;
-       int ret;
-
-       ret = nouveau_fifo_context_create(parent, engine, oclass, NULL, 0x1000,
-                                         0x1000, NVOBJ_FLAG_ZERO_ALLOC, &base);
-       *pobject = nv_object(base);
-       if (ret)
-               return ret;
-
-       ret = nouveau_gpuobj_new(nv_object(base), NULL, 0x10000, 0x1000, 0,
-                               &base->pgd);
-       if (ret)
-               return ret;
-
-       nv_wo32(base, 0x0200, lower_32_bits(base->pgd->addr));
-       nv_wo32(base, 0x0204, upper_32_bits(base->pgd->addr));
-       nv_wo32(base, 0x0208, 0xffffffff);
-       nv_wo32(base, 0x020c, 0x000000ff);
-
-       ret = nouveau_vm_ref(nouveau_client(parent)->vm, &base->vm, base->pgd);
-       if (ret)
-               return ret;
-
-       return 0;
-}
-
-static void
-nve0_fifo_context_dtor(struct nouveau_object *object)
-{
-       struct nve0_fifo_base *base = (void *)object;
-       nouveau_vm_ref(NULL, &base->vm, base->pgd);
-       nouveau_gpuobj_ref(NULL, &base->pgd);
-       nouveau_fifo_context_destroy(&base->base);
-}
-
-static struct nouveau_oclass
-nve0_fifo_cclass = {
-       .handle = NV_ENGCTX(FIFO, 0xe0),
-       .ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nve0_fifo_context_ctor,
-               .dtor = nve0_fifo_context_dtor,
-               .init = _nouveau_fifo_context_init,
-               .fini = _nouveau_fifo_context_fini,
-               .rd32 = _nouveau_fifo_context_rd32,
-               .wr32 = _nouveau_fifo_context_wr32,
-       },
-};
-
-/*******************************************************************************
- * PFIFO engine
- ******************************************************************************/
-
-static inline int
-nve0_fifo_engidx(struct nve0_fifo_priv *priv, u32 engn)
-{
-       switch (engn) {
-       case NVDEV_ENGINE_GR    :
-       case NVDEV_ENGINE_CE2   : engn = 0; break;
-       case NVDEV_ENGINE_MSVLD : engn = 1; break;
-       case NVDEV_ENGINE_MSPPP : engn = 2; break;
-       case NVDEV_ENGINE_MSPDEC: engn = 3; break;
-       case NVDEV_ENGINE_CE0   : engn = 4; break;
-       case NVDEV_ENGINE_CE1   : engn = 5; break;
-       case NVDEV_ENGINE_MSENC : engn = 6; break;
-       default:
-               return -1;
-       }
-
-       return engn;
-}
-
-static inline struct nouveau_engine *
-nve0_fifo_engine(struct nve0_fifo_priv *priv, u32 engn)
-{
-       if (engn >= ARRAY_SIZE(fifo_engine))
-               return NULL;
-       return nouveau_engine(priv, fifo_engine[engn].subdev);
-}
-
-static void
-nve0_fifo_recover_work(struct work_struct *work)
-{
-       struct nve0_fifo_priv *priv = container_of(work, typeof(*priv), fault);
-       struct nouveau_object *engine;
-       unsigned long flags;
-       u32 engn, engm = 0;
-       u64 mask, todo;
-
-       spin_lock_irqsave(&priv->base.lock, flags);
-       mask = priv->mask;
-       priv->mask = 0ULL;
-       spin_unlock_irqrestore(&priv->base.lock, flags);
-
-       for (todo = mask; engn = __ffs64(todo), todo; todo &= ~(1 << engn))
-               engm |= 1 << nve0_fifo_engidx(priv, engn);
-       nv_mask(priv, 0x002630, engm, engm);
-
-       for (todo = mask; engn = __ffs64(todo), todo; todo &= ~(1 << engn)) {
-               if ((engine = (void *)nouveau_engine(priv, engn))) {
-                       nv_ofuncs(engine)->fini(engine, false);
-                       WARN_ON(nv_ofuncs(engine)->init(engine));
-               }
-               nve0_fifo_runlist_update(priv, nve0_fifo_engidx(priv, engn));
-       }
-
-       nv_wr32(priv, 0x00262c, engm);
-       nv_mask(priv, 0x002630, engm, 0x00000000);
-}
-
-static void
-nve0_fifo_recover(struct nve0_fifo_priv *priv, struct nouveau_engine *engine,
-                 struct nve0_fifo_chan *chan)
-{
-       u32 chid = chan->base.chid;
-       unsigned long flags;
-
-       nv_error(priv, "%s engine fault on channel %d, recovering...\n",
-                      nv_subdev(engine)->name, chid);
-
-       nv_mask(priv, 0x800004 + (chid * 0x08), 0x00000800, 0x00000800);
-       chan->state = KILLED;
-
-       spin_lock_irqsave(&priv->base.lock, flags);
-       priv->mask |= 1ULL << nv_engidx(engine);
-       spin_unlock_irqrestore(&priv->base.lock, flags);
-       schedule_work(&priv->fault);
-}
-
-static int
-nve0_fifo_swmthd(struct nve0_fifo_priv *priv, u32 chid, u32 mthd, u32 data)
-{
-       struct nve0_fifo_chan *chan = NULL;
-       struct nouveau_handle *bind;
-       unsigned long flags;
-       int ret = -EINVAL;
-
-       spin_lock_irqsave(&priv->base.lock, flags);
-       if (likely(chid >= priv->base.min && chid <= priv->base.max))
-               chan = (void *)priv->base.channel[chid];
-       if (unlikely(!chan))
-               goto out;
-
-       bind = nouveau_namedb_get_class(nv_namedb(chan), 0x906e);
-       if (likely(bind)) {
-               if (!mthd || !nv_call(bind->object, mthd, data))
-                       ret = 0;
-               nouveau_namedb_put(bind);
-       }
-
-out:
-       spin_unlock_irqrestore(&priv->base.lock, flags);
-       return ret;
-}
-
-static const struct nouveau_enum
-nve0_fifo_bind_reason[] = {
-       { 0x01, "BIND_NOT_UNBOUND" },
-       { 0x02, "SNOOP_WITHOUT_BAR1" },
-       { 0x03, "UNBIND_WHILE_RUNNING" },
-       { 0x05, "INVALID_RUNLIST" },
-       { 0x06, "INVALID_CTX_TGT" },
-       { 0x0b, "UNBIND_WHILE_PARKED" },
-       {}
-};
-
-static void
-nve0_fifo_intr_bind(struct nve0_fifo_priv *priv)
-{
-       u32 intr = nv_rd32(priv, 0x00252c);
-       u32 code = intr & 0x000000ff;
-       const struct nouveau_enum *en;
-       char enunk[6] = "";
-
-       en = nouveau_enum_find(nve0_fifo_bind_reason, code);
-       if (!en)
-               snprintf(enunk, sizeof(enunk), "UNK%02x", code);
-
-       nv_error(priv, "BIND_ERROR [ %s ]\n", en ? en->name : enunk);
-}
-
-static const struct nouveau_enum
-nve0_fifo_sched_reason[] = {
-       { 0x0a, "CTXSW_TIMEOUT" },
-       {}
-};
-
-static void
-nve0_fifo_intr_sched_ctxsw(struct nve0_fifo_priv *priv)
-{
-       struct nouveau_engine *engine;
-       struct nve0_fifo_chan *chan;
-       u32 engn;
-
-       for (engn = 0; engn < ARRAY_SIZE(fifo_engine); engn++) {
-               u32 stat = nv_rd32(priv, 0x002640 + (engn * 0x04));
-               u32 busy = (stat & 0x80000000);
-               u32 next = (stat & 0x07ff0000) >> 16;
-               u32 chsw = (stat & 0x00008000);
-               u32 save = (stat & 0x00004000);
-               u32 load = (stat & 0x00002000);
-               u32 prev = (stat & 0x000007ff);
-               u32 chid = load ? next : prev;
-               (void)save;
-
-               if (busy && chsw) {
-                       if (!(chan = (void *)priv->base.channel[chid]))
-                               continue;
-                       if (!(engine = nve0_fifo_engine(priv, engn)))
-                               continue;
-                       nve0_fifo_recover(priv, engine, chan);
-               }
-       }
-}
-
-static void
-nve0_fifo_intr_sched(struct nve0_fifo_priv *priv)
-{
-       u32 intr = nv_rd32(priv, 0x00254c);
-       u32 code = intr & 0x000000ff;
-       const struct nouveau_enum *en;
-       char enunk[6] = "";
-
-       en = nouveau_enum_find(nve0_fifo_sched_reason, code);
-       if (!en)
-               snprintf(enunk, sizeof(enunk), "UNK%02x", code);
-
-       nv_error(priv, "SCHED_ERROR [ %s ]\n", en ? en->name : enunk);
-
-       switch (code) {
-       case 0x0a:
-               nve0_fifo_intr_sched_ctxsw(priv);
-               break;
-       default:
-               break;
-       }
-}
-
-static void
-nve0_fifo_intr_chsw(struct nve0_fifo_priv *priv)
-{
-       u32 stat = nv_rd32(priv, 0x00256c);
-       nv_error(priv, "CHSW_ERROR 0x%08x\n", stat);
-       nv_wr32(priv, 0x00256c, stat);
-}
-
-static void
-nve0_fifo_intr_dropped_fault(struct nve0_fifo_priv *priv)
-{
-       u32 stat = nv_rd32(priv, 0x00259c);
-       nv_error(priv, "DROPPED_MMU_FAULT 0x%08x\n", stat);
-}
-
-static const struct nouveau_enum
-nve0_fifo_fault_engine[] = {
-       { 0x00, "GR", NULL, NVDEV_ENGINE_GR },
-       { 0x03, "IFB", NULL, NVDEV_ENGINE_IFB },
-       { 0x04, "BAR1", NULL, NVDEV_SUBDEV_BAR },
-       { 0x05, "BAR3", NULL, NVDEV_SUBDEV_INSTMEM },
-       { 0x07, "PBDMA0", NULL, NVDEV_ENGINE_FIFO },
-       { 0x08, "PBDMA1", NULL, NVDEV_ENGINE_FIFO },
-       { 0x09, "PBDMA2", NULL, NVDEV_ENGINE_FIFO },
-       { 0x10, "MSVLD", NULL, NVDEV_ENGINE_MSVLD },
-       { 0x11, "MSPPP", NULL, NVDEV_ENGINE_MSPPP },
-       { 0x13, "PERF" },
-       { 0x14, "MSPDEC", NULL, NVDEV_ENGINE_MSPDEC },
-       { 0x15, "CE0", NULL, NVDEV_ENGINE_CE0 },
-       { 0x16, "CE1", NULL, NVDEV_ENGINE_CE1 },
-       { 0x17, "PMU" },
-       { 0x19, "MSENC", NULL, NVDEV_ENGINE_MSENC },
-       { 0x1b, "CE2", NULL, NVDEV_ENGINE_CE2 },
-       {}
-};
-
-static const struct nouveau_enum
-nve0_fifo_fault_reason[] = {
-       { 0x00, "PDE" },
-       { 0x01, "PDE_SIZE" },
-       { 0x02, "PTE" },
-       { 0x03, "VA_LIMIT_VIOLATION" },
-       { 0x04, "UNBOUND_INST_BLOCK" },
-       { 0x05, "PRIV_VIOLATION" },
-       { 0x06, "RO_VIOLATION" },
-       { 0x07, "WO_VIOLATION" },
-       { 0x08, "PITCH_MASK_VIOLATION" },
-       { 0x09, "WORK_CREATION" },
-       { 0x0a, "UNSUPPORTED_APERTURE" },
-       { 0x0b, "COMPRESSION_FAILURE" },
-       { 0x0c, "UNSUPPORTED_KIND" },
-       { 0x0d, "REGION_VIOLATION" },
-       { 0x0e, "BOTH_PTES_VALID" },
-       { 0x0f, "INFO_TYPE_POISONED" },
-       {}
-};
-
-static const struct nouveau_enum
-nve0_fifo_fault_hubclient[] = {
-       { 0x00, "VIP" },
-       { 0x01, "CE0" },
-       { 0x02, "CE1" },
-       { 0x03, "DNISO" },
-       { 0x04, "FE" },
-       { 0x05, "FECS" },
-       { 0x06, "HOST" },
-       { 0x07, "HOST_CPU" },
-       { 0x08, "HOST_CPU_NB" },
-       { 0x09, "ISO" },
-       { 0x0a, "MMU" },
-       { 0x0b, "MSPDEC" },
-       { 0x0c, "MSPPP" },
-       { 0x0d, "MSVLD" },
-       { 0x0e, "NISO" },
-       { 0x0f, "P2P" },
-       { 0x10, "PD" },
-       { 0x11, "PERF" },
-       { 0x12, "PMU" },
-       { 0x13, "RASTERTWOD" },
-       { 0x14, "SCC" },
-       { 0x15, "SCC_NB" },
-       { 0x16, "SEC" },
-       { 0x17, "SSYNC" },
-       { 0x18, "GR_CE" },
-       { 0x19, "CE2" },
-       { 0x1a, "XV" },
-       { 0x1b, "MMU_NB" },
-       { 0x1c, "MSENC" },
-       { 0x1d, "DFALCON" },
-       { 0x1e, "SKED" },
-       { 0x1f, "AFALCON" },
-       {}
-};
-
-static const struct nouveau_enum
-nve0_fifo_fault_gpcclient[] = {
-       { 0x00, "L1_0" }, { 0x01, "T1_0" }, { 0x02, "PE_0" },
-       { 0x03, "L1_1" }, { 0x04, "T1_1" }, { 0x05, "PE_1" },
-       { 0x06, "L1_2" }, { 0x07, "T1_2" }, { 0x08, "PE_2" },
-       { 0x09, "L1_3" }, { 0x0a, "T1_3" }, { 0x0b, "PE_3" },
-       { 0x0c, "RAST" },
-       { 0x0d, "GCC" },
-       { 0x0e, "GPCCS" },
-       { 0x0f, "PROP_0" },
-       { 0x10, "PROP_1" },
-       { 0x11, "PROP_2" },
-       { 0x12, "PROP_3" },
-       { 0x13, "L1_4" }, { 0x14, "T1_4" }, { 0x15, "PE_4" },
-       { 0x16, "L1_5" }, { 0x17, "T1_5" }, { 0x18, "PE_5" },
-       { 0x19, "L1_6" }, { 0x1a, "T1_6" }, { 0x1b, "PE_6" },
-       { 0x1c, "L1_7" }, { 0x1d, "T1_7" }, { 0x1e, "PE_7" },
-       { 0x1f, "GPM" },
-       { 0x20, "LTP_UTLB_0" },
-       { 0x21, "LTP_UTLB_1" },
-       { 0x22, "LTP_UTLB_2" },
-       { 0x23, "LTP_UTLB_3" },
-       { 0x24, "GPC_RGG_UTLB" },
-       {}
-};
-
-static void
-nve0_fifo_intr_fault(struct nve0_fifo_priv *priv, int unit)
-{
-       u32 inst = nv_rd32(priv, 0x002800 + (unit * 0x10));
-       u32 valo = nv_rd32(priv, 0x002804 + (unit * 0x10));
-       u32 vahi = nv_rd32(priv, 0x002808 + (unit * 0x10));
-       u32 stat = nv_rd32(priv, 0x00280c + (unit * 0x10));
-       u32 gpc    = (stat & 0x1f000000) >> 24;
-       u32 client = (stat & 0x00001f00) >> 8;
-       u32 write  = (stat & 0x00000080);
-       u32 hub    = (stat & 0x00000040);
-       u32 reason = (stat & 0x0000000f);
-       struct nouveau_object *engctx = NULL, *object;
-       struct nouveau_engine *engine = NULL;
-       const struct nouveau_enum *er, *eu, *ec;
-       char erunk[6] = "";
-       char euunk[6] = "";
-       char ecunk[6] = "";
-       char gpcid[3] = "";
-
-       er = nouveau_enum_find(nve0_fifo_fault_reason, reason);
-       if (!er)
-               snprintf(erunk, sizeof(erunk), "UNK%02X", reason);
-
-       eu = nouveau_enum_find(nve0_fifo_fault_engine, unit);
-       if (eu) {
-               switch (eu->data2) {
-               case NVDEV_SUBDEV_BAR:
-                       nv_mask(priv, 0x001704, 0x00000000, 0x00000000);
-                       break;
-               case NVDEV_SUBDEV_INSTMEM:
-                       nv_mask(priv, 0x001714, 0x00000000, 0x00000000);
-                       break;
-               case NVDEV_ENGINE_IFB:
-                       nv_mask(priv, 0x001718, 0x00000000, 0x00000000);
-                       break;
-               default:
-                       engine = nouveau_engine(priv, eu->data2);
-                       if (engine)
-                               engctx = nouveau_engctx_get(engine, inst);
-                       break;
-               }
-       } else {
-               snprintf(euunk, sizeof(euunk), "UNK%02x", unit);
-       }
-
-       if (hub) {
-               ec = nouveau_enum_find(nve0_fifo_fault_hubclient, client);
-       } else {
-               ec = nouveau_enum_find(nve0_fifo_fault_gpcclient, client);
-               snprintf(gpcid, sizeof(gpcid), "%d", gpc);
-       }
-
-       if (!ec)
-               snprintf(ecunk, sizeof(ecunk), "UNK%02x", client);
-
-       nv_error(priv, "%s fault at 0x%010llx [%s] from %s/%s%s%s%s on "
-                      "channel 0x%010llx [%s]\n", write ? "write" : "read",
-                (u64)vahi << 32 | valo, er ? er->name : erunk,
-                eu ? eu->name : euunk, hub ? "" : "GPC", gpcid, hub ? "" : "/",
-                ec ? ec->name : ecunk, (u64)inst << 12,
-                nouveau_client_name(engctx));
-
-       object = engctx;
-       while (object) {
-               switch (nv_mclass(object)) {
-               case KEPLER_CHANNEL_GPFIFO_A:
-                       nve0_fifo_recover(priv, engine, (void *)object);
-                       break;
-               }
-               object = object->parent;
-       }
-
-       nouveau_engctx_put(engctx);
-}
-
-static const struct nouveau_bitfield nve0_fifo_pbdma_intr_0[] = {
-       { 0x00000001, "MEMREQ" },
-       { 0x00000002, "MEMACK_TIMEOUT" },
-       { 0x00000004, "MEMACK_EXTRA" },
-       { 0x00000008, "MEMDAT_TIMEOUT" },
-       { 0x00000010, "MEMDAT_EXTRA" },
-       { 0x00000020, "MEMFLUSH" },
-       { 0x00000040, "MEMOP" },
-       { 0x00000080, "LBCONNECT" },
-       { 0x00000100, "LBREQ" },
-       { 0x00000200, "LBACK_TIMEOUT" },
-       { 0x00000400, "LBACK_EXTRA" },
-       { 0x00000800, "LBDAT_TIMEOUT" },
-       { 0x00001000, "LBDAT_EXTRA" },
-       { 0x00002000, "GPFIFO" },
-       { 0x00004000, "GPPTR" },
-       { 0x00008000, "GPENTRY" },
-       { 0x00010000, "GPCRC" },
-       { 0x00020000, "PBPTR" },
-       { 0x00040000, "PBENTRY" },
-       { 0x00080000, "PBCRC" },
-       { 0x00100000, "XBARCONNECT" },
-       { 0x00200000, "METHOD" },
-       { 0x00400000, "METHODCRC" },
-       { 0x00800000, "DEVICE" },
-       { 0x02000000, "SEMAPHORE" },
-       { 0x04000000, "ACQUIRE" },
-       { 0x08000000, "PRI" },
-       { 0x20000000, "NO_CTXSW_SEG" },
-       { 0x40000000, "PBSEG" },
-       { 0x80000000, "SIGNATURE" },
-       {}
-};
-
-static void
-nve0_fifo_intr_pbdma_0(struct nve0_fifo_priv *priv, int unit)
-{
-       u32 mask = nv_rd32(priv, 0x04010c + (unit * 0x2000));
-       u32 stat = nv_rd32(priv, 0x040108 + (unit * 0x2000)) & mask;
-       u32 addr = nv_rd32(priv, 0x0400c0 + (unit * 0x2000));
-       u32 data = nv_rd32(priv, 0x0400c4 + (unit * 0x2000));
-       u32 chid = nv_rd32(priv, 0x040120 + (unit * 0x2000)) & 0xfff;
-       u32 subc = (addr & 0x00070000) >> 16;
-       u32 mthd = (addr & 0x00003ffc);
-       u32 show = stat;
-
-       if (stat & 0x00800000) {
-               if (!nve0_fifo_swmthd(priv, chid, mthd, data))
-                       show &= ~0x00800000;
-               nv_wr32(priv, 0x0400c0 + (unit * 0x2000), 0x80600008);
-       }
-
-       if (show) {
-               nv_error(priv, "PBDMA%d:", unit);
-               nouveau_bitfield_print(nve0_fifo_pbdma_intr_0, show);
-               pr_cont("\n");
-               nv_error(priv,
-                        "PBDMA%d: ch %d [%s] subc %d mthd 0x%04x data 0x%08x\n",
-                        unit, chid,
-                        nouveau_client_name_for_fifo_chid(&priv->base, chid),
-                        subc, mthd, data);
-       }
-
-       nv_wr32(priv, 0x040108 + (unit * 0x2000), stat);
-}
-
-static const struct nouveau_bitfield nve0_fifo_pbdma_intr_1[] = {
-       { 0x00000001, "HCE_RE_ILLEGAL_OP" },
-       { 0x00000002, "HCE_RE_ALIGNB" },
-       { 0x00000004, "HCE_PRIV" },
-       { 0x00000008, "HCE_ILLEGAL_MTHD" },
-       { 0x00000010, "HCE_ILLEGAL_CLASS" },
-       {}
-};
-
-static void
-nve0_fifo_intr_pbdma_1(struct nve0_fifo_priv *priv, int unit)
-{
-       u32 mask = nv_rd32(priv, 0x04014c + (unit * 0x2000));
-       u32 stat = nv_rd32(priv, 0x040148 + (unit * 0x2000)) & mask;
-       u32 chid = nv_rd32(priv, 0x040120 + (unit * 0x2000)) & 0xfff;
-
-       if (stat) {
-               nv_error(priv, "PBDMA%d:", unit);
-               nouveau_bitfield_print(nve0_fifo_pbdma_intr_1, stat);
-               pr_cont("\n");
-               nv_error(priv, "PBDMA%d: ch %d %08x %08x\n", unit, chid,
-                        nv_rd32(priv, 0x040150 + (unit * 0x2000)),
-                        nv_rd32(priv, 0x040154 + (unit * 0x2000)));
-       }
-
-       nv_wr32(priv, 0x040148 + (unit * 0x2000), stat);
-}
-
-static void
-nve0_fifo_intr_runlist(struct nve0_fifo_priv *priv)
-{
-       u32 mask = nv_rd32(priv, 0x002a00);
-       while (mask) {
-               u32 engn = __ffs(mask);
-               wake_up(&priv->engine[engn].wait);
-               nv_wr32(priv, 0x002a00, 1 << engn);
-               mask &= ~(1 << engn);
-       }
-}
-
-static void
-nve0_fifo_intr_engine(struct nve0_fifo_priv *priv)
-{
-       nouveau_fifo_uevent(&priv->base);
-}
-
-static void
-nve0_fifo_intr(struct nouveau_subdev *subdev)
-{
-       struct nve0_fifo_priv *priv = (void *)subdev;
-       u32 mask = nv_rd32(priv, 0x002140);
-       u32 stat = nv_rd32(priv, 0x002100) & mask;
-
-       if (stat & 0x00000001) {
-               nve0_fifo_intr_bind(priv);
-               nv_wr32(priv, 0x002100, 0x00000001);
-               stat &= ~0x00000001;
-       }
-
-       if (stat & 0x00000010) {
-               nv_error(priv, "PIO_ERROR\n");
-               nv_wr32(priv, 0x002100, 0x00000010);
-               stat &= ~0x00000010;
-       }
-
-       if (stat & 0x00000100) {
-               nve0_fifo_intr_sched(priv);
-               nv_wr32(priv, 0x002100, 0x00000100);
-               stat &= ~0x00000100;
-       }
-
-       if (stat & 0x00010000) {
-               nve0_fifo_intr_chsw(priv);
-               nv_wr32(priv, 0x002100, 0x00010000);
-               stat &= ~0x00010000;
-       }
-
-       if (stat & 0x00800000) {
-               nv_error(priv, "FB_FLUSH_TIMEOUT\n");
-               nv_wr32(priv, 0x002100, 0x00800000);
-               stat &= ~0x00800000;
-       }
-
-       if (stat & 0x01000000) {
-               nv_error(priv, "LB_ERROR\n");
-               nv_wr32(priv, 0x002100, 0x01000000);
-               stat &= ~0x01000000;
-       }
-
-       if (stat & 0x08000000) {
-               nve0_fifo_intr_dropped_fault(priv);
-               nv_wr32(priv, 0x002100, 0x08000000);
-               stat &= ~0x08000000;
-       }
-
-       if (stat & 0x10000000) {
-               u32 mask = nv_rd32(priv, 0x00259c);
-               while (mask) {
-                       u32 unit = __ffs(mask);
-                       nve0_fifo_intr_fault(priv, unit);
-                       nv_wr32(priv, 0x00259c, (1 << unit));
-                       mask &= ~(1 << unit);
-               }
-               stat &= ~0x10000000;
-       }
-
-       if (stat & 0x20000000) {
-               u32 mask = nv_rd32(priv, 0x0025a0);
-               while (mask) {
-                       u32 unit = __ffs(mask);
-                       nve0_fifo_intr_pbdma_0(priv, unit);
-                       nve0_fifo_intr_pbdma_1(priv, unit);
-                       nv_wr32(priv, 0x0025a0, (1 << unit));
-                       mask &= ~(1 << unit);
-               }
-               stat &= ~0x20000000;
-       }
-
-       if (stat & 0x40000000) {
-               nve0_fifo_intr_runlist(priv);
-               stat &= ~0x40000000;
-       }
-
-       if (stat & 0x80000000) {
-               nv_wr32(priv, 0x002100, 0x80000000);
-               nve0_fifo_intr_engine(priv);
-               stat &= ~0x80000000;
-       }
-
-       if (stat) {
-               nv_error(priv, "INTR 0x%08x\n", stat);
-               nv_mask(priv, 0x002140, stat, 0x00000000);
-               nv_wr32(priv, 0x002100, stat);
-       }
-}
-
-static void
-nve0_fifo_uevent_init(struct nvkm_event *event, int type, int index)
-{
-       struct nouveau_fifo *fifo = container_of(event, typeof(*fifo), uevent);
-       nv_mask(fifo, 0x002140, 0x80000000, 0x80000000);
-}
-
-static void
-nve0_fifo_uevent_fini(struct nvkm_event *event, int type, int index)
-{
-       struct nouveau_fifo *fifo = container_of(event, typeof(*fifo), uevent);
-       nv_mask(fifo, 0x002140, 0x80000000, 0x00000000);
-}
-
-static const struct nvkm_event_func
-nve0_fifo_uevent_func = {
-       .ctor = nouveau_fifo_uevent_ctor,
-       .init = nve0_fifo_uevent_init,
-       .fini = nve0_fifo_uevent_fini,
-};
-
-int
-nve0_fifo_fini(struct nouveau_object *object, bool suspend)
-{
-       struct nve0_fifo_priv *priv = (void *)object;
-       int ret;
-
-       ret = nouveau_fifo_fini(&priv->base, suspend);
-       if (ret)
-               return ret;
-
-       /* allow mmu fault interrupts, even when we're not using fifo */
-       nv_mask(priv, 0x002140, 0x10000000, 0x10000000);
-       return 0;
-}
-
-int
-nve0_fifo_init(struct nouveau_object *object)
-{
-       struct nve0_fifo_priv *priv = (void *)object;
-       int ret, i;
-
-       ret = nouveau_fifo_init(&priv->base);
-       if (ret)
-               return ret;
-
-       /* enable all available PBDMA units */
-       nv_wr32(priv, 0x000204, 0xffffffff);
-       priv->spoon_nr = hweight32(nv_rd32(priv, 0x000204));
-       nv_debug(priv, "%d PBDMA unit(s)\n", priv->spoon_nr);
-
-       /* PBDMA[n] */
-       for (i = 0; i < priv->spoon_nr; i++) {
-               nv_mask(priv, 0x04013c + (i * 0x2000), 0x10000100, 0x00000000);
-               nv_wr32(priv, 0x040108 + (i * 0x2000), 0xffffffff); /* INTR */
-               nv_wr32(priv, 0x04010c + (i * 0x2000), 0xfffffeff); /* INTREN */
-       }
-
-       /* PBDMA[n].HCE */
-       for (i = 0; i < priv->spoon_nr; i++) {
-               nv_wr32(priv, 0x040148 + (i * 0x2000), 0xffffffff); /* INTR */
-               nv_wr32(priv, 0x04014c + (i * 0x2000), 0xffffffff); /* INTREN */
-       }
-
-       nv_wr32(priv, 0x002254, 0x10000000 | priv->user.bar.offset >> 12);
-
-       nv_wr32(priv, 0x002100, 0xffffffff);
-       nv_wr32(priv, 0x002140, 0x7fffffff);
-       return 0;
-}
-
-void
-nve0_fifo_dtor(struct nouveau_object *object)
-{
-       struct nve0_fifo_priv *priv = (void *)object;
-       int i;
-
-       nouveau_gpuobj_unmap(&priv->user.bar);
-       nouveau_gpuobj_ref(NULL, &priv->user.mem);
-
-       for (i = 0; i < FIFO_ENGINE_NR; i++) {
-               nouveau_gpuobj_ref(NULL, &priv->engine[i].runlist[1]);
-               nouveau_gpuobj_ref(NULL, &priv->engine[i].runlist[0]);
-       }
-
-       nouveau_fifo_destroy(&priv->base);
-}
-
-int
-nve0_fifo_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
-              struct nouveau_oclass *oclass, void *data, u32 size,
-              struct nouveau_object **pobject)
-{
-       struct nve0_fifo_impl *impl = (void *)oclass;
-       struct nve0_fifo_priv *priv;
-       int ret, i;
-
-       ret = nouveau_fifo_create(parent, engine, oclass, 0,
-                                 impl->channels - 1, &priv);
-       *pobject = nv_object(priv);
-       if (ret)
-               return ret;
-
-       INIT_WORK(&priv->fault, nve0_fifo_recover_work);
-
-       for (i = 0; i < FIFO_ENGINE_NR; i++) {
-               ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x8000, 0x1000,
-                                        0, &priv->engine[i].runlist[0]);
-               if (ret)
-                       return ret;
-
-               ret = nouveau_gpuobj_new(nv_object(priv), NULL, 0x8000, 0x1000,
-                                        0, &priv->engine[i].runlist[1]);
-               if (ret)
-                       return ret;
-
-               init_waitqueue_head(&priv->engine[i].wait);
-       }
-
-       ret = nouveau_gpuobj_new(nv_object(priv), NULL, impl->channels * 0x200,
-                               0x1000, NVOBJ_FLAG_ZERO_ALLOC, &priv->user.mem);
-       if (ret)
-               return ret;
-
-       ret = nouveau_gpuobj_map(priv->user.mem, NV_MEM_ACCESS_RW,
-                               &priv->user.bar);
-       if (ret)
-               return ret;
-
-       ret = nvkm_event_init(&nve0_fifo_uevent_func, 1, 1, &priv->base.uevent);
-       if (ret)
-               return ret;
-
-       nv_subdev(priv)->unit = 0x00000100;
-       nv_subdev(priv)->intr = nve0_fifo_intr;
-       nv_engine(priv)->cclass = &nve0_fifo_cclass;
-       nv_engine(priv)->sclass = nve0_fifo_sclass;
-       return 0;
-}
-
-struct nouveau_oclass *
-nve0_fifo_oclass = &(struct nve0_fifo_impl) {
-       .base.handle = NV_ENGINE(FIFO, 0xe0),
-       .base.ofuncs = &(struct nouveau_ofuncs) {
-               .ctor = nve0_fifo_ctor,
-               .dtor = nve0_fifo_dtor,
-               .init = nve0_fifo_init,
-               .fini = nve0_fifo_fini,
-       },
-       .channels = 4096,
-}.base;
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.h
deleted file mode 100644 (file)
index e96b32b..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __NVKM_FIFO_NVE0_H__
-#define __NVKM_FIFO_NVE0_H__
-
-#include <engine/fifo.h>
-
-int  nve0_fifo_ctor(struct nouveau_object *, struct nouveau_object *,
-                   struct nouveau_oclass *, void *, u32,
-                   struct nouveau_object **);
-void nve0_fifo_dtor(struct nouveau_object *);
-int  nve0_fifo_init(struct nouveau_object *);
-int  nve0_fifo_fini(struct nouveau_object *, bool);
-
-struct nve0_fifo_impl {
-       struct nouveau_oclass base;
-       u32 channels;
-};
-
-#endif