core: move falcon class to engine/

Not really "core" per-se.  About to merge Ilia's work adding another
similar class for the VP2 xtensa engines, so, seems like a good time to
move all these to engine/.

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

12 files changed, 23 insertions, 25 deletions

diff --git a/nvkm/core/Makefile.am b/nvkm/core/Makefile.am
index e040610f..eab35dee 100644
--- a/nvkm/core/Makefile.am
+++ b/nvkm/core/Makefile.am
@@ -9,7 +9,6 @@ libcore_la_SOURCES = client.c \
 		     engine.c \
 		     enum.c \
 		     event.c \
-		     falcon.c \
 		     gpuobj.c \
 		     handle.c \
 		     mm.c \
diff --git a/nvkm/engine/Makefile.am b/nvkm/engine/Makefile.am
index 761512dc..d5ad3893 100644
--- a/nvkm/engine/Makefile.am
+++ b/nvkm/engine/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = dmaobj bsp copy crypt device disp fifo graph mpeg ppp software vp
 
 noinst_LTLIBRARIES = libengine.la
 
-libengine_la_SOURCES =
+libengine_la_SOURCES = falcon.c
 libengine_la_LIBADD  = bsp/libbsp.la \
 		       copy/libcopy.la \
 		       crypt/libcrypt.la \
@@ -15,3 +15,5 @@ libengine_la_LIBADD  = bsp/libbsp.la \
 		       ppp/libppp.la \
 		       software/libsoftware.la \
 		       vp/libvp.la
+
+include $(srcdir)/Makefile.engine
diff --git a/nvkm/engine/bsp/nvc0.c b/nvkm/engine/bsp/nvc0.c
index 0a5aa6bb..262c9f5f 100644
--- a/nvkm/engine/bsp/nvc0.c
+++ b/nvkm/engine/bsp/nvc0.c
@@ -22,8 +22,7 @@
  * Authors: Maarten Lankhorst
  */
 
-#include <core/falcon.h>
-
+#include <engine/falcon.h>
 #include <engine/bsp.h>
 
 struct nvc0_bsp_priv {
diff --git a/nvkm/engine/bsp/nve0.c b/nvkm/engine/bsp/nve0.c
index d4f23bbd..c46882c8 100644
--- a/nvkm/engine/bsp/nve0.c
+++ b/nvkm/engine/bsp/nve0.c
@@ -22,8 +22,7 @@
  * Authors: Ben Skeggs
  */
 
-#include <core/falcon.h>
-
+#include <engine/falcon.h>
 #include <engine/bsp.h>
 
 struct nve0_bsp_priv {
diff --git a/nvkm/engine/copy/nva3.c b/nvkm/engine/copy/nva3.c
index 85f2e03d..f3152773 100644
--- a/nvkm/engine/copy/nva3.c
+++ b/nvkm/engine/copy/nva3.c
@@ -22,16 +22,17 @@
  * Authors: Ben Skeggs
  */
 
-#include <core/client.h>
-#include <core/falcon.h>
-#include <core/class.h>
-#include <core/enum.h>
+#include <engine/falcon.h>
+#include <engine/fifo.h>
+#include <engine/copy.h>
 
 #include <subdev/fb.h>
 #include <subdev/vm.h>
 
-#include <engine/fifo.h>
-#include <engine/copy.h>
+#include <core/client.h>
+#include <core/class.h>
+#include <core/enum.h>
+
 
 #include "fuc/nva3.fuc.h"
 
diff --git a/nvkm/engine/copy/nvc0.c b/nvkm/engine/copy/nvc0.c
index b3ed2737..993df09a 100644
--- a/nvkm/engine/copy/nvc0.c
+++ b/nvkm/engine/copy/nvc0.c
@@ -22,13 +22,15 @@
  * Authors: Ben Skeggs
  */
 
-#include <core/falcon.h>
-#include <core/class.h>
-#include <core/enum.h>
-
+#include <engine/falcon.h>
 #include <engine/fifo.h>
 #include <engine/copy.h>
 
+#include <core/class.h>
+#include <core/enum.h>
+#include <core/class.h>
+#include <core/enum.h>
+
 #include "fuc/nvc0.fuc.h"
 
 struct nvc0_copy_priv {
diff --git a/nvkm/engine/crypt/nv98.c b/nvkm/engine/crypt/nv98.c
index 83ec3a30..c7082377 100644
--- a/nvkm/engine/crypt/nv98.c
+++ b/nvkm/engine/crypt/nv98.c
@@ -27,11 +27,11 @@
 #include <core/enum.h>
 #include <core/class.h>
 #include <core/engctx.h>
-#include <core/falcon.h>
 
 #include <subdev/timer.h>
 #include <subdev/fb.h>
 
+#include <engine/falcon.h>
 #include <engine/fifo.h>
 #include <engine/crypt.h>
 
diff --git a/nvkm/core/falcon.c b/nvkm/engine/falcon.c
index e05c1577..3c7a31f7 100644
--- a/nvkm/core/falcon.c
+++ b/nvkm/engine/falcon.c
@@ -20,8 +20,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <core/falcon.h>
-
+#include <engine/falcon.h>
 #include <subdev/timer.h>
 
 u32
diff --git a/nvkm/engine/ppp/nvc0.c b/nvkm/engine/ppp/nvc0.c
index ebf0d860..98072c1f 100644
--- a/nvkm/engine/ppp/nvc0.c
+++ b/nvkm/engine/ppp/nvc0.c
@@ -22,8 +22,7 @@
  * Authors: Maarten Lankhorst
  */
 
-#include <core/falcon.h>
-
+#include <engine/falcon.h>
 #include <engine/ppp.h>
 
 struct nvc0_ppp_priv {
diff --git a/nvkm/engine/vp/nvc0.c b/nvkm/engine/vp/nvc0.c
index f761949d..1879229b 100644
--- a/nvkm/engine/vp/nvc0.c
+++ b/nvkm/engine/vp/nvc0.c
@@ -22,8 +22,7 @@
  * Authors: Maarten Lankhorst
  */
 
-#include <core/falcon.h>
-
+#include <engine/falcon.h>
 #include <engine/vp.h>
 
 struct nvc0_vp_priv {
diff --git a/nvkm/engine/vp/nve0.c b/nvkm/engine/vp/nve0.c
index 2384ce5d..d28ecbf7 100644
--- a/nvkm/engine/vp/nve0.c
+++ b/nvkm/engine/vp/nve0.c
@@ -22,8 +22,7 @@
  * Authors: Ben Skeggs
  */
 
-#include <core/falcon.h>
-
+#include <engine/falcon.h>
 #include <engine/vp.h>
 
 struct nve0_vp_priv {
diff --git a/nvkm/include/core/falcon.h b/nvkm/include/engine/falcon.h
index 1edec386..1edec386 100644
--- a/nvkm/include/core/falcon.h
+++ b/nvkm/include/engine/falcon.h