Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0fd4ec8 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/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: default avatarBen Skeggs <bskeggs@redhat.com>
parent d2898713

drivers/gpu/drm/nouveau/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ nouveau-y += core/core/engctx.o 
nouveau-y += core/core/engine.o

nouveau-y += core/core/enum.o

nouveau-y += core/core/event.o

nouveau-y += core/core/falcon.o

nouveau-y += core/core/gpuobj.o

nouveau-y += core/core/handle.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/nvc0.o



nouveau-y += core/engine/falcon.o

nouveau-y += core/engine/dmaobj/base.o

nouveau-y += core/engine/dmaobj/nv04.o

nouveau-y += core/engine/dmaobj/nv50.o

drivers/gpu/drm/nouveau/core/engine/bsp/nvc0.c

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ 
 * Authors: Maarten Lankhorst

 */



#include <core/falcon.h>



#include <engine/falcon.h>

#include <engine/bsp.h>



struct nvc0_bsp_priv {

drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ 
 * Authors: Ben Skeggs

 */



#include <core/falcon.h>



#include <engine/falcon.h>

#include <engine/bsp.h>



struct nve0_bsp_priv {

drivers/gpu/drm/nouveau/core/engine/copy/nva3.c

+7 −6
Original line number Diff line number Diff line
@@ -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"

drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c

+6 −4
Original line number Diff line number Diff line
@@ -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 {