aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-07-04 09:44:54 -0400
committerBen Skeggs <bskeggs@redhat.com>2012-10-02 23:12:43 -0400
commit02a841d434513c7b3620250271c372fabce56de5 (patch)
tree464e7651bc65e8b100ad9eb949729da3d491591a /drivers/gpu/drm
parent3a92d37e4099054fe187b485a9d27c439c10eca7 (diff)
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: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/nouveau/Makefile88
-rw-r--r--drivers/gpu/drm/nouveau/core/core/mm.c (renamed from drivers/gpu/drm/nouveau/nouveau_mm.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/core/ramht.c (renamed from drivers/gpu/drm/nouveau/nouveau_ramht.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/bsp/nv84.c (renamed from drivers/gpu/drm/nouveau/nv84_bsp.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc (renamed from drivers/gpu/drm/nouveau/nva3_copy.fuc)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc.h (renamed from drivers/gpu/drm/nouveau/nva3_copy.fuc.h)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/copy/fuc/nvc0.fuc.h (renamed from drivers/gpu/drm/nouveau/nvc0_copy.fuc.h)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/copy/nva3.c (renamed from drivers/gpu/drm/nouveau/nva3_copy.c)6
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c (renamed from drivers/gpu/drm/nouveau/nvc0_copy.c)6
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc (renamed from drivers/gpu/drm/nouveau/nv98_crypt.fuc)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc.h (renamed from drivers/gpu/drm/nouveau/nv98_crypt.fuc.h)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c (renamed from drivers/gpu/drm/nouveau/nv84_crypt.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c (renamed from drivers/gpu/drm/nouveau/nv98_crypt.c)6
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c (renamed from drivers/gpu/drm/nouveau/nv04_fifo.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c (renamed from drivers/gpu/drm/nouveau/nv10_fifo.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c (renamed from drivers/gpu/drm/nouveau/nv17_fifo.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c (renamed from drivers/gpu/drm/nouveau/nv40_fifo.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c (renamed from drivers/gpu/drm/nouveau/nv50_fifo.c)6
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c (renamed from drivers/gpu/drm/nouveau/nv84_fifo.c)6
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c (renamed from drivers/gpu/drm/nouveau/nvc0_fifo.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c (renamed from drivers/gpu/drm/nouveau/nve0_fifo.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/ctx.h (renamed from drivers/gpu/drm/nouveau/nouveau_grctx.h)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/ctxnv40.c (renamed from drivers/gpu/drm/nouveau/nv40_grctx.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/ctxnv50.c (renamed from drivers/gpu/drm/nouveau/nv50_grctx.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c (renamed from drivers/gpu/drm/nouveau/nvc0_grctx.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/ctxnve0.c (renamed from drivers/gpu/drm/nouveau/nve0_grctx.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc (renamed from drivers/gpu/drm/nouveau/nvc0_grgpc.fuc)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h (renamed from drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc (renamed from drivers/gpu/drm/nouveau/nvc0_grhub.fuc)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h (renamed from drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/fuc/nvc0.fuc (renamed from drivers/gpu/drm/nouveau/nvc0_graph.fuc)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/nv04.c (renamed from drivers/gpu/drm/nouveau/nv04_graph.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/nv10.c (renamed from drivers/gpu/drm/nouveau/nv10_graph.c)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/nv20.c (renamed from drivers/gpu/drm/nouveau/nv20_graph.c)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/nv40.c (renamed from drivers/gpu/drm/nouveau/nv40_graph.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/nv50.c (renamed from drivers/gpu/drm/nouveau/nv50_graph.c)6
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c (renamed from drivers/gpu/drm/nouveau/nvc0_graph.c)10
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h (renamed from drivers/gpu/drm/nouveau/nvc0_graph.h)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/nve0.c (renamed from drivers/gpu/drm/nouveau/nve0_graph.c)6
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/nve0.h (renamed from drivers/gpu/drm/nouveau/nve0_graph.h)0
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c (renamed from drivers/gpu/drm/nouveau/nv31_mpeg.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c (renamed from drivers/gpu/drm/nouveau/nv50_mpeg.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/ppp/nv98.c (renamed from drivers/gpu/drm/nouveau/nv98_ppp.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/vp/nv84.c (renamed from drivers/gpu/drm/nouveau/nv84_vp.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/include/core/mm.h (renamed from drivers/gpu/drm/nouveau/nouveau_mm.h)12
-rw-r--r--drivers/gpu/drm/nouveau/core/include/core/ramht.h (renamed from drivers/gpu/drm/nouveau/nouveau_ramht.h)0
-rw-r--r--drivers/gpu/drm/nouveau/core/include/engine/fifo.h (renamed from drivers/gpu/drm/nouveau/nouveau_fifo.h)0
-rw-r--r--drivers/gpu/drm/nouveau/core/include/subdev/gpio.h (renamed from drivers/gpu/drm/nouveau/nouveau_gpio.h)0
-rw-r--r--drivers/gpu/drm/nouveau/core/include/subdev/i2c.h (renamed from drivers/gpu/drm/nouveau/nouveau_i2c.h)0
-rw-r--r--drivers/gpu/drm/nouveau/core/include/subdev/vm.h (renamed from drivers/gpu/drm/nouveau/nouveau_vm.h)2
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/fb/nv04.c (renamed from drivers/gpu/drm/nouveau/nv04_fb.c)0
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/fb/nv10.c (renamed from drivers/gpu/drm/nouveau/nv10_fb.c)0
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/fb/nv20.c (renamed from drivers/gpu/drm/nouveau/nv20_fb.c)0
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c (renamed from drivers/gpu/drm/nouveau/nv30_fb.c)0
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/fb/nv40.c (renamed from drivers/gpu/drm/nouveau/nv40_fb.c)0
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c (renamed from drivers/gpu/drm/nouveau/nv50_fb.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/fb/nv50_vram.c (renamed from drivers/gpu/drm/nouveau/nv50_vram.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c (renamed from drivers/gpu/drm/nouveau/nvc0_fb.c)0
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/fb/nvc0_vram.c (renamed from drivers/gpu/drm/nouveau/nvc0_vram.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/gpio/base.c (renamed from drivers/gpu/drm/nouveau/nouveau_gpio.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/gpio/nv10.c (renamed from drivers/gpu/drm/nouveau/nv10_gpio.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c (renamed from drivers/gpu/drm/nouveau/nv50_gpio.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/i2c/base.c (renamed from drivers/gpu/drm/nouveau/nouveau_i2c.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c (renamed from drivers/gpu/drm/nouveau/nv04_instmem.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c (renamed from drivers/gpu/drm/nouveau/nv50_instmem.c)3
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/instmem/nvc0.c (renamed from drivers/gpu/drm/nouveau/nvc0_instmem.c)3
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c (renamed from drivers/gpu/drm/nouveau/nv04_mc.c)0
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/mc/nv40.c (renamed from drivers/gpu/drm/nouveau/nv40_mc.c)0
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c (renamed from drivers/gpu/drm/nouveau/nv50_mc.c)0
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c (renamed from drivers/gpu/drm/nouveau/nv04_timer.c)0
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/vm/base.c (renamed from drivers/gpu/drm/nouveau/nouveau_vm.c)4
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/vm/nv50.c (renamed from drivers/gpu/drm/nouveau/nv50_vm.c)2
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/vm/nvc0.c (renamed from drivers/gpu/drm/nouveau/nvc0_vm.c)2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_abi16.c2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bios.c2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bios.h2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bo.c6
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_channel.c4
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_connector.c2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_connector.h2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_display.c2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_dma.c2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_dp.c4
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.c2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_drv.h16
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_fence.c2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_gpuobj.c6
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_irq.c2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_mem.c6
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_notifier.c2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_pm.c2
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_state.c6
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_volt.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv04_dac.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv04_fbcon.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv04_fence.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv04_software.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv10_fence.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv17_tv.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv40_pm.c4
-rw-r--r--drivers/gpu/drm/nouveau/nv50_display.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv50_evo.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv50_fbcon.c4
-rw-r--r--drivers/gpu/drm/nouveau/nv50_pm.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv50_software.c2
-rw-r--r--drivers/gpu/drm/nouveau/nv84_fence.c4
-rw-r--r--drivers/gpu/drm/nouveau/nva3_pm.c2
-rw-r--r--drivers/gpu/drm/nouveau/nvc0_fbcon.c4
-rw-r--r--drivers/gpu/drm/nouveau/nvc0_fence.c4
-rw-r--r--drivers/gpu/drm/nouveau/nvc0_pm.c2
-rw-r--r--drivers/gpu/drm/nouveau/nvc0_software.c2
111 files changed, 208 insertions, 168 deletions
diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
index 1cece6a78f3..40c311e24bc 100644
--- a/drivers/gpu/drm/nouveau/Makefile
+++ b/drivers/gpu/drm/nouveau/Makefile
@@ -3,45 +3,87 @@
3# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. 3# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
4 4
5ccflags-y := -Iinclude/drm 5ccflags-y := -Iinclude/drm
6nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 6ccflags-y += -I$(src)/core/include
7ccflags-y += -I$(src)
8
9nouveau-y := core/core/mm.o
10nouveau-y += core/core/ramht.o
11
12nouveau-y += core/subdev/fb/nv04.o
13nouveau-y += core/subdev/fb/nv10.o
14nouveau-y += core/subdev/fb/nv20.o
15nouveau-y += core/subdev/fb/nv30.o
16nouveau-y += core/subdev/fb/nv40.o
17nouveau-y += core/subdev/fb/nv50.o
18nouveau-y += core/subdev/fb/nvc0.o
19nouveau-y += core/subdev/fb/nv50_vram.o
20nouveau-y += core/subdev/fb/nvc0_vram.o
21nouveau-y += core/subdev/gpio/base.o
22nouveau-y += core/subdev/gpio/nv10.o
23nouveau-y += core/subdev/gpio/nv50.o
24nouveau-y += core/subdev/i2c/base.o
25nouveau-y += core/subdev/instmem/nv04.o
26nouveau-y += core/subdev/instmem/nv50.o
27nouveau-y += core/subdev/instmem/nvc0.o
28nouveau-y += core/subdev/mc/nv04.o
29nouveau-y += core/subdev/mc/nv40.o
30nouveau-y += core/subdev/mc/nv50.o
31nouveau-y += core/subdev/timer/nv04.o
32nouveau-y += core/subdev/vm/base.o
33nouveau-y += core/subdev/vm/nv50.o
34nouveau-y += core/subdev/vm/nvc0.o
35
36nouveau-y += core/engine/bsp/nv84.o
37nouveau-y += core/engine/copy/nva3.o
38nouveau-y += core/engine/copy/nvc0.o
39nouveau-y += core/engine/crypt/nv84.o
40nouveau-y += core/engine/crypt/nv98.o
41nouveau-y += core/engine/fifo/nv04.o
42nouveau-y += core/engine/fifo/nv10.o
43nouveau-y += core/engine/fifo/nv17.o
44nouveau-y += core/engine/fifo/nv40.o
45nouveau-y += core/engine/fifo/nv50.o
46nouveau-y += core/engine/fifo/nv84.o
47nouveau-y += core/engine/fifo/nvc0.o
48nouveau-y += core/engine/fifo/nve0.o
49nouveau-y += core/engine/graph/ctxnv40.o
50nouveau-y += core/engine/graph/ctxnv50.o
51nouveau-y += core/engine/graph/ctxnvc0.o
52nouveau-y += core/engine/graph/ctxnve0.o
53nouveau-y += core/engine/graph/nv04.o
54nouveau-y += core/engine/graph/nv10.o
55nouveau-y += core/engine/graph/nv20.o
56nouveau-y += core/engine/graph/nv40.o
57nouveau-y += core/engine/graph/nv50.o
58nouveau-y += core/engine/graph/nvc0.o
59nouveau-y += core/engine/graph/nve0.o
60nouveau-y += core/engine/mpeg/nv31.o
61nouveau-y += core/engine/mpeg/nv50.o
62nouveau-y += core/engine/ppp/nv98.o
63nouveau-y += core/engine/vp/nv84.o
64
65nouveau-y += nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \
7 nouveau_gpuobj.o nouveau_irq.o nouveau_notifier.o \ 66 nouveau_gpuobj.o nouveau_irq.o nouveau_notifier.o \
8 nouveau_sgdma.o nouveau_dma.o nouveau_util.o \ 67 nouveau_sgdma.o nouveau_dma.o nouveau_util.o \
9 nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \ 68 nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \
10 nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \ 69 nouveau_hw.o nouveau_calc.o \
11 nouveau_display.o nouveau_connector.o nouveau_fbcon.o \ 70 nouveau_display.o nouveau_connector.o nouveau_fbcon.o \
12 nouveau_hdmi.o nouveau_dp.o nouveau_ramht.o \ 71 nouveau_hdmi.o nouveau_dp.o \
13 nouveau_pm.o nouveau_volt.o nouveau_perf.o nouveau_temp.o \ 72 nouveau_pm.o nouveau_volt.o nouveau_perf.o nouveau_temp.o \
14 nouveau_mm.o nouveau_vm.o nouveau_mxm.o nouveau_gpio.o \ 73 nouveau_mxm.o \
15 nouveau_abi16.o \ 74 nouveau_abi16.o \
16 nv04_timer.o \ 75 nouveau_bios.o \
17 nv04_mc.o nv40_mc.o nv50_mc.o \
18 nv04_fb.o nv10_fb.o nv20_fb.o nv30_fb.o nv40_fb.o \
19 nv50_fb.o nvc0_fb.o \
20 nv04_fifo.o nv10_fifo.o nv17_fifo.o nv40_fifo.o nv50_fifo.o \
21 nv84_fifo.o nvc0_fifo.o nve0_fifo.o \
22 nv04_fence.o nv10_fence.o nv84_fence.o nvc0_fence.o \ 76 nv04_fence.o nv10_fence.o nv84_fence.o nvc0_fence.o \
23 nv04_software.o nv50_software.o nvc0_software.o \ 77 nv04_software.o nv50_software.o nvc0_software.o \
24 nv04_graph.o nv10_graph.o nv20_graph.o \
25 nv40_graph.o nv50_graph.o nvc0_graph.o nve0_graph.o \
26 nv40_grctx.o nv50_grctx.o nvc0_grctx.o nve0_grctx.o \
27 nv84_crypt.o nv98_crypt.o \
28 nva3_copy.o nvc0_copy.o \
29 nv31_mpeg.o nv50_mpeg.o \
30 nv84_bsp.o \
31 nv84_vp.o \
32 nv98_ppp.o \
33 nv04_instmem.o nv50_instmem.o nvc0_instmem.o \
34 nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o \ 78 nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o \
35 nv04_crtc.o nv04_display.o nv04_cursor.o \ 79 nv04_crtc.o nv04_display.o nv04_cursor.o \
36 nv50_evo.o nv50_crtc.o nv50_dac.o nv50_sor.o \ 80 nv50_evo.o nv50_crtc.o nv50_dac.o nv50_sor.o \
37 nv50_cursor.o nv50_display.o \ 81 nv50_cursor.o nv50_display.o \
38 nvd0_display.o \ 82 nvd0_display.o \
39 nv04_fbcon.o nv50_fbcon.o nvc0_fbcon.o \ 83 nv04_fbcon.o nv50_fbcon.o nvc0_fbcon.o \
40 nv10_gpio.o nv50_gpio.o \
41 nv50_calc.o \ 84 nv50_calc.o \
42 nv04_pm.o nv40_pm.o nv50_pm.o nva3_pm.o nvc0_pm.o \ 85 nv04_pm.o nv40_pm.o nv50_pm.o nva3_pm.o nvc0_pm.o \
43 nv50_vram.o nvc0_vram.o \ 86 nouveau_prime.o
44 nv50_vm.o nvc0_vm.o nouveau_prime.o
45 87
46nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o 88nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o
47nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o 89nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
diff --git a/drivers/gpu/drm/nouveau/nouveau_mm.c b/drivers/gpu/drm/nouveau/core/core/mm.c
index b29ffb3d140..024dd2c722b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mm.c
+++ b/drivers/gpu/drm/nouveau/core/core/mm.c
@@ -24,7 +24,7 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_mm.h" 27#include <core/mm.h>
28 28
29static inline void 29static inline void
30region_put(struct nouveau_mm *mm, struct nouveau_mm_node *a) 30region_put(struct nouveau_mm *mm, struct nouveau_mm_node *a)
diff --git a/drivers/gpu/drm/nouveau/nouveau_ramht.c b/drivers/gpu/drm/nouveau/core/core/ramht.c
index a24a81f5a89..59c16192f0e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ramht.c
+++ b/drivers/gpu/drm/nouveau/core/core/ramht.c
@@ -25,7 +25,7 @@
25#include "drmP.h" 25#include "drmP.h"
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_ramht.h" 28#include <core/ramht.h>
29 29
30static u32 30static u32
31nouveau_ramht_hash_handle(struct nouveau_channel *chan, u32 handle) 31nouveau_ramht_hash_handle(struct nouveau_channel *chan, u32 handle)
diff --git a/drivers/gpu/drm/nouveau/nv84_bsp.c b/drivers/gpu/drm/nouveau/core/engine/bsp/nv84.c
index 74875739bcc..db3b5736983 100644
--- a/drivers/gpu/drm/nouveau/nv84_bsp.c
+++ b/drivers/gpu/drm/nouveau/core/engine/bsp/nv84.c
@@ -25,8 +25,8 @@
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_util.h" 27#include "nouveau_util.h"
28#include "nouveau_vm.h" 28#include <subdev/vm.h>
29#include "nouveau_ramht.h" 29#include <core/ramht.h>
30 30
31/*XXX: This stub is currently used on NV98+ also, as soon as this becomes 31/*XXX: This stub is currently used on NV98+ also, as soon as this becomes
32 * more than just an enable/disable stub this needs to be split out to 32 * more than just an enable/disable stub this needs to be split out to
diff --git a/drivers/gpu/drm/nouveau/nva3_copy.fuc b/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc
index 219850d5328..219850d5328 100644
--- a/drivers/gpu/drm/nouveau/nva3_copy.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc
diff --git a/drivers/gpu/drm/nouveau/nva3_copy.fuc.h b/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc.h
index 37d6de3c9d6..37d6de3c9d6 100644
--- a/drivers/gpu/drm/nouveau/nva3_copy.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc.h
diff --git a/drivers/gpu/drm/nouveau/nvc0_copy.fuc.h b/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nvc0.fuc.h
index cd879f31bb3..cd879f31bb3 100644
--- a/drivers/gpu/drm/nouveau/nvc0_copy.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nvc0.fuc.h
diff --git a/drivers/gpu/drm/nouveau/nva3_copy.c b/drivers/gpu/drm/nouveau/core/engine/copy/nva3.c
index 0387dc7f4f4..fec52463456 100644
--- a/drivers/gpu/drm/nouveau/nva3_copy.c
+++ b/drivers/gpu/drm/nouveau/core/engine/copy/nva3.c
@@ -26,9 +26,9 @@
26#include "drmP.h" 26#include "drmP.h"
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_util.h" 28#include "nouveau_util.h"
29#include "nouveau_vm.h" 29#include <subdev/vm.h>
30#include "nouveau_ramht.h" 30#include <core/ramht.h>
31#include "nva3_copy.fuc.h" 31#include "fuc/nva3.fuc.h"
32 32
33struct nva3_copy_engine { 33struct nva3_copy_engine {
34 struct nouveau_exec_engine base; 34 struct nouveau_exec_engine base;
diff --git a/drivers/gpu/drm/nouveau/nvc0_copy.c b/drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c
index dddf006f6d8..90a069b46a9 100644
--- a/drivers/gpu/drm/nouveau/nvc0_copy.c
+++ b/drivers/gpu/drm/nouveau/core/engine/copy/nvc0.c
@@ -26,9 +26,9 @@
26#include "drmP.h" 26#include "drmP.h"
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_util.h" 28#include "nouveau_util.h"
29#include "nouveau_vm.h" 29#include <subdev/vm.h>
30#include "nouveau_ramht.h" 30#include <core/ramht.h>
31#include "nvc0_copy.fuc.h" 31#include "fuc/nvc0.fuc.h"
32 32
33struct nvc0_copy_engine { 33struct nvc0_copy_engine {
34 struct nouveau_exec_engine base; 34 struct nouveau_exec_engine base;
diff --git a/drivers/gpu/drm/nouveau/nv98_crypt.fuc b/drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc
index 7393813044d..7393813044d 100644
--- a/drivers/gpu/drm/nouveau/nv98_crypt.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc
diff --git a/drivers/gpu/drm/nouveau/nv98_crypt.fuc.h b/drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc.h
index 38676c74e6e..38676c74e6e 100644
--- a/drivers/gpu/drm/nouveau/nv98_crypt.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc.h
diff --git a/drivers/gpu/drm/nouveau/nv84_crypt.c b/drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c
index bbfcc73b670..388138946ad 100644
--- a/drivers/gpu/drm/nouveau/nv84_crypt.c
+++ b/drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c
@@ -25,8 +25,8 @@
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_util.h" 27#include "nouveau_util.h"
28#include "nouveau_vm.h" 28#include <subdev/vm.h>
29#include "nouveau_ramht.h" 29#include <core/ramht.h>
30 30
31struct nv84_crypt_engine { 31struct nv84_crypt_engine {
32 struct nouveau_exec_engine base; 32 struct nouveau_exec_engine base;
diff --git a/drivers/gpu/drm/nouveau/nv98_crypt.c b/drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c
index e25e13fb894..563f60d1ce6 100644
--- a/drivers/gpu/drm/nouveau/nv98_crypt.c
+++ b/drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c
@@ -26,10 +26,10 @@
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_util.h" 28#include "nouveau_util.h"
29#include "nouveau_vm.h" 29#include <subdev/vm.h>
30#include "nouveau_ramht.h" 30#include <core/ramht.h>
31 31
32#include "nv98_crypt.fuc.h" 32#include "fuc/nv98.fuc.h"
33 33
34struct nv98_crypt_priv { 34struct nv98_crypt_priv {
35 struct nouveau_exec_engine base; 35 struct nouveau_exec_engine base;
diff --git a/drivers/gpu/drm/nouveau/nv04_fifo.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c
index a6295cd00ec..bc3808737ac 100644
--- a/drivers/gpu/drm/nouveau/nv04_fifo.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c
@@ -27,9 +27,9 @@
27#include "drmP.h" 27#include "drmP.h"
28#include "drm.h" 28#include "drm.h"
29#include "nouveau_drv.h" 29#include "nouveau_drv.h"
30#include "nouveau_fifo.h" 30#include <engine/fifo.h>
31#include "nouveau_util.h" 31#include "nouveau_util.h"
32#include "nouveau_ramht.h" 32#include <core/ramht.h>
33#include "nouveau_software.h" 33#include "nouveau_software.h"
34 34
35static struct ramfc_desc { 35static struct ramfc_desc {
diff --git a/drivers/gpu/drm/nouveau/nv10_fifo.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c
index f1fe7d75824..9058c31c3bf 100644
--- a/drivers/gpu/drm/nouveau/nv10_fifo.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c
@@ -27,9 +27,9 @@
27#include "drmP.h" 27#include "drmP.h"
28#include "drm.h" 28#include "drm.h"
29#include "nouveau_drv.h" 29#include "nouveau_drv.h"
30#include "nouveau_fifo.h" 30#include <engine/fifo.h>
31#include "nouveau_util.h" 31#include "nouveau_util.h"
32#include "nouveau_ramht.h" 32#include <core/ramht.h>
33 33
34static struct ramfc_desc { 34static struct ramfc_desc {
35 unsigned bits:6; 35 unsigned bits:6;
diff --git a/drivers/gpu/drm/nouveau/nv17_fifo.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c
index d9e482e4abe..c514364cc32 100644
--- a/drivers/gpu/drm/nouveau/nv17_fifo.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c
@@ -27,9 +27,9 @@
27#include "drmP.h" 27#include "drmP.h"
28#include "drm.h" 28#include "drm.h"
29#include "nouveau_drv.h" 29#include "nouveau_drv.h"
30#include "nouveau_fifo.h" 30#include <engine/fifo.h>
31#include "nouveau_util.h" 31#include "nouveau_util.h"
32#include "nouveau_ramht.h" 32#include <core/ramht.h>
33 33
34static struct ramfc_desc { 34static struct ramfc_desc {
35 unsigned bits:6; 35 unsigned bits:6;
diff --git a/drivers/gpu/drm/nouveau/nv40_fifo.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
index cdc818479b0..3079f080d40 100644
--- a/drivers/gpu/drm/nouveau/nv40_fifo.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
@@ -27,9 +27,9 @@
27#include "drmP.h" 27#include "drmP.h"
28#include "drm.h" 28#include "drm.h"
29#include "nouveau_drv.h" 29#include "nouveau_drv.h"
30#include "nouveau_fifo.h" 30#include <engine/fifo.h>
31#include "nouveau_util.h" 31#include "nouveau_util.h"
32#include "nouveau_ramht.h" 32#include <core/ramht.h>
33 33
34static struct ramfc_desc { 34static struct ramfc_desc {
35 unsigned bits:6; 35 unsigned bits:6;
diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c
index 55383b85db0..2309871704e 100644
--- a/drivers/gpu/drm/nouveau/nv50_fifo.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c
@@ -27,9 +27,9 @@
27#include "drmP.h" 27#include "drmP.h"
28#include "drm.h" 28#include "drm.h"
29#include "nouveau_drv.h" 29#include "nouveau_drv.h"
30#include "nouveau_fifo.h" 30#include <engine/fifo.h>
31#include "nouveau_ramht.h" 31#include <core/ramht.h>
32#include "nouveau_vm.h" 32#include <subdev/vm.h>
33 33
34struct nv50_fifo_priv { 34struct nv50_fifo_priv {
35 struct nouveau_fifo_priv base; 35 struct nouveau_fifo_priv base;
diff --git a/drivers/gpu/drm/nouveau/nv84_fifo.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
index c564c5e4c30..f505d1ed886 100644
--- a/drivers/gpu/drm/nouveau/nv84_fifo.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
@@ -27,9 +27,9 @@
27#include "drmP.h" 27#include "drmP.h"
28#include "drm.h" 28#include "drm.h"
29#include "nouveau_drv.h" 29#include "nouveau_drv.h"
30#include "nouveau_fifo.h" 30#include <engine/fifo.h>
31#include "nouveau_ramht.h" 31#include <core/ramht.h>
32#include "nouveau_vm.h" 32#include <subdev/vm.h>
33 33
34struct nv84_fifo_priv { 34struct nv84_fifo_priv {
35 struct nouveau_fifo_priv base; 35 struct nouveau_fifo_priv base;
diff --git a/drivers/gpu/drm/nouveau/nvc0_fifo.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
index cd39eb99f5b..398f32df7e6 100644
--- a/drivers/gpu/drm/nouveau/nvc0_fifo.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
@@ -25,8 +25,8 @@
25#include "drmP.h" 25#include "drmP.h"
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_mm.h" 28#include <core/mm.h>
29#include "nouveau_fifo.h" 29#include <engine/fifo.h>
30 30
31static void nvc0_fifo_isr(struct drm_device *); 31static void nvc0_fifo_isr(struct drm_device *);
32 32
diff --git a/drivers/gpu/drm/nouveau/nve0_fifo.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
index 281bece751b..829959fac14 100644
--- a/drivers/gpu/drm/nouveau/nve0_fifo.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
@@ -25,8 +25,8 @@
25#include "drmP.h" 25#include "drmP.h"
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_mm.h" 28#include <core/mm.h>
29#include "nouveau_fifo.h" 29#include <engine/fifo.h>
30 30
31#define NVE0_FIFO_ENGINE_NUM 32 31#define NVE0_FIFO_ENGINE_NUM 32
32 32
diff --git a/drivers/gpu/drm/nouveau/nouveau_grctx.h b/drivers/gpu/drm/nouveau/core/engine/graph/ctx.h
index b0795ececbd..b0795ececbd 100644
--- a/drivers/gpu/drm/nouveau/nouveau_grctx.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctx.h
diff --git a/drivers/gpu/drm/nouveau/nv40_grctx.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv40.c
index be0a74750fb..b17506d7eb6 100644
--- a/drivers/gpu/drm/nouveau/nv40_grctx.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv40.c
@@ -111,7 +111,7 @@
111 111
112#include "drmP.h" 112#include "drmP.h"
113#include "nouveau_drv.h" 113#include "nouveau_drv.h"
114#include "nouveau_grctx.h" 114#include "ctx.h"
115 115
116/* TODO: 116/* TODO:
117 * - get vs count from 0x1540 117 * - get vs count from 0x1540
diff --git a/drivers/gpu/drm/nouveau/nv50_grctx.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv50.c
index 881e22b249f..e17c17bfd89 100644
--- a/drivers/gpu/drm/nouveau/nv50_grctx.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnv50.c
@@ -107,7 +107,7 @@
107 107
108#include "drmP.h" 108#include "drmP.h"
109#include "nouveau_drv.h" 109#include "nouveau_drv.h"
110#include "nouveau_grctx.h" 110#include "ctx.h"
111 111
112#define IS_NVA3F(x) (((x) > 0xa0 && (x) < 0xaa) || (x) == 0xaf) 112#define IS_NVA3F(x) (((x) > 0xa0 && (x) < 0xaa) || (x) == 0xaf)
113#define IS_NVAAF(x) ((x) >= 0xaa && (x) <= 0xac) 113#define IS_NVAAF(x) ((x) >= 0xaa && (x) <= 0xac)
diff --git a/drivers/gpu/drm/nouveau/nvc0_grctx.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
index de77842b31c..5083fda3a87 100644
--- a/drivers/gpu/drm/nouveau/nvc0_grctx.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
@@ -24,8 +24,8 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_mm.h" 27#include <core/mm.h>
28#include "nvc0_graph.h" 28#include "nvc0.h"
29 29
30static void 30static void
31nv_icmd(struct drm_device *dev, u32 icmd, u32 data) 31nv_icmd(struct drm_device *dev, u32 icmd, u32 data)
diff --git a/drivers/gpu/drm/nouveau/nve0_grctx.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve0.c
index d8cb360e92c..bd40bd9effb 100644
--- a/drivers/gpu/drm/nouveau/nve0_grctx.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnve0.c
@@ -24,8 +24,8 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_mm.h" 27#include <core/mm.h>
28#include "nve0_graph.h" 28#include "nve0.h"
29 29
30static void 30static void
31nv_icmd(struct drm_device *dev, u32 icmd, u32 data) 31nv_icmd(struct drm_device *dev, u32 icmd, u32 data)
diff --git a/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc
index 15272be33b6..15272be33b6 100644
--- a/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc
diff --git a/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
index a988b8ad00a..a988b8ad00a 100644
--- a/drivers/gpu/drm/nouveau/nvc0_grgpc.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
diff --git a/drivers/gpu/drm/nouveau/nvc0_grhub.fuc b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc
index 98acddb2c5b..98acddb2c5b 100644
--- a/drivers/gpu/drm/nouveau/nvc0_grhub.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc
diff --git a/drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
index c5ed307abeb..c5ed307abeb 100644
--- a/drivers/gpu/drm/nouveau/nvc0_grhub.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.fuc b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/nvc0.fuc
index e6b228844a3..e6b228844a3 100644
--- a/drivers/gpu/drm/nouveau/nvc0_graph.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/nvc0.fuc
diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv04.c
index 72f1a62903b..353d4d330ca 100644
--- a/drivers/gpu/drm/nouveau/nv04_graph.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv04.c
@@ -28,7 +28,7 @@
28#include "nouveau_drv.h" 28#include "nouveau_drv.h"
29#include "nouveau_hw.h" 29#include "nouveau_hw.h"
30#include "nouveau_util.h" 30#include "nouveau_util.h"
31#include "nouveau_ramht.h" 31#include <core/ramht.h>
32 32
33struct nv04_graph_engine { 33struct nv04_graph_engine {
34 struct nouveau_exec_engine base; 34 struct nouveau_exec_engine base;
diff --git a/drivers/gpu/drm/nouveau/nv10_graph.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv10.c
index fb1d88a951d..fb1d88a951d 100644
--- a/drivers/gpu/drm/nouveau/nv10_graph.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv10.c
diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c
index e34ea30758f..e34ea30758f 100644
--- a/drivers/gpu/drm/nouveau/nv20_graph.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv20.c
diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c
index aa9e2df64a2..4ad9759f821 100644
--- a/drivers/gpu/drm/nouveau/nv40_graph.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv40.c
@@ -27,8 +27,8 @@
27#include "drmP.h" 27#include "drmP.h"
28#include "drm.h" 28#include "drm.h"
29#include "nouveau_drv.h" 29#include "nouveau_drv.h"
30#include "nouveau_fifo.h" 30#include <engine/fifo.h>
31#include "nouveau_ramht.h" 31#include <core/ramht.h>
32 32
33struct nv40_graph_engine { 33struct nv40_graph_engine {
34 struct nouveau_exec_engine base; 34 struct nouveau_exec_engine base;
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
index 437608d1dfe..c22e3a0bca7 100644
--- a/drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nv50.c
@@ -27,10 +27,10 @@
27#include "drmP.h" 27#include "drmP.h"
28#include "drm.h" 28#include "drm.h"
29#include "nouveau_drv.h" 29#include "nouveau_drv.h"
30#include "nouveau_fifo.h" 30#include <engine/fifo.h>
31#include "nouveau_ramht.h" 31#include <core/ramht.h>
32#include "nouveau_dma.h" 32#include "nouveau_dma.h"
33#include "nouveau_vm.h" 33#include <subdev/vm.h>
34#include "nv50_evo.h" 34#include "nv50_evo.h"
35 35
36struct nv50_graph_engine { 36struct nv50_graph_engine {
diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
index 2a01e6e4772..8f515dcb63c 100644
--- a/drivers/gpu/drm/nouveau/nvc0_graph.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
@@ -28,12 +28,12 @@
28#include "drmP.h" 28#include "drmP.h"
29 29
30#include "nouveau_drv.h" 30#include "nouveau_drv.h"
31#include "nouveau_mm.h" 31#include <core/mm.h>
32#include "nouveau_fifo.h" 32#include <engine/fifo.h>
33 33
34#include "nvc0_graph.h" 34#include "nvc0.h"
35#include "nvc0_grhub.fuc.h" 35#include "fuc/hubnvc0.fuc.h"
36#include "nvc0_grgpc.fuc.h" 36#include "fuc/gpcnvc0.fuc.h"
37 37
38static void 38static void
39nvc0_graph_ctxctl_debug_unit(struct drm_device *dev, u32 base) 39nvc0_graph_ctxctl_debug_unit(struct drm_device *dev, u32 base)
diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.h b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h
index 91d44ea662d..91d44ea662d 100644
--- a/drivers/gpu/drm/nouveau/nvc0_graph.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h
diff --git a/drivers/gpu/drm/nouveau/nve0_graph.c b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
index 8a8051b68f1..a8364b1236a 100644
--- a/drivers/gpu/drm/nouveau/nve0_graph.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
@@ -28,10 +28,10 @@
28#include "drmP.h" 28#include "drmP.h"
29 29
30#include "nouveau_drv.h" 30#include "nouveau_drv.h"
31#include "nouveau_mm.h" 31#include <core/mm.h>
32#include "nouveau_fifo.h" 32#include <engine/fifo.h>
33 33
34#include "nve0_graph.h" 34#include "nve0.h"
35 35
36static void 36static void
37nve0_graph_ctxctl_debug_unit(struct drm_device *dev, u32 base) 37nve0_graph_ctxctl_debug_unit(struct drm_device *dev, u32 base)
diff --git a/drivers/gpu/drm/nouveau/nve0_graph.h b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.h
index 2ba70449ba0..2ba70449ba0 100644
--- a/drivers/gpu/drm/nouveau/nve0_graph.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.h
diff --git a/drivers/gpu/drm/nouveau/nv31_mpeg.c b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
index 5f239bf658c..4a14a6763da 100644
--- a/drivers/gpu/drm/nouveau/nv31_mpeg.c
+++ b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
@@ -24,8 +24,8 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_fifo.h" 27#include <engine/fifo.h>
28#include "nouveau_ramht.h" 28#include <core/ramht.h>
29 29
30struct nv31_mpeg_engine { 30struct nv31_mpeg_engine {
31 struct nouveau_exec_engine base; 31 struct nouveau_exec_engine base;
diff --git a/drivers/gpu/drm/nouveau/nv50_mpeg.c b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c
index 90e8ed22cfc..47d37a2f478 100644
--- a/drivers/gpu/drm/nouveau/nv50_mpeg.c
+++ b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv50.c
@@ -24,7 +24,7 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_ramht.h" 27#include <core/ramht.h>
28 28
29struct nv50_mpeg_engine { 29struct nv50_mpeg_engine {
30 struct nouveau_exec_engine base; 30 struct nouveau_exec_engine base;
diff --git a/drivers/gpu/drm/nouveau/nv98_ppp.c b/drivers/gpu/drm/nouveau/core/engine/ppp/nv98.c
index a987dd6e003..20d33dcd7f4 100644
--- a/drivers/gpu/drm/nouveau/nv98_ppp.c
+++ b/drivers/gpu/drm/nouveau/core/engine/ppp/nv98.c
@@ -25,8 +25,8 @@
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_util.h" 27#include "nouveau_util.h"
28#include "nouveau_vm.h" 28#include <subdev/vm.h>
29#include "nouveau_ramht.h" 29#include <core/ramht.h>
30 30
31struct nv98_ppp_engine { 31struct nv98_ppp_engine {
32 struct nouveau_exec_engine base; 32 struct nouveau_exec_engine base;
diff --git a/drivers/gpu/drm/nouveau/nv84_vp.c b/drivers/gpu/drm/nouveau/core/engine/vp/nv84.c
index 6570d300ab8..eb7e1960dd8 100644
--- a/drivers/gpu/drm/nouveau/nv84_vp.c
+++ b/drivers/gpu/drm/nouveau/core/engine/vp/nv84.c
@@ -25,8 +25,8 @@
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_util.h" 27#include "nouveau_util.h"
28#include "nouveau_vm.h" 28#include <subdev/vm.h>
29#include "nouveau_ramht.h" 29#include <core/ramht.h>
30 30
31/*XXX: This stub is currently used on NV98+ also, as soon as this becomes 31/*XXX: This stub is currently used on NV98+ also, as soon as this becomes
32 * more than just an enable/disable stub this needs to be split out to 32 * more than just an enable/disable stub this needs to be split out to
diff --git a/drivers/gpu/drm/nouveau/nouveau_mm.h b/drivers/gpu/drm/nouveau/core/include/core/mm.h
index 57a600c35c9..d2b4290f5ab 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mm.h
+++ b/drivers/gpu/drm/nouveau/core/include/core/mm.h
@@ -52,16 +52,4 @@ int nouveau_mm_get(struct nouveau_mm *, int type, u32 size, u32 size_nc,
52 u32 align, struct nouveau_mm_node **); 52 u32 align, struct nouveau_mm_node **);
53void nouveau_mm_put(struct nouveau_mm *, struct nouveau_mm_node *); 53void nouveau_mm_put(struct nouveau_mm *, struct nouveau_mm_node *);
54 54
55int nv50_vram_init(struct drm_device *);
56void nv50_vram_fini(struct drm_device *);
57int nv50_vram_new(struct drm_device *, u64 size, u32 align, u32 size_nc,
58 u32 memtype, struct nouveau_mem **);
59void nv50_vram_del(struct drm_device *, struct nouveau_mem **);
60bool nv50_vram_flags_valid(struct drm_device *, u32 tile_flags);
61
62int nvc0_vram_init(struct drm_device *);
63int nvc0_vram_new(struct drm_device *, u64 size, u32 align, u32 ncmin,
64 u32 memtype, struct nouveau_mem **);
65bool nvc0_vram_flags_valid(struct drm_device *, u32 tile_flags);
66
67#endif 55#endif
diff --git a/drivers/gpu/drm/nouveau/nouveau_ramht.h b/drivers/gpu/drm/nouveau/core/include/core/ramht.h
index c82de98fee0..c82de98fee0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ramht.h
+++ b/drivers/gpu/drm/nouveau/core/include/core/ramht.h
diff --git a/drivers/gpu/drm/nouveau/nouveau_fifo.h b/drivers/gpu/drm/nouveau/core/include/engine/fifo.h
index ce99cab2f25..ce99cab2f25 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fifo.h
+++ b/drivers/gpu/drm/nouveau/core/include/engine/fifo.h
diff --git a/drivers/gpu/drm/nouveau/nouveau_gpio.h b/drivers/gpu/drm/nouveau/core/include/subdev/gpio.h
index 64c5cb077ac..64c5cb077ac 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gpio.h
+++ b/drivers/gpu/drm/nouveau/core/include/subdev/gpio.h
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/core/include/subdev/i2c.h
index 1d083893a4d..1d083893a4d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.h
+++ b/drivers/gpu/drm/nouveau/core/include/subdev/i2c.h
diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.h b/drivers/gpu/drm/nouveau/core/include/subdev/vm.h
index a8246e7e4a8..7c1fc2114fe 100644
--- a/drivers/gpu/drm/nouveau/nouveau_vm.h
+++ b/drivers/gpu/drm/nouveau/core/include/subdev/vm.h
@@ -28,7 +28,7 @@
28#include "drmP.h" 28#include "drmP.h"
29 29
30#include "nouveau_drv.h" 30#include "nouveau_drv.h"
31#include "nouveau_mm.h" 31#include <core/mm.h>
32 32
33struct nouveau_vm_pgt { 33struct nouveau_vm_pgt {
34 struct nouveau_gpuobj *obj[2]; 34 struct nouveau_gpuobj *obj[2];
diff --git a/drivers/gpu/drm/nouveau/nv04_fb.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv04.c
index d5eedd67afe..d5eedd67afe 100644
--- a/drivers/gpu/drm/nouveau/nv04_fb.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv04.c
diff --git a/drivers/gpu/drm/nouveau/nv10_fb.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv10.c
index 420b1608536..420b1608536 100644
--- a/drivers/gpu/drm/nouveau/nv10_fb.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv10.c
diff --git a/drivers/gpu/drm/nouveau/nv20_fb.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv20.c
index 19bd64059a6..19bd64059a6 100644
--- a/drivers/gpu/drm/nouveau/nv20_fb.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv20.c
diff --git a/drivers/gpu/drm/nouveau/nv30_fb.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c
index e0135f0e214..e0135f0e214 100644
--- a/drivers/gpu/drm/nouveau/nv30_fb.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c
diff --git a/drivers/gpu/drm/nouveau/nv40_fb.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv40.c
index 7fbcb334c09..7fbcb334c09 100644
--- a/drivers/gpu/drm/nouveau/nv40_fb.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv40.c
diff --git a/drivers/gpu/drm/nouveau/nv50_fb.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
index f1e4b9e07d1..3488358401a 100644
--- a/drivers/gpu/drm/nouveau/nv50_fb.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c
@@ -2,7 +2,7 @@
2#include "drm.h" 2#include "drm.h"
3#include "nouveau_drv.h" 3#include "nouveau_drv.h"
4#include "nouveau_drm.h" 4#include "nouveau_drm.h"
5#include "nouveau_fifo.h" 5#include <engine/fifo.h>
6 6
7struct nv50_fb_priv { 7struct nv50_fb_priv {
8 struct page *r100c08_page; 8 struct page *r100c08_page;
diff --git a/drivers/gpu/drm/nouveau/nv50_vram.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50_vram.c
index 9ed9ae397d7..029274baf9a 100644
--- a/drivers/gpu/drm/nouveau/nv50_vram.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50_vram.c
@@ -24,7 +24,7 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_mm.h" 27#include <core/mm.h>
28 28
29static int types[0x80] = { 29static int types[0x80] = {
30 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/drivers/gpu/drm/nouveau/nvc0_fb.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c
index f376c39310d..f376c39310d 100644
--- a/drivers/gpu/drm/nouveau/nvc0_fb.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0.c
diff --git a/drivers/gpu/drm/nouveau/nvc0_vram.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0_vram.c
index a7eef8934c0..8bb86e50353 100644
--- a/drivers/gpu/drm/nouveau/nvc0_vram.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nvc0_vram.c
@@ -24,7 +24,7 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_mm.h" 27#include <core/mm.h>
28 28
29/* 0 = unsupported 29/* 0 = unsupported
30 * 1 = non-compressed 30 * 1 = non-compressed
diff --git a/drivers/gpu/drm/nouveau/nouveau_gpio.c b/drivers/gpu/drm/nouveau/core/subdev/gpio/base.c
index 82c19e82ff0..2c48309b0e1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gpio.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/gpio/base.c
@@ -24,8 +24,8 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_i2c.h" 27#include <subdev/i2c.h>
28#include "nouveau_gpio.h" 28#include <subdev/gpio.h>
29 29
30static u8 * 30static u8 *
31dcb_gpio_table(struct drm_device *dev) 31dcb_gpio_table(struct drm_device *dev)
diff --git a/drivers/gpu/drm/nouveau/nv10_gpio.c b/drivers/gpu/drm/nouveau/core/subdev/gpio/nv10.c
index 9d79180069d..42e600f68f2 100644
--- a/drivers/gpu/drm/nouveau/nv10_gpio.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/gpio/nv10.c
@@ -27,7 +27,7 @@
27#include "drmP.h" 27#include "drmP.h"
28#include "nouveau_drv.h" 28#include "nouveau_drv.h"
29#include "nouveau_hw.h" 29#include "nouveau_hw.h"
30#include "nouveau_gpio.h" 30#include <subdev/gpio.h>
31 31
32int 32int
33nv10_gpio_sense(struct drm_device *dev, int line) 33nv10_gpio_sense(struct drm_device *dev, int line)
diff --git a/drivers/gpu/drm/nouveau/nv50_gpio.c b/drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c
index c399d510b27..48509b0a1c8 100644
--- a/drivers/gpu/drm/nouveau/nv50_gpio.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c
@@ -26,7 +26,7 @@
26#include "drmP.h" 26#include "drmP.h"
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_hw.h" 28#include "nouveau_hw.h"
29#include "nouveau_gpio.h" 29#include <subdev/gpio.h>
30 30
31#include "nv50_display.h" 31#include "nv50_display.h"
32 32
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c
index 240cf962c99..71e93615834 100644
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/i2c/base.c
@@ -26,7 +26,7 @@
26 26
27#include "drmP.h" 27#include "drmP.h"
28#include "nouveau_drv.h" 28#include "nouveau_drv.h"
29#include "nouveau_i2c.h" 29#include <subdev/i2c.h>
30#include "nouveau_hw.h" 30#include "nouveau_hw.h"
31 31
32static void 32static void
diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c
index ef7a934a499..f01063c078e 100644
--- a/drivers/gpu/drm/nouveau/nv04_instmem.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv04.c
@@ -2,8 +2,8 @@
2#include "drm.h" 2#include "drm.h"
3 3
4#include "nouveau_drv.h" 4#include "nouveau_drv.h"
5#include "nouveau_fifo.h" 5#include <engine/fifo.h>
6#include "nouveau_ramht.h" 6#include <core/ramht.h>
7 7
8/* returns the size of fifo context */ 8/* returns the size of fifo context */
9static int 9static int
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c
index 0bba54f1180..d9b346333a4 100644
--- a/drivers/gpu/drm/nouveau/nv50_instmem.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c
@@ -29,7 +29,7 @@
29#include "drm.h" 29#include "drm.h"
30 30
31#include "nouveau_drv.h" 31#include "nouveau_drv.h"
32#include "nouveau_vm.h" 32#include <subdev/vm.h>
33 33
34#define BAR1_VM_BASE 0x0020000000ULL 34#define BAR1_VM_BASE 0x0020000000ULL
35#define BAR1_VM_SIZE pci_resource_len(dev->pdev, 1) 35#define BAR1_VM_SIZE pci_resource_len(dev->pdev, 1)
@@ -425,4 +425,3 @@ nv84_instmem_flush(struct drm_device *dev)
425 NV_ERROR(dev, "PRAMIN flush timeout\n"); 425 NV_ERROR(dev, "PRAMIN flush timeout\n");
426 spin_unlock_irqrestore(&dev_priv->vm_lock, flags); 426 spin_unlock_irqrestore(&dev_priv->vm_lock, flags);
427} 427}
428
diff --git a/drivers/gpu/drm/nouveau/nvc0_instmem.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/nvc0.c
index b701c439c92..0ce986910cb 100644
--- a/drivers/gpu/drm/nouveau/nvc0_instmem.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/nvc0.c
@@ -25,7 +25,7 @@
25#include "drmP.h" 25#include "drmP.h"
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_vm.h" 28#include <subdev/vm.h>
29 29
30struct nvc0_instmem_priv { 30struct nvc0_instmem_priv {
31 struct nouveau_gpuobj *bar1_pgd; 31 struct nouveau_gpuobj *bar1_pgd;
@@ -220,4 +220,3 @@ nvc0_instmem_takedown(struct drm_device *dev)
220 dev_priv->engine.instmem.priv = NULL; 220 dev_priv->engine.instmem.priv = NULL;
221 kfree(priv); 221 kfree(priv);
222} 222}
223
diff --git a/drivers/gpu/drm/nouveau/nv04_mc.c b/drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c
index 2af43a1cb2e..2af43a1cb2e 100644
--- a/drivers/gpu/drm/nouveau/nv04_mc.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c
diff --git a/drivers/gpu/drm/nouveau/nv40_mc.c b/drivers/gpu/drm/nouveau/core/subdev/mc/nv40.c
index 03c0d4c3f35..03c0d4c3f35 100644
--- a/drivers/gpu/drm/nouveau/nv40_mc.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/mc/nv40.c
diff --git a/drivers/gpu/drm/nouveau/nv50_mc.c b/drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c
index e0a9c3faa20..e0a9c3faa20 100644
--- a/drivers/gpu/drm/nouveau/nv50_mc.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c
diff --git a/drivers/gpu/drm/nouveau/nv04_timer.c b/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c
index 55c945290e5..55c945290e5 100644
--- a/drivers/gpu/drm/nouveau/nv04_timer.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c
diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.c b/drivers/gpu/drm/nouveau/core/subdev/vm/base.c
index 11edd5e91a0..3d11a4aa39e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_vm.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/vm/base.c
@@ -24,8 +24,8 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_mm.h" 27#include <core/mm.h>
28#include "nouveau_vm.h" 28#include <subdev/vm.h>
29 29
30void 30void
31nouveau_vm_map_at(struct nouveau_vma *vma, u64 delta, struct nouveau_mem *node) 31nouveau_vm_map_at(struct nouveau_vma *vma, u64 delta, struct nouveau_mem *node)
diff --git a/drivers/gpu/drm/nouveau/nv50_vm.c b/drivers/gpu/drm/nouveau/core/subdev/vm/nv50.c
index 179bb42a635..eeac72f4020 100644
--- a/drivers/gpu/drm/nouveau/nv50_vm.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/vm/nv50.c
@@ -25,7 +25,7 @@
25#include "drmP.h" 25#include "drmP.h"
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_vm.h" 28#include <subdev/vm.h>
29 29
30void 30void
31nv50_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 pde, 31nv50_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 pde,
diff --git a/drivers/gpu/drm/nouveau/nvc0_vm.c b/drivers/gpu/drm/nouveau/core/subdev/vm/nvc0.c
index 30d2bd58828..734877a9aa0 100644
--- a/drivers/gpu/drm/nouveau/nvc0_vm.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/vm/nvc0.c
@@ -25,7 +25,7 @@
25#include "drmP.h" 25#include "drmP.h"
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_vm.h" 28#include <subdev/vm.h>
29 29
30void 30void
31nvc0_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 index, 31nvc0_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 index,
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index 3ca240b4413..1b9db808a85 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -26,7 +26,7 @@
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_dma.h" 27#include "nouveau_dma.h"
28#include "nouveau_abi16.h" 28#include "nouveau_abi16.h"
29#include "nouveau_ramht.h" 29#include <core/ramht.h>
30#include "nouveau_software.h" 30#include "nouveau_software.h"
31 31
32int 32int
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index a0a3fe3c016..52c3992454a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -27,7 +27,7 @@
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_hw.h" 28#include "nouveau_hw.h"
29#include "nouveau_encoder.h" 29#include "nouveau_encoder.h"
30#include "nouveau_gpio.h" 30#include <subdev/gpio.h>
31 31
32#include <linux/io-mapping.h> 32#include <linux/io-mapping.h>
33#include <linux/firmware.h> 33#include <linux/firmware.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h
index 298a3af48d1..b42aa31144a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.h
@@ -25,7 +25,7 @@
25#define __NOUVEAU_BIOS_H__ 25#define __NOUVEAU_BIOS_H__
26 26
27#include "nvreg.h" 27#include "nvreg.h"
28#include "nouveau_i2c.h" 28#include <subdev/i2c.h>
29 29
30#define DCB_MAX_NUM_ENTRIES 16 30#define DCB_MAX_NUM_ENTRIES 16
31#define DCB_MAX_NUM_I2C_ENTRIES 16 31#define DCB_MAX_NUM_I2C_ENTRIES 16
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 7f80ed52356..f9e6fbb0094 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -33,10 +33,10 @@
33#include "nouveau_drm.h" 33#include "nouveau_drm.h"
34#include "nouveau_drv.h" 34#include "nouveau_drv.h"
35#include "nouveau_dma.h" 35#include "nouveau_dma.h"
36#include "nouveau_mm.h" 36#include <core/mm.h>
37#include "nouveau_vm.h" 37#include <subdev/vm.h>
38#include "nouveau_fence.h" 38#include "nouveau_fence.h"
39#include "nouveau_ramht.h" 39#include <core/ramht.h>
40 40
41#include <linux/log2.h> 41#include <linux/log2.h>
42#include <linux/slab.h> 42#include <linux/slab.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
index debd90225a8..182fbd398f9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_channel.c
+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
@@ -27,8 +27,8 @@
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_drm.h" 28#include "nouveau_drm.h"
29#include "nouveau_dma.h" 29#include "nouveau_dma.h"
30#include "nouveau_fifo.h" 30#include <engine/fifo.h>
31#include "nouveau_ramht.h" 31#include <core/ramht.h>
32#include "nouveau_fence.h" 32#include "nouveau_fence.h"
33#include "nouveau_software.h" 33#include "nouveau_software.h"
34 34
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 7b11edb077d..d6eabd98506 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -35,7 +35,7 @@
35#include "nouveau_encoder.h" 35#include "nouveau_encoder.h"
36#include "nouveau_crtc.h" 36#include "nouveau_crtc.h"
37#include "nouveau_connector.h" 37#include "nouveau_connector.h"
38#include "nouveau_gpio.h" 38#include <subdev/gpio.h>
39#include "nouveau_hw.h" 39#include "nouveau_hw.h"
40 40
41static void nouveau_connector_hotplug(void *, int); 41static void nouveau_connector_hotplug(void *, int);
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h
index e4857021304..bb0faf9f5d1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.h
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.h
@@ -28,7 +28,7 @@
28#define __NOUVEAU_CONNECTOR_H__ 28#define __NOUVEAU_CONNECTOR_H__
29 29
30#include "drm_edid.h" 30#include "drm_edid.h"
31#include "nouveau_i2c.h" 31#include <subdev/i2c.h>
32 32
33enum nouveau_underscan_type { 33enum nouveau_underscan_type {
34 UNDERSCAN_OFF, 34 UNDERSCAN_OFF,
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index 7e16dc5e646..d6051e01967 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -34,7 +34,7 @@
34#include "nouveau_dma.h" 34#include "nouveau_dma.h"
35#include "nouveau_connector.h" 35#include "nouveau_connector.h"
36#include "nouveau_software.h" 36#include "nouveau_software.h"
37#include "nouveau_gpio.h" 37#include <subdev/gpio.h>
38#include "nouveau_fence.h" 38#include "nouveau_fence.h"
39#include "nv50_display.h" 39#include "nv50_display.h"
40 40
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c
index 295932e66ac..efd08232340 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.c
@@ -28,7 +28,7 @@
28#include "drm.h" 28#include "drm.h"
29#include "nouveau_drv.h" 29#include "nouveau_drv.h"
30#include "nouveau_dma.h" 30#include "nouveau_dma.h"
31#include "nouveau_ramht.h" 31#include <core/ramht.h>
32 32
33void 33void
34nouveau_dma_init(struct nouveau_channel *chan) 34nouveau_dma_init(struct nouveau_channel *chan)
diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c
index 7e289d2ad8e..67b322554ac 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -25,11 +25,11 @@
25#include "drmP.h" 25#include "drmP.h"
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_i2c.h" 28#include <subdev/i2c.h>
29#include "nouveau_connector.h" 29#include "nouveau_connector.h"
30#include "nouveau_encoder.h" 30#include "nouveau_encoder.h"
31#include "nouveau_crtc.h" 31#include "nouveau_crtc.h"
32#include "nouveau_gpio.h" 32#include <subdev/gpio.h>
33 33
34/****************************************************************************** 34/******************************************************************************
35 * aux channel util functions 35 * aux channel util functions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index 9a36f5f39b0..74c226587d5 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -34,7 +34,7 @@
34#include "nouveau_fb.h" 34#include "nouveau_fb.h"
35#include "nouveau_fbcon.h" 35#include "nouveau_fbcon.h"
36#include "nouveau_pm.h" 36#include "nouveau_pm.h"
37#include "nouveau_fifo.h" 37#include <engine/fifo.h>
38#include "nv50_display.h" 38#include "nv50_display.h"
39 39
40#include "drm_pciids.h" 40#include "drm_pciids.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 4f2cc95ce26..a781d440010 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -61,12 +61,12 @@ nouveau_fpriv(struct drm_file *file_priv)
61 61
62#include "nouveau_drm.h" 62#include "nouveau_drm.h"
63#include "nouveau_reg.h" 63#include "nouveau_reg.h"
64#include "nouveau_bios.h" 64#include <nouveau_bios.h>
65#include "nouveau_util.h" 65#include "nouveau_util.h"
66 66
67struct nouveau_grctx; 67struct nouveau_grctx;
68struct nouveau_mem; 68struct nouveau_mem;
69#include "nouveau_vm.h" 69#include <subdev/vm.h>
70 70
71#define MAX_NUM_DCB_ENTRIES 16 71#define MAX_NUM_DCB_ENTRIES 16
72 72
@@ -1607,6 +1607,18 @@ nv44_graph_class(struct drm_device *dev)
1607 return !(0x0baf & (1 << (dev_priv->chipset & 0x0f))); 1607 return !(0x0baf & (1 << (dev_priv->chipset & 0x0f)));
1608} 1608}
1609 1609
1610int nv50_vram_init(struct drm_device *);
1611void nv50_vram_fini(struct drm_device *);
1612int nv50_vram_new(struct drm_device *, u64 size, u32 align, u32 size_nc,
1613 u32 memtype, struct nouveau_mem **);
1614void nv50_vram_del(struct drm_device *, struct nouveau_mem **);
1615bool nv50_vram_flags_valid(struct drm_device *, u32 tile_flags);
1616
1617int nvc0_vram_init(struct drm_device *);
1618int nvc0_vram_new(struct drm_device *, u64 size, u32 align, u32 ncmin,
1619 u32 memtype, struct nouveau_mem **);
1620bool nvc0_vram_flags_valid(struct drm_device *, u32 tile_flags);
1621
1610/* memory type/access flags, do not match hardware values */ 1622/* memory type/access flags, do not match hardware values */
1611#define NV_MEM_ACCESS_RO 1 1623#define NV_MEM_ACCESS_RO 1
1612#define NV_MEM_ACCESS_WO 2 1624#define NV_MEM_ACCESS_WO 2
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 3c180493dab..a91d6e85988 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -31,7 +31,7 @@
31#include <linux/hrtimer.h> 31#include <linux/hrtimer.h>
32 32
33#include "nouveau_drv.h" 33#include "nouveau_drv.h"
34#include "nouveau_ramht.h" 34#include <core/ramht.h>
35#include "nouveau_fence.h" 35#include "nouveau_fence.h"
36#include "nouveau_software.h" 36#include "nouveau_software.h"
37#include "nouveau_dma.h" 37#include "nouveau_dma.h"
diff --git a/drivers/gpu/drm/nouveau/nouveau_gpuobj.c b/drivers/gpu/drm/nouveau/nouveau_gpuobj.c
index bd79fedb705..0e5fb0dc83e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gpuobj.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gpuobj.c
@@ -34,10 +34,10 @@
34#include "drm.h" 34#include "drm.h"
35#include "nouveau_drv.h" 35#include "nouveau_drv.h"
36#include "nouveau_drm.h" 36#include "nouveau_drm.h"
37#include "nouveau_fifo.h" 37#include <engine/fifo.h>
38#include "nouveau_ramht.h" 38#include <core/ramht.h>
39#include "nouveau_software.h" 39#include "nouveau_software.h"
40#include "nouveau_vm.h" 40#include <subdev/vm.h>
41 41
42struct nouveau_gpuobj_method { 42struct nouveau_gpuobj_method {
43 struct list_head head; 43 struct list_head head;
diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index b2c2937531a..f4b29882dd5 100644
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
@@ -35,7 +35,7 @@
35#include "nouveau_drm.h" 35#include "nouveau_drm.h"
36#include "nouveau_drv.h" 36#include "nouveau_drv.h"
37#include "nouveau_reg.h" 37#include "nouveau_reg.h"
38#include "nouveau_ramht.h" 38#include <core/ramht.h>
39#include "nouveau_util.h" 39#include "nouveau_util.h"
40 40
41void 41void
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index 5b498ea32e1..0887236a364 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -37,9 +37,9 @@
37 37
38#include "nouveau_drv.h" 38#include "nouveau_drv.h"
39#include "nouveau_pm.h" 39#include "nouveau_pm.h"
40#include "nouveau_mm.h" 40#include <core/mm.h>
41#include "nouveau_vm.h" 41#include <subdev/vm.h>
42#include "nouveau_fifo.h" 42#include <engine/fifo.h>
43#include "nouveau_fence.h" 43#include "nouveau_fence.h"
44 44
45/* 45/*
diff --git a/drivers/gpu/drm/nouveau/nouveau_notifier.c b/drivers/gpu/drm/nouveau/nouveau_notifier.c
index 69c93b86451..151ffbb411c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_notifier.c
+++ b/drivers/gpu/drm/nouveau/nouveau_notifier.c
@@ -28,7 +28,7 @@
28#include "drmP.h" 28#include "drmP.h"
29#include "drm.h" 29#include "drm.h"
30#include "nouveau_drv.h" 30#include "nouveau_drv.h"
31#include "nouveau_ramht.h" 31#include <core/ramht.h>
32 32
33int 33int
34nouveau_notifier_init_channel(struct nouveau_channel *chan) 34nouveau_notifier_init_channel(struct nouveau_channel *chan)
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index da3e7c3abab..dc34664572c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -26,7 +26,7 @@
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_pm.h" 28#include "nouveau_pm.h"
29#include "nouveau_gpio.h" 29#include <subdev/gpio.h>
30 30
31#ifdef CONFIG_ACPI 31#ifdef CONFIG_ACPI
32#include <linux/acpi.h> 32#include <linux/acpi.h>
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index c61014442aa..0e8f325c709 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -35,11 +35,11 @@
35#include "nouveau_drv.h" 35#include "nouveau_drv.h"
36#include "nouveau_drm.h" 36#include "nouveau_drm.h"
37#include "nouveau_fbcon.h" 37#include "nouveau_fbcon.h"
38#include "nouveau_ramht.h" 38#include <core/ramht.h>
39#include "nouveau_gpio.h" 39#include <subdev/gpio.h>
40#include "nouveau_pm.h" 40#include "nouveau_pm.h"
41#include "nv50_display.h" 41#include "nv50_display.h"
42#include "nouveau_fifo.h" 42#include <engine/fifo.h>
43#include "nouveau_fence.h" 43#include "nouveau_fence.h"
44#include "nouveau_software.h" 44#include "nouveau_software.h"
45 45
diff --git a/drivers/gpu/drm/nouveau/nouveau_volt.c b/drivers/gpu/drm/nouveau/nouveau_volt.c
index b010cb997b3..9e34b573b8d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_volt.c
+++ b/drivers/gpu/drm/nouveau/nouveau_volt.c
@@ -26,7 +26,7 @@
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_pm.h" 28#include "nouveau_pm.h"
29#include "nouveau_gpio.h" 29#include <subdev/gpio.h>
30 30
31static const enum dcb_gpio_tag vidtag[] = { 0x04, 0x05, 0x06, 0x1a, 0x73 }; 31static const enum dcb_gpio_tag vidtag[] = { 0x04, 0x05, 0x06, 0x1a, 0x73 };
32static int nr_vidtag = sizeof(vidtag) / sizeof(vidtag[0]); 32static int nr_vidtag = sizeof(vidtag) / sizeof(vidtag[0]);
diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c
index 38f19479417..da091a1caed 100644
--- a/drivers/gpu/drm/nouveau/nv04_dac.c
+++ b/drivers/gpu/drm/nouveau/nv04_dac.c
@@ -32,7 +32,7 @@
32#include "nouveau_connector.h" 32#include "nouveau_connector.h"
33#include "nouveau_crtc.h" 33#include "nouveau_crtc.h"
34#include "nouveau_hw.h" 34#include "nouveau_hw.h"
35#include "nouveau_gpio.h" 35#include <subdev/gpio.h>
36#include "nvreg.h" 36#include "nvreg.h"
37 37
38int nv04_dac_output_offset(struct drm_encoder *encoder) 38int nv04_dac_output_offset(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c
index 7cd7857347e..06fb68acf81 100644
--- a/drivers/gpu/drm/nouveau/nv04_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c
@@ -25,7 +25,7 @@
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_dma.h" 27#include "nouveau_dma.h"
28#include "nouveau_ramht.h" 28#include <core/ramht.h>
29#include "nouveau_fbcon.h" 29#include "nouveau_fbcon.h"
30 30
31int 31int
diff --git a/drivers/gpu/drm/nouveau/nv04_fence.c b/drivers/gpu/drm/nouveau/nv04_fence.c
index abe89db6de2..78d851f7192 100644
--- a/drivers/gpu/drm/nouveau/nv04_fence.c
+++ b/drivers/gpu/drm/nouveau/nv04_fence.c
@@ -25,7 +25,7 @@
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_dma.h" 27#include "nouveau_dma.h"
28#include "nouveau_ramht.h" 28#include <core/ramht.h>
29#include "nouveau_fence.h" 29#include "nouveau_fence.h"
30 30
31struct nv04_fence_chan { 31struct nv04_fence_chan {
diff --git a/drivers/gpu/drm/nouveau/nv04_software.c b/drivers/gpu/drm/nouveau/nv04_software.c
index 0c41abf4877..06c316b386a 100644
--- a/drivers/gpu/drm/nouveau/nv04_software.c
+++ b/drivers/gpu/drm/nouveau/nv04_software.c
@@ -25,7 +25,7 @@
25#include "drmP.h" 25#include "drmP.h"
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_ramht.h" 28#include <core/ramht.h>
29#include "nouveau_fence.h" 29#include "nouveau_fence.h"
30#include "nouveau_software.h" 30#include "nouveau_software.h"
31#include "nouveau_hw.h" 31#include "nouveau_hw.h"
diff --git a/drivers/gpu/drm/nouveau/nv10_fence.c b/drivers/gpu/drm/nouveau/nv10_fence.c
index 8a1b7500918..8ff9fbabc33 100644
--- a/drivers/gpu/drm/nouveau/nv10_fence.c
+++ b/drivers/gpu/drm/nouveau/nv10_fence.c
@@ -25,7 +25,7 @@
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_dma.h" 27#include "nouveau_dma.h"
28#include "nouveau_ramht.h" 28#include <core/ramht.h>
29#include "nouveau_fence.h" 29#include "nouveau_fence.h"
30 30
31struct nv10_fence_chan { 31struct nv10_fence_chan {
diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
index 67be5db021f..65f7c452e47 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/drivers/gpu/drm/nouveau/nv17_tv.c
@@ -30,7 +30,7 @@
30#include "nouveau_encoder.h" 30#include "nouveau_encoder.h"
31#include "nouveau_connector.h" 31#include "nouveau_connector.h"
32#include "nouveau_crtc.h" 32#include "nouveau_crtc.h"
33#include "nouveau_gpio.h" 33#include <subdev/gpio.h>
34#include "nouveau_hw.h" 34#include "nouveau_hw.h"
35#include "nv17_tv.h" 35#include "nv17_tv.h"
36 36
diff --git a/drivers/gpu/drm/nouveau/nv40_pm.c b/drivers/gpu/drm/nouveau/nv40_pm.c
index e66273aff49..661d9cfd980 100644
--- a/drivers/gpu/drm/nouveau/nv40_pm.c
+++ b/drivers/gpu/drm/nouveau/nv40_pm.c
@@ -24,10 +24,10 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_bios.h" 27#include <nouveau_bios.h>
28#include "nouveau_pm.h" 28#include "nouveau_pm.h"
29#include "nouveau_hw.h" 29#include "nouveau_hw.h"
30#include "nouveau_fifo.h" 30#include <engine/fifo.h>
31 31
32#define min2(a,b) ((a) < (b) ? (a) : (b)) 32#define min2(a,b) ((a) < (b) ? (a) : (b))
33 33
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index b244d9968c5..66abff11d1b 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -31,7 +31,7 @@
31#include "nouveau_connector.h" 31#include "nouveau_connector.h"
32#include "nouveau_fb.h" 32#include "nouveau_fb.h"
33#include "nouveau_fbcon.h" 33#include "nouveau_fbcon.h"
34#include "nouveau_ramht.h" 34#include <core/ramht.h>
35#include "nouveau_software.h" 35#include "nouveau_software.h"
36#include "drm_crtc_helper.h" 36#include "drm_crtc_helper.h"
37 37
diff --git a/drivers/gpu/drm/nouveau/nv50_evo.c b/drivers/gpu/drm/nouveau/nv50_evo.c
index ddcd5559582..5731cb3df67 100644
--- a/drivers/gpu/drm/nouveau/nv50_evo.c
+++ b/drivers/gpu/drm/nouveau/nv50_evo.c
@@ -26,7 +26,7 @@
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_dma.h" 28#include "nouveau_dma.h"
29#include "nouveau_ramht.h" 29#include <core/ramht.h>
30#include "nv50_display.h" 30#include "nv50_display.h"
31 31
32static void 32static void
diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c
index e3c8b05dcae..1593e2402fd 100644
--- a/drivers/gpu/drm/nouveau/nv50_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c
@@ -25,9 +25,9 @@
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_dma.h" 27#include "nouveau_dma.h"
28#include "nouveau_ramht.h" 28#include <core/ramht.h>
29#include "nouveau_fbcon.h" 29#include "nouveau_fbcon.h"
30#include "nouveau_mm.h" 30#include <core/mm.h>
31 31
32int 32int
33nv50_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect) 33nv50_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c
index d020ed4979b..be5704fd4a8 100644
--- a/drivers/gpu/drm/nouveau/nv50_pm.c
+++ b/drivers/gpu/drm/nouveau/nv50_pm.c
@@ -24,7 +24,7 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_bios.h" 27#include <nouveau_bios.h>
28#include "nouveau_hw.h" 28#include "nouveau_hw.h"
29#include "nouveau_pm.h" 29#include "nouveau_pm.h"
30#include "nouveau_hwsq.h" 30#include "nouveau_hwsq.h"
diff --git a/drivers/gpu/drm/nouveau/nv50_software.c b/drivers/gpu/drm/nouveau/nv50_software.c
index df554d9dacb..1440a948d0a 100644
--- a/drivers/gpu/drm/nouveau/nv50_software.c
+++ b/drivers/gpu/drm/nouveau/nv50_software.c
@@ -25,7 +25,7 @@
25#include "drmP.h" 25#include "drmP.h"
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_ramht.h" 28#include <core/ramht.h>
29#include "nouveau_software.h" 29#include "nouveau_software.h"
30 30
31#include "nv50_display.h" 31#include "nv50_display.h"
diff --git a/drivers/gpu/drm/nouveau/nv84_fence.c b/drivers/gpu/drm/nouveau/nv84_fence.c
index c2f889b0d34..199c57c669b 100644
--- a/drivers/gpu/drm/nouveau/nv84_fence.c
+++ b/drivers/gpu/drm/nouveau/nv84_fence.c
@@ -25,8 +25,8 @@
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_dma.h" 27#include "nouveau_dma.h"
28#include "nouveau_fifo.h" 28#include <engine/fifo.h>
29#include "nouveau_ramht.h" 29#include <core/ramht.h>
30#include "nouveau_fence.h" 30#include "nouveau_fence.h"
31 31
32struct nv84_fence_chan { 32struct nv84_fence_chan {
diff --git a/drivers/gpu/drm/nouveau/nva3_pm.c b/drivers/gpu/drm/nouveau/nva3_pm.c
index 798829353fb..ff0fafbfe62 100644
--- a/drivers/gpu/drm/nouveau/nva3_pm.c
+++ b/drivers/gpu/drm/nouveau/nva3_pm.c
@@ -24,7 +24,7 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_bios.h" 27#include <nouveau_bios.h>
28#include "nouveau_pm.h" 28#include "nouveau_pm.h"
29 29
30static u32 read_clk(struct drm_device *, int, bool); 30static u32 read_clk(struct drm_device *, int, bool);
diff --git a/drivers/gpu/drm/nouveau/nvc0_fbcon.c b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
index 797159e7b7a..db26e050c73 100644
--- a/drivers/gpu/drm/nouveau/nvc0_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
@@ -25,9 +25,9 @@
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_dma.h" 27#include "nouveau_dma.h"
28#include "nouveau_ramht.h" 28#include <core/ramht.h>
29#include "nouveau_fbcon.h" 29#include "nouveau_fbcon.h"
30#include "nouveau_mm.h" 30#include <core/mm.h>
31 31
32int 32int
33nvc0_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect) 33nvc0_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
diff --git a/drivers/gpu/drm/nouveau/nvc0_fence.c b/drivers/gpu/drm/nouveau/nvc0_fence.c
index 8e5a2f407ed..79bb31ed6c8 100644
--- a/drivers/gpu/drm/nouveau/nvc0_fence.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fence.c
@@ -25,8 +25,8 @@
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_dma.h" 27#include "nouveau_dma.h"
28#include "nouveau_fifo.h" 28#include <engine/fifo.h>
29#include "nouveau_ramht.h" 29#include <core/ramht.h>
30#include "nouveau_fence.h" 30#include "nouveau_fence.h"
31 31
32struct nvc0_fence_priv { 32struct nvc0_fence_priv {
diff --git a/drivers/gpu/drm/nouveau/nvc0_pm.c b/drivers/gpu/drm/nouveau/nvc0_pm.c
index 4e712b10ebd..81b649864fa 100644
--- a/drivers/gpu/drm/nouveau/nvc0_pm.c
+++ b/drivers/gpu/drm/nouveau/nvc0_pm.c
@@ -24,7 +24,7 @@
24 24
25#include "drmP.h" 25#include "drmP.h"
26#include "nouveau_drv.h" 26#include "nouveau_drv.h"
27#include "nouveau_bios.h" 27#include <nouveau_bios.h>
28#include "nouveau_pm.h" 28#include "nouveau_pm.h"
29 29
30static u32 read_div(struct drm_device *, int, u32, u32); 30static u32 read_div(struct drm_device *, int, u32, u32);
diff --git a/drivers/gpu/drm/nouveau/nvc0_software.c b/drivers/gpu/drm/nouveau/nvc0_software.c
index 93e8c164fec..22527682ec5 100644
--- a/drivers/gpu/drm/nouveau/nvc0_software.c
+++ b/drivers/gpu/drm/nouveau/nvc0_software.c
@@ -25,7 +25,7 @@
25#include "drmP.h" 25#include "drmP.h"
26 26
27#include "nouveau_drv.h" 27#include "nouveau_drv.h"
28#include "nouveau_ramht.h" 28#include <core/ramht.h>
29#include "nouveau_software.h" 29#include "nouveau_software.h"
30 30
31#include "nv50_display.h" 31#include "nv50_display.h"