diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/Makefile.sources | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/xve/xve_gp106.c (renamed from drivers/gpu/nvgpu/gp106/xve_gp106.c) | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/xve/xve_gp106.h (renamed from drivers/gpu/nvgpu/gp106/xve_gp106.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 823a997e..6a075ce4 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -34,7 +34,8 @@ nvgpu-y += common/bus/bus_gk20a.o \ | |||
34 | common/fb/fb_gp10b.o \ | 34 | common/fb/fb_gp10b.o \ |
35 | common/fb/fb_gp106.o \ | 35 | common/fb/fb_gp106.o \ |
36 | common/fb/fb_gv11b.o \ | 36 | common/fb/fb_gv11b.o \ |
37 | common/fb/fb_gv100.o | 37 | common/fb/fb_gv100.o \ |
38 | common/xve/xve_gp106.o | ||
38 | 39 | ||
39 | # Linux specific parts of nvgpu. | 40 | # Linux specific parts of nvgpu. |
40 | nvgpu-y += \ | 41 | nvgpu-y += \ |
@@ -327,9 +328,7 @@ nvgpu-y += \ | |||
327 | clk/clk.o \ | 328 | clk/clk.o \ |
328 | gp106/clk_gp106.o \ | 329 | gp106/clk_gp106.o \ |
329 | gp106/clk_arb_gp106.o \ | 330 | gp106/clk_arb_gp106.o \ |
330 | gp106/xve_gp106.o \ | ||
331 | gp106/therm_gp106.o \ | 331 | gp106/therm_gp106.o \ |
332 | gp106/xve_gp106.o \ | ||
333 | pmgr/pwrdev.o \ | 332 | pmgr/pwrdev.o \ |
334 | pmgr/pmgr.o \ | 333 | pmgr/pmgr.o \ |
335 | pmgr/pmgrpmu.o \ | 334 | pmgr/pmgrpmu.o \ |
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 6e951ae6..677b20bd 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources | |||
@@ -42,6 +42,7 @@ srcs := common/mm/nvgpu_allocator.c \ | |||
42 | common/fb/fb_gp106.c \ | 42 | common/fb/fb_gp106.c \ |
43 | common/fb/fb_gv100.c \ | 43 | common/fb/fb_gv100.c \ |
44 | common/fb/fb_gv11b.c \ | 44 | common/fb/fb_gv11b.c \ |
45 | common/xve/xve_gp106.c \ | ||
45 | common/enabled.c \ | 46 | common/enabled.c \ |
46 | common/pramin.c \ | 47 | common/pramin.c \ |
47 | common/semaphore.c \ | 48 | common/semaphore.c \ |
@@ -201,7 +202,6 @@ srcs := common/mm/nvgpu_allocator.c \ | |||
201 | gp106/fuse_gp106.c \ | 202 | gp106/fuse_gp106.c \ |
202 | gp106/clk_gp106.c \ | 203 | gp106/clk_gp106.c \ |
203 | gp106/clk_arb_gp106.c \ | 204 | gp106/clk_arb_gp106.c \ |
204 | gp106/xve_gp106.c \ | ||
205 | gp106/therm_gp106.c \ | 205 | gp106/therm_gp106.c \ |
206 | gv100/mm_gv100.c \ | 206 | gv100/mm_gv100.c \ |
207 | gv100/gr_ctx_gv100.c \ | 207 | gv100/gr_ctx_gv100.c \ |
diff --git a/drivers/gpu/nvgpu/gp106/xve_gp106.c b/drivers/gpu/nvgpu/common/xve/xve_gp106.c index 40b0ff04..6cfbc9d9 100644 --- a/drivers/gpu/nvgpu/gp106/xve_gp106.c +++ b/drivers/gpu/nvgpu/common/xve/xve_gp106.c | |||
@@ -22,12 +22,13 @@ | |||
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include "gk20a/gk20a.h" |
24 | #include "gp106/bios_gp106.h" | 24 | #include "gp106/bios_gp106.h" |
25 | #include "gp106/xve_gp106.h" | ||
26 | 25 | ||
27 | #include <nvgpu/bug.h> | 26 | #include <nvgpu/bug.h> |
28 | #include <nvgpu/xve.h> | 27 | #include <nvgpu/xve.h> |
29 | #include <nvgpu/io.h> | 28 | #include <nvgpu/io.h> |
30 | 29 | ||
30 | #include "xve_gp106.h" | ||
31 | |||
31 | #include <nvgpu/hw/gp106/hw_xp_gp106.h> | 32 | #include <nvgpu/hw/gp106/hw_xp_gp106.h> |
32 | #include <nvgpu/hw/gp106/hw_xve_gp106.h> | 33 | #include <nvgpu/hw/gp106/hw_xve_gp106.h> |
33 | 34 | ||
diff --git a/drivers/gpu/nvgpu/gp106/xve_gp106.h b/drivers/gpu/nvgpu/common/xve/xve_gp106.h index e0be35ac..e0be35ac 100644 --- a/drivers/gpu/nvgpu/gp106/xve_gp106.h +++ b/drivers/gpu/nvgpu/common/xve/xve_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 2cb43327..07846337 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "common/fb/fb_gp10b.h" | 31 | #include "common/fb/fb_gp10b.h" |
32 | #include "common/fb/fb_gm20b.h" | 32 | #include "common/fb/fb_gm20b.h" |
33 | #include "common/fb/fb_gp106.h" | 33 | #include "common/fb/fb_gp106.h" |
34 | #include "common/xve/xve_gp106.h" | ||
34 | 35 | ||
35 | #include "gk20a/gk20a.h" | 36 | #include "gk20a/gk20a.h" |
36 | #include "gk20a/fifo_gk20a.h" | 37 | #include "gk20a/fifo_gk20a.h" |
@@ -76,7 +77,6 @@ | |||
76 | #include "gp106/mclk_gp106.h" | 77 | #include "gp106/mclk_gp106.h" |
77 | #include "gp106/bios_gp106.h" | 78 | #include "gp106/bios_gp106.h" |
78 | #include "gp106/therm_gp106.h" | 79 | #include "gp106/therm_gp106.h" |
79 | #include "gp106/xve_gp106.h" | ||
80 | #include "gp106/fifo_gp106.h" | 80 | #include "gp106/fifo_gp106.h" |
81 | #include "gp106/clk_gp106.h" | 81 | #include "gp106/clk_gp106.h" |
82 | #include "gp106/mm_gp106.h" | 82 | #include "gp106/mm_gp106.h" |
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index b42c3432..0f7fb370 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include "common/fb/fb_gp10b.h" | 32 | #include "common/fb/fb_gp10b.h" |
33 | #include "common/fb/fb_gv11b.h" | 33 | #include "common/fb/fb_gv11b.h" |
34 | #include "common/fb/fb_gv100.h" | 34 | #include "common/fb/fb_gv100.h" |
35 | #include "common/xve/xve_gp106.h" | ||
35 | 36 | ||
36 | #include "gk20a/gk20a.h" | 37 | #include "gk20a/gk20a.h" |
37 | #include "gk20a/fifo_gk20a.h" | 38 | #include "gk20a/fifo_gk20a.h" |
@@ -59,7 +60,6 @@ | |||
59 | #include "gp106/sec2_gp106.h" | 60 | #include "gp106/sec2_gp106.h" |
60 | #include "gp106/bios_gp106.h" | 61 | #include "gp106/bios_gp106.h" |
61 | #include "gp106/therm_gp106.h" | 62 | #include "gp106/therm_gp106.h" |
62 | #include "gp106/xve_gp106.h" | ||
63 | #include "gp106/clk_gp106.h" | 63 | #include "gp106/clk_gp106.h" |
64 | #include "gp106/flcn_gp106.h" | 64 | #include "gp106/flcn_gp106.h" |
65 | 65 | ||