lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/nouveau/core: move falcon class to engine/

Browse Source 
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>
This commit is contained in:
Ben Skeggs
2013-06-27 13:59:01 +10:00
parent d2898713fb
commit a0fd4ec8f1
11 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/Makefile
View File

@@ -12,7 +12,6 @@ nouveau-y += core/core/engctx.o
nouveau-y += core/core/engine.o nouveau-y += core/core/engine.o
nouveau-y += core/core/enum.o nouveau-y += core/core/enum.o
nouveau-y += core/core/event.o nouveau-y += core/core/event.o
nouveau-y += core/core/falcon.o
nouveau-y += core/core/gpuobj.o nouveau-y += core/core/gpuobj.o
nouveau-y += core/core/handle.o nouveau-y += core/core/handle.o
nouveau-y += core/core/mm.o nouveau-y += core/core/mm.o
@@ -142,6 +141,7 @@ nouveau-y += core/subdev/vm/nv44.o
nouveau-y += core/subdev/vm/nv50.o nouveau-y += core/subdev/vm/nv50.o
nouveau-y += core/subdev/vm/nvc0.o nouveau-y += core/subdev/vm/nvc0.o
nouveau-y += core/engine/falcon.o
nouveau-y += core/engine/dmaobj/base.o nouveau-y += core/engine/dmaobj/base.o
nouveau-y += core/engine/dmaobj/nv04.o nouveau-y += core/engine/dmaobj/nv04.o
nouveau-y += core/engine/dmaobj/nv50.o nouveau-y += core/engine/dmaobj/nv50.o

3
drivers/gpu/drm/nouveau/core/engine/bsp/nvc0.c
View File

@@ -22,8 +22,7 @@
* Authors: Maarten Lankhorst * Authors: Maarten Lankhorst
*/ */
#include <core/falcon.h> #include <engine/falcon.h>
#include <engine/bsp.h> #include <engine/bsp.h>
struct nvc0_bsp_priv { struct nvc0_bsp_priv {

3
drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c
View File

@@ -22,8 +22,7 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include <core/falcon.h> #include <engine/falcon.h>
#include <engine/bsp.h> #include <engine/bsp.h>
struct nve0_bsp_priv { struct nve0_bsp_priv {

13
drivers/gpu/drm/nouveau/core/engine/copy/nva3.c
View File

@@ -22,16 +22,17 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include <core/client.h> #include <engine/falcon.h>
#include <core/falcon.h> #include <engine/fifo.h>
#include <core/class.h> #include <engine/copy.h>
#include <core/enum.h>
#include <subdev/fb.h> #include <subdev/fb.h>
#include <subdev/vm.h> #include <subdev/vm.h>
#include <engine/fifo.h> #include <core/client.h>
#include <engine/copy.h> #include <core/class.h>
#include <core/enum.h>
#include "fuc/nva3.fuc.h" #include "fuc/nva3.fuc.h"

10
drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c
View File

@@ -22,13 +22,15 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include <core/falcon.h> #include <engine/falcon.h>
#include <core/class.h>
#include <core/enum.h>
#include <engine/fifo.h> #include <engine/fifo.h>
#include <engine/copy.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" #include "fuc/nvc0.fuc.h"
struct nvc0_copy_priv { struct nvc0_copy_priv {

2
drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c
View File

@@ -27,11 +27,11 @@
#include <core/enum.h> #include <core/enum.h>
#include <core/class.h> #include <core/class.h>
#include <core/engctx.h> #include <core/engctx.h>
#include <core/falcon.h>
#include <subdev/timer.h> #include <subdev/timer.h>
#include <subdev/fb.h> #include <subdev/fb.h>
#include <engine/falcon.h>
#include <engine/fifo.h> #include <engine/fifo.h>
#include <engine/crypt.h> #include <engine/crypt.h>

3
drivers/gpu/drm/nouveau/core/core/falcon.c → drivers/gpu/drm/nouveau/core/engine/falcon.c
View File

@@ -20,8 +20,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <core/falcon.h> #include <engine/falcon.h>
#include <subdev/timer.h> #include <subdev/timer.h>
u32 u32

3
drivers/gpu/drm/nouveau/core/engine/ppp/nvc0.c
View File

@@ -22,8 +22,7 @@
* Authors: Maarten Lankhorst * Authors: Maarten Lankhorst
*/ */
#include <core/falcon.h> #include <engine/falcon.h>
#include <engine/ppp.h> #include <engine/ppp.h>
struct nvc0_ppp_priv { struct nvc0_ppp_priv {

3
drivers/gpu/drm/nouveau/core/engine/vp/nvc0.c
View File

@@ -22,8 +22,7 @@
* Authors: Maarten Lankhorst * Authors: Maarten Lankhorst
*/ */
#include <core/falcon.h> #include <engine/falcon.h>
#include <engine/vp.h> #include <engine/vp.h>
struct nvc0_vp_priv { struct nvc0_vp_priv {

3
drivers/gpu/drm/nouveau/core/engine/vp/nve0.c
View File

@@ -22,8 +22,7 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include <core/falcon.h> #include <engine/falcon.h>
#include <engine/vp.h> #include <engine/vp.h>
struct nve0_vp_priv { struct nve0_vp_priv {

0
drivers/gpu/drm/nouveau/core/include/core/falcon.h → drivers/gpu/drm/nouveau/core/include/engine/falcon.h
View File