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

Commit 02a841d4 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: restructure source tree, split core from drm implementation 



Future work will be headed in the way of separating the policy supplied by
the nouveau drm module from the mechanisms provided by the driver core.

There will be a couple of major classes (subdev, engine) of driver modules
that have clearly defined tasks, and the further directory structure change
is to reflect this.

No code changes here whatsoever, aside from fixing up a couple of include
file pathnames.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 3a92d37e

drivers/gpu/drm/nouveau/Makefile

+65 −23
Original line number Diff line number Diff line
@@ -3,45 +3,87 @@ 
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



ccflags-y := -Iinclude/drm

nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \

ccflags-y += -I$(src)/core/include

ccflags-y += -I$(src)



nouveau-y := core/core/mm.o

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



nouveau-y += core/subdev/fb/nv04.o

nouveau-y += core/subdev/fb/nv10.o

nouveau-y += core/subdev/fb/nv20.o

nouveau-y += core/subdev/fb/nv30.o

nouveau-y += core/subdev/fb/nv40.o

nouveau-y += core/subdev/fb/nv50.o

nouveau-y += core/subdev/fb/nvc0.o

nouveau-y += core/subdev/fb/nv50_vram.o

nouveau-y += core/subdev/fb/nvc0_vram.o

nouveau-y += core/subdev/gpio/base.o

nouveau-y += core/subdev/gpio/nv10.o

nouveau-y += core/subdev/gpio/nv50.o

nouveau-y += core/subdev/i2c/base.o

nouveau-y += core/subdev/instmem/nv04.o

nouveau-y += core/subdev/instmem/nv50.o

nouveau-y += core/subdev/instmem/nvc0.o

nouveau-y += core/subdev/mc/nv04.o

nouveau-y += core/subdev/mc/nv40.o

nouveau-y += core/subdev/mc/nv50.o

nouveau-y += core/subdev/timer/nv04.o

nouveau-y += core/subdev/vm/base.o

nouveau-y += core/subdev/vm/nv50.o

nouveau-y += core/subdev/vm/nvc0.o



nouveau-y += core/engine/bsp/nv84.o

nouveau-y += core/engine/copy/nva3.o

nouveau-y += core/engine/copy/nvc0.o

nouveau-y += core/engine/crypt/nv84.o

nouveau-y += core/engine/crypt/nv98.o

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

nouveau-y += core/engine/fifo/nv10.o

nouveau-y += core/engine/fifo/nv17.o

nouveau-y += core/engine/fifo/nv40.o

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

nouveau-y += core/engine/fifo/nv84.o

nouveau-y += core/engine/fifo/nvc0.o

nouveau-y += core/engine/fifo/nve0.o

nouveau-y += core/engine/graph/ctxnv40.o

nouveau-y += core/engine/graph/ctxnv50.o

nouveau-y += core/engine/graph/ctxnvc0.o

nouveau-y += core/engine/graph/ctxnve0.o

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

nouveau-y += core/engine/graph/nv10.o

nouveau-y += core/engine/graph/nv20.o

nouveau-y += core/engine/graph/nv40.o

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

nouveau-y += core/engine/graph/nvc0.o

nouveau-y += core/engine/graph/nve0.o

nouveau-y += core/engine/mpeg/nv31.o

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

nouveau-y += core/engine/ppp/nv98.o

nouveau-y += core/engine/vp/nv84.o



nouveau-y += nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \

             nouveau_gpuobj.o nouveau_irq.o nouveau_notifier.o \

             nouveau_sgdma.o nouveau_dma.o nouveau_util.o \

             nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \

             nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \

             nouveau_hw.o nouveau_calc.o \

             nouveau_display.o nouveau_connector.o nouveau_fbcon.o \

             nouveau_hdmi.o nouveau_dp.o nouveau_ramht.o \

             nouveau_hdmi.o nouveau_dp.o \

	     nouveau_pm.o nouveau_volt.o nouveau_perf.o nouveau_temp.o \

	     nouveau_mm.o nouveau_vm.o nouveau_mxm.o nouveau_gpio.o \

	     nouveau_mxm.o \

	     nouveau_abi16.o \

             nv04_timer.o \

             nv04_mc.o nv40_mc.o nv50_mc.o \

             nv04_fb.o nv10_fb.o nv20_fb.o nv30_fb.o nv40_fb.o \

             nv50_fb.o nvc0_fb.o \

             nv04_fifo.o nv10_fifo.o nv17_fifo.o nv40_fifo.o nv50_fifo.o \

             nv84_fifo.o nvc0_fifo.o nve0_fifo.o \

	     nouveau_bios.o \

             nv04_fence.o nv10_fence.o nv84_fence.o nvc0_fence.o \

             nv04_software.o nv50_software.o nvc0_software.o \

             nv04_graph.o nv10_graph.o nv20_graph.o \

             nv40_graph.o nv50_graph.o nvc0_graph.o nve0_graph.o \

             nv40_grctx.o nv50_grctx.o nvc0_grctx.o nve0_grctx.o \

             nv84_crypt.o nv98_crypt.o \

             nva3_copy.o nvc0_copy.o \

             nv31_mpeg.o nv50_mpeg.o \

             nv84_bsp.o \

             nv84_vp.o \

             nv98_ppp.o \

             nv04_instmem.o nv50_instmem.o nvc0_instmem.o \

             nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o \

             nv04_crtc.o nv04_display.o nv04_cursor.o \

             nv50_evo.o nv50_crtc.o nv50_dac.o nv50_sor.o \

             nv50_cursor.o nv50_display.o \

             nvd0_display.o \

             nv04_fbcon.o nv50_fbcon.o nvc0_fbcon.o \

             nv10_gpio.o nv50_gpio.o \

	     nv50_calc.o \

	     nv04_pm.o nv40_pm.o nv50_pm.o nva3_pm.o nvc0_pm.o \

	     nv50_vram.o nvc0_vram.o \

	     nv50_vm.o nvc0_vm.o nouveau_prime.o

	     nouveau_prime.o



nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o

nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o

drivers/gpu/drm/nouveau/nouveau_mm.c→drivers/gpu/drm/nouveau/core/core/mm.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include "drmP.h"

#include "nouveau_drv.h"

#include "nouveau_mm.h"

#include <core/mm.h>



static inline void

region_put(struct nouveau_mm *mm, struct nouveau_mm_node *a)

drivers/gpu/drm/nouveau/nouveau_ramht.c→drivers/gpu/drm/nouveau/core/core/ramht.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include "drmP.h"



#include "nouveau_drv.h"

#include "nouveau_ramht.h"

#include <core/ramht.h>



static u32

nouveau_ramht_hash_handle(struct nouveau_channel *chan, u32 handle)

drivers/gpu/drm/nouveau/nv84_bsp.c→drivers/gpu/drm/nouveau/core/engine/bsp/nv84.c

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
#include "drmP.h"

#include "nouveau_drv.h"

#include "nouveau_util.h"

#include "nouveau_vm.h"

#include "nouveau_ramht.h"

#include <subdev/vm.h>

#include <core/ramht.h>



/*XXX: This stub is currently used on NV98+ also, as soon as this becomes

 *     more than just an enable/disable stub this needs to be split out to