diff options
author | Alex Waterman <alexw@nvidia.com> | 2016-10-28 19:49:50 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-01-11 15:44:14 -0500 |
commit | b928f10d37bdb57266569073d8b5d553dbf39044 (patch) | |
tree | 60da9d9344963bfac157d91e74107d49109ef9a5 /drivers/gpu | |
parent | 5e68c6e971d98fc9d4beaf69c5ca58f39f8db1a7 (diff) |
gpu: nvgpu: Start re-organizing the HW headers
Reorganize the HW headers of gk20a. The headers are moved to a
new directory:
include/nvgpu/hw/gk20a
And from the code are included like so:
#include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>
This is the first step in reorganizing all of the HW headers for
gm20b, gm206, etc. This is part of a larger effort to re-structure
and make the driver more readable and scalable.
Bug 1799159
Change-Id: Ic151155cbc2e6f75009f2d9d597b364a1bed2c4c
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1244790
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu')
57 files changed, 127 insertions, 99 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c index 06ff9082..cf95f4c5 100644 --- a/drivers/gpu/nvgpu/clk/clk_mclk.c +++ b/drivers/gpu/nvgpu/clk/clk_mclk.c | |||
@@ -16,7 +16,8 @@ | |||
16 | #include "pmuif/gpmuifseq.h" | 16 | #include "pmuif/gpmuifseq.h" |
17 | #include "gm206/bios_gm206.h" | 17 | #include "gm206/bios_gm206.h" |
18 | #include "gk20a/pmu_gk20a.h" | 18 | #include "gk20a/pmu_gk20a.h" |
19 | #include "gk20a/hw_pwr_gk20a.h" | 19 | |
20 | #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h> | ||
20 | #include "gp106/hw_fb_gp106.h" | 21 | #include "gp106/hw_fb_gp106.h" |
21 | 22 | ||
22 | #include "include/bios.h" | 23 | #include "include/bios.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c index 57b49f2c..e4bb2a57 100644 --- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c | |||
@@ -34,8 +34,8 @@ | |||
34 | #include "semaphore_gk20a.h" | 34 | #include "semaphore_gk20a.h" |
35 | #include "nvgpu_common.h" | 35 | #include "nvgpu_common.h" |
36 | 36 | ||
37 | #include "hw_ccsr_gk20a.h" | 37 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
38 | #include "hw_pbdma_gk20a.h" | 38 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
39 | 39 | ||
40 | static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx); | 40 | static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx); |
41 | static struct gk20a_cde_ctx *gk20a_cde_allocate_context(struct gk20a *g); | 41 | static struct gk20a_cde_ctx *gk20a_cde_allocate_context(struct gk20a *g); |
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c index 235bc027..af49c864 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | |||
@@ -29,13 +29,14 @@ | |||
29 | #include "gk20a.h" | 29 | #include "gk20a.h" |
30 | #include "debug_gk20a.h" | 30 | #include "debug_gk20a.h" |
31 | #include "semaphore_gk20a.h" | 31 | #include "semaphore_gk20a.h" |
32 | #include "hw_ce2_gk20a.h" | 32 | |
33 | #include "hw_pbdma_gk20a.h" | 33 | #include <nvgpu/hw/gk20a/hw_ce2_gk20a.h> |
34 | #include "hw_ccsr_gk20a.h" | 34 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
35 | #include "hw_ram_gk20a.h" | 35 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
36 | #include "hw_top_gk20a.h" | 36 | #include <nvgpu/hw/gk20a/hw_ram_gk20a.h> |
37 | #include "hw_mc_gk20a.h" | 37 | #include <nvgpu/hw/gk20a/hw_top_gk20a.h> |
38 | #include "hw_gr_gk20a.h" | 38 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
39 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | ||
39 | 40 | ||
40 | static u32 ce2_nonblockpipe_isr(struct gk20a *g, u32 fifo_intr) | 41 | static u32 ce2_nonblockpipe_isr(struct gk20a *g, u32 fifo_intr) |
41 | { | 42 | { |
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index a731e29c..40d6d91c 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -36,11 +36,11 @@ | |||
36 | #include "fence_gk20a.h" | 36 | #include "fence_gk20a.h" |
37 | #include "semaphore_gk20a.h" | 37 | #include "semaphore_gk20a.h" |
38 | 38 | ||
39 | #include "hw_ram_gk20a.h" | 39 | #include <nvgpu/hw/gk20a/hw_ram_gk20a.h> |
40 | #include "hw_fifo_gk20a.h" | 40 | #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h> |
41 | #include "hw_pbdma_gk20a.h" | 41 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
42 | #include "hw_ccsr_gk20a.h" | 42 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
43 | #include "hw_ltc_gk20a.h" | 43 | #include <nvgpu/hw/gk20a/hw_ltc_gk20a.h> |
44 | 44 | ||
45 | #define NVMAP_HANDLE_PARAM_SIZE 1 | 45 | #define NVMAP_HANDLE_PARAM_SIZE 1 |
46 | 46 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c index 34f3f886..32690c90 100644 --- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c | |||
@@ -23,8 +23,9 @@ | |||
23 | #include <linux/clk/tegra.h> | 23 | #include <linux/clk/tegra.h> |
24 | 24 | ||
25 | #include "gk20a.h" | 25 | #include "gk20a.h" |
26 | #include "hw_trim_gk20a.h" | 26 | |
27 | #include "hw_timer_gk20a.h" | 27 | #include <nvgpu/hw/gk20a/hw_trim_gk20a.h> |
28 | #include <nvgpu/hw/gk20a/hw_timer_gk20a.h> | ||
28 | 29 | ||
29 | #define gk20a_dbg_clk(fmt, arg...) \ | 30 | #define gk20a_dbg_clk(fmt, arg...) \ |
30 | gk20a_dbg(gpu_dbg_clk, fmt, ##arg) | 31 | gk20a_dbg(gpu_dbg_clk, fmt, ##arg) |
diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c index 71614d6e..aa92796c 100644 --- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | |||
@@ -23,10 +23,11 @@ | |||
23 | #include <linux/vmalloc.h> | 23 | #include <linux/vmalloc.h> |
24 | 24 | ||
25 | #include "gk20a.h" | 25 | #include "gk20a.h" |
26 | #include "hw_perf_gk20a.h" | ||
27 | #include "hw_mc_gk20a.h" | ||
28 | #include "css_gr_gk20a.h" | 26 | #include "css_gr_gk20a.h" |
29 | 27 | ||
28 | #include <nvgpu/hw/gk20a/hw_perf_gk20a.h> | ||
29 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | ||
30 | |||
30 | /* check client for pointed perfmon ownership */ | 31 | /* check client for pointed perfmon ownership */ |
31 | #define CONTAINS_PERFMON(cl, pm) \ | 32 | #define CONTAINS_PERFMON(cl, pm) \ |
32 | ((cl)->perfmon_start <= (pm) && \ | 33 | ((cl)->perfmon_start <= (pm) && \ |
diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c index a7f61c8c..26eea610 100644 --- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | |||
@@ -27,9 +27,10 @@ | |||
27 | #include "gr_gk20a.h" | 27 | #include "gr_gk20a.h" |
28 | #include "fence_gk20a.h" | 28 | #include "fence_gk20a.h" |
29 | #include "regops_gk20a.h" | 29 | #include "regops_gk20a.h" |
30 | #include "hw_gr_gk20a.h" | 30 | |
31 | #include "hw_fb_gk20a.h" | 31 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> |
32 | #include "hw_timer_gk20a.h" | 32 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> |
33 | #include <nvgpu/hw/gk20a/hw_timer_gk20a.h> | ||
33 | 34 | ||
34 | 35 | ||
35 | #define HZ_TO_MHZ(a) ((a > 0xF414F9CD7) ? 0xffff : (a >> 32) ? \ | 36 | #define HZ_TO_MHZ(a) ((a > 0xF414F9CD7) ? 0xffff : (a >> 32) ? \ |
diff --git a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c index a443512c..7633c873 100644 --- a/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctxsw_trace_gk20a.c | |||
@@ -28,8 +28,9 @@ | |||
28 | #include "ctxsw_trace_gk20a.h" | 28 | #include "ctxsw_trace_gk20a.h" |
29 | #include "gk20a.h" | 29 | #include "gk20a.h" |
30 | #include "gr_gk20a.h" | 30 | #include "gr_gk20a.h" |
31 | #include "hw_ctxsw_prog_gk20a.h" | 31 | |
32 | #include "hw_gr_gk20a.h" | 32 | #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h> |
33 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | ||
33 | 34 | ||
34 | #define GK20A_CTXSW_TRACE_MAX_VM_RING_SIZE (128*PAGE_SIZE) | 35 | #define GK20A_CTXSW_TRACE_MAX_VM_RING_SIZE (128*PAGE_SIZE) |
35 | 36 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c index ac96036f..be9f7fc6 100644 --- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | |||
@@ -28,9 +28,10 @@ | |||
28 | #include "gr_gk20a.h" | 28 | #include "gr_gk20a.h" |
29 | #include "dbg_gpu_gk20a.h" | 29 | #include "dbg_gpu_gk20a.h" |
30 | #include "regops_gk20a.h" | 30 | #include "regops_gk20a.h" |
31 | #include "hw_therm_gk20a.h" | 31 | |
32 | #include "hw_gr_gk20a.h" | 32 | #include <nvgpu/hw/gk20a/hw_therm_gk20a.h> |
33 | #include "hw_perf_gk20a.h" | 33 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> |
34 | #include <nvgpu/hw/gk20a/hw_perf_gk20a.h> | ||
34 | 35 | ||
35 | /* | 36 | /* |
36 | * API to get first channel from the list of all channels | 37 | * API to get first channel from the list of all channels |
diff --git a/drivers/gpu/nvgpu/gk20a/debug_gk20a.c b/drivers/gpu/nvgpu/gk20a/debug_gk20a.c index 8fa108c2..609ddf72 100644 --- a/drivers/gpu/nvgpu/gk20a/debug_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/debug_gk20a.c | |||
@@ -27,10 +27,10 @@ | |||
27 | #include "debug_gk20a.h" | 27 | #include "debug_gk20a.h" |
28 | #include "semaphore_gk20a.h" | 28 | #include "semaphore_gk20a.h" |
29 | 29 | ||
30 | #include "hw_ram_gk20a.h" | 30 | #include <nvgpu/hw/gk20a/hw_ram_gk20a.h> |
31 | #include "hw_fifo_gk20a.h" | 31 | #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h> |
32 | #include "hw_ccsr_gk20a.h" | 32 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
33 | #include "hw_pbdma_gk20a.h" | 33 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
34 | 34 | ||
35 | unsigned int gk20a_debug_trace_cmdbuf; | 35 | unsigned int gk20a_debug_trace_cmdbuf; |
36 | 36 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c index 2fb7f64b..1efa56fb 100644 --- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c | |||
@@ -17,10 +17,11 @@ | |||
17 | 17 | ||
18 | #include "gk20a.h" | 18 | #include "gk20a.h" |
19 | #include "kind_gk20a.h" | 19 | #include "kind_gk20a.h" |
20 | #include "hw_mc_gk20a.h" | ||
21 | #include "hw_fb_gk20a.h" | ||
22 | #include "fb_gk20a.h" | 20 | #include "fb_gk20a.h" |
23 | 21 | ||
22 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | ||
23 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> | ||
24 | |||
24 | void fb_gk20a_reset(struct gk20a *g) | 25 | void fb_gk20a_reset(struct gk20a *g) |
25 | { | 26 | { |
26 | u32 val; | 27 | u32 val; |
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c index a07faa93..ab88d5cb 100644 --- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | |||
@@ -28,8 +28,9 @@ | |||
28 | #include "fecs_trace_gk20a.h" | 28 | #include "fecs_trace_gk20a.h" |
29 | #include "gk20a.h" | 29 | #include "gk20a.h" |
30 | #include "gr_gk20a.h" | 30 | #include "gr_gk20a.h" |
31 | #include "hw_ctxsw_prog_gk20a.h" | 31 | |
32 | #include "hw_gr_gk20a.h" | 32 | #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h> |
33 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | ||
33 | 34 | ||
34 | /* | 35 | /* |
35 | * If HW circular buffer is getting too many "buffer full" conditions, | 36 | * If HW circular buffer is getting too many "buffer full" conditions, |
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index fb772ebd..ccc3afca 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -27,13 +27,15 @@ | |||
27 | #include "debug_gk20a.h" | 27 | #include "debug_gk20a.h" |
28 | #include "ctxsw_trace_gk20a.h" | 28 | #include "ctxsw_trace_gk20a.h" |
29 | #include "semaphore_gk20a.h" | 29 | #include "semaphore_gk20a.h" |
30 | #include "hw_fifo_gk20a.h" | 30 | |
31 | #include "hw_pbdma_gk20a.h" | 31 | #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h> |
32 | #include "hw_ccsr_gk20a.h" | 32 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
33 | #include "hw_ram_gk20a.h" | 33 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
34 | #include "hw_top_gk20a.h" | 34 | #include <nvgpu/hw/gk20a/hw_ram_gk20a.h> |
35 | #include "hw_mc_gk20a.h" | 35 | #include <nvgpu/hw/gk20a/hw_top_gk20a.h> |
36 | #include "hw_gr_gk20a.h" | 36 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
37 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | ||
38 | |||
37 | #define FECS_METHOD_WFI_RESTORE 0x80000 | 39 | #define FECS_METHOD_WFI_RESTORE 0x80000 |
38 | 40 | ||
39 | static int gk20a_fifo_update_runlist_locked(struct gk20a *g, u32 runlist_id, | 41 | static int gk20a_fifo_update_runlist_locked(struct gk20a *g, u32 runlist_id, |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 753f031a..f2094bfa 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -51,14 +51,6 @@ | |||
51 | #include "ctrl_gk20a.h" | 51 | #include "ctrl_gk20a.h" |
52 | #include "channel_sync_gk20a.h" | 52 | #include "channel_sync_gk20a.h" |
53 | 53 | ||
54 | #include "hw_mc_gk20a.h" | ||
55 | #include "hw_timer_gk20a.h" | ||
56 | #include "hw_bus_gk20a.h" | ||
57 | #include "hw_sim_gk20a.h" | ||
58 | #include "hw_top_gk20a.h" | ||
59 | #include "hw_ltc_gk20a.h" | ||
60 | #include "hw_gr_gk20a.h" | ||
61 | #include "hw_fb_gk20a.h" | ||
62 | #include "gk20a_scale.h" | 54 | #include "gk20a_scale.h" |
63 | #include "ctxsw_trace_gk20a.h" | 55 | #include "ctxsw_trace_gk20a.h" |
64 | #include "dbg_gpu_gk20a.h" | 56 | #include "dbg_gpu_gk20a.h" |
@@ -81,6 +73,16 @@ | |||
81 | #include "nvgpu_gpuid_t19x.h" | 73 | #include "nvgpu_gpuid_t19x.h" |
82 | #endif | 74 | #endif |
83 | 75 | ||
76 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | ||
77 | #include <nvgpu/hw/gk20a/hw_timer_gk20a.h> | ||
78 | #include <nvgpu/hw/gk20a/hw_bus_gk20a.h> | ||
79 | #include <nvgpu/hw/gk20a/hw_sim_gk20a.h> | ||
80 | #include <nvgpu/hw/gk20a/hw_top_gk20a.h> | ||
81 | #include <nvgpu/hw/gk20a/hw_ltc_gk20a.h> | ||
82 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | ||
83 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> | ||
84 | |||
85 | |||
84 | #ifdef CONFIG_ARM64 | 86 | #ifdef CONFIG_ARM64 |
85 | #define __cpuc_flush_dcache_area __flush_dcache_area | 87 | #define __cpuc_flush_dcache_area __flush_dcache_area |
86 | #endif | 88 | #endif |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c index 360af2f4..e651ad2e 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c | |||
@@ -23,9 +23,10 @@ | |||
23 | 23 | ||
24 | #include "gk20a.h" | 24 | #include "gk20a.h" |
25 | #include "gr_ctx_gk20a.h" | 25 | #include "gr_ctx_gk20a.h" |
26 | #include "hw_gr_gk20a.h" | ||
27 | #include "nvgpu_common.h" | 26 | #include "nvgpu_common.h" |
28 | 27 | ||
28 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | ||
29 | |||
29 | static int gr_gk20a_alloc_load_netlist_u32(u32 *src, u32 len, | 30 | static int gr_gk20a_alloc_load_netlist_u32(u32 *src, u32 len, |
30 | struct u32_list_gk20a *u32_list) | 31 | struct u32_list_gk20a *u32_list) |
31 | { | 32 | { |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 2ee2dd43..94f66e83 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -34,24 +34,6 @@ | |||
34 | #include "gk20a.h" | 34 | #include "gk20a.h" |
35 | #include "kind_gk20a.h" | 35 | #include "kind_gk20a.h" |
36 | #include "gr_ctx_gk20a.h" | 36 | #include "gr_ctx_gk20a.h" |
37 | #include "nvgpu_common.h" | ||
38 | |||
39 | #include "hw_ccsr_gk20a.h" | ||
40 | #include "hw_ctxsw_prog_gk20a.h" | ||
41 | #include "hw_fifo_gk20a.h" | ||
42 | #include "hw_gr_gk20a.h" | ||
43 | #include "hw_gmmu_gk20a.h" | ||
44 | #include "hw_mc_gk20a.h" | ||
45 | #include "hw_ram_gk20a.h" | ||
46 | #include "hw_pri_ringmaster_gk20a.h" | ||
47 | #include "hw_pri_ringstation_sys_gk20a.h" | ||
48 | #include "hw_pri_ringstation_gpc_gk20a.h" | ||
49 | #include "hw_pri_ringstation_fbp_gk20a.h" | ||
50 | #include "hw_top_gk20a.h" | ||
51 | #include "hw_ltc_gk20a.h" | ||
52 | #include "hw_fb_gk20a.h" | ||
53 | #include "hw_therm_gk20a.h" | ||
54 | #include "hw_pbdma_gk20a.h" | ||
55 | #include "gr_pri_gk20a.h" | 37 | #include "gr_pri_gk20a.h" |
56 | #include "regops_gk20a.h" | 38 | #include "regops_gk20a.h" |
57 | #include "dbg_gpu_gk20a.h" | 39 | #include "dbg_gpu_gk20a.h" |
@@ -59,6 +41,24 @@ | |||
59 | #include "semaphore_gk20a.h" | 41 | #include "semaphore_gk20a.h" |
60 | #include "platform_gk20a.h" | 42 | #include "platform_gk20a.h" |
61 | #include "ctxsw_trace_gk20a.h" | 43 | #include "ctxsw_trace_gk20a.h" |
44 | #include "nvgpu_common.h" | ||
45 | |||
46 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> | ||
47 | #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h> | ||
48 | #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h> | ||
49 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | ||
50 | #include <nvgpu/hw/gk20a/hw_gmmu_gk20a.h> | ||
51 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | ||
52 | #include <nvgpu/hw/gk20a/hw_ram_gk20a.h> | ||
53 | #include <nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h> | ||
54 | #include <nvgpu/hw/gk20a/hw_pri_ringstation_sys_gk20a.h> | ||
55 | #include <nvgpu/hw/gk20a/hw_pri_ringstation_gpc_gk20a.h> | ||
56 | #include <nvgpu/hw/gk20a/hw_pri_ringstation_fbp_gk20a.h> | ||
57 | #include <nvgpu/hw/gk20a/hw_top_gk20a.h> | ||
58 | #include <nvgpu/hw/gk20a/hw_ltc_gk20a.h> | ||
59 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> | ||
60 | #include <nvgpu/hw/gk20a/hw_therm_gk20a.h> | ||
61 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> | ||
62 | 62 | ||
63 | #define BLK_SIZE (256) | 63 | #define BLK_SIZE (256) |
64 | #define NV_PMM_FBP_STRIDE 0x1000 | 64 | #define NV_PMM_FBP_STRIDE 0x1000 |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h index c3ced432..b89124d6 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_pri_gk20a.h | |||
@@ -23,6 +23,8 @@ | |||
23 | * of the context state store for gr/compute contexts. | 23 | * of the context state store for gr/compute contexts. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <nvgpu/hw/gk20a/hw_ltc_gk20a.h> | ||
27 | |||
26 | /* | 28 | /* |
27 | * GPC pri addressing | 29 | * GPC pri addressing |
28 | */ | 30 | */ |
diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c index 6be62c5e..9eb8e835 100644 --- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c | |||
@@ -29,11 +29,12 @@ | |||
29 | #include "clk_gk20a.h" | 29 | #include "clk_gk20a.h" |
30 | #include "regops_gk20a.h" | 30 | #include "regops_gk20a.h" |
31 | #include "therm_gk20a.h" | 31 | #include "therm_gk20a.h" |
32 | #include "hw_proj_gk20a.h" | ||
33 | #include "tsg_gk20a.h" | 32 | #include "tsg_gk20a.h" |
34 | #include "dbg_gpu_gk20a.h" | 33 | #include "dbg_gpu_gk20a.h" |
35 | #include "css_gr_gk20a.h" | 34 | #include "css_gr_gk20a.h" |
36 | 35 | ||
36 | #include <nvgpu/hw/gk20a/hw_proj_gk20a.h> | ||
37 | |||
37 | static struct gpu_ops gk20a_ops = { | 38 | static struct gpu_ops gk20a_ops = { |
38 | .clock_gating = { | 39 | .clock_gating = { |
39 | .slcg_gr_load_gating_prod = | 40 | .slcg_gr_load_gating_prod = |
diff --git a/drivers/gpu/nvgpu/gk20a/kind_gk20a.c b/drivers/gpu/nvgpu/gk20a/kind_gk20a.c index b76fdfcf..00e7a54c 100644 --- a/drivers/gpu/nvgpu/gk20a/kind_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/kind_gk20a.c | |||
@@ -21,9 +21,10 @@ | |||
21 | #include <linux/bitops.h> | 21 | #include <linux/bitops.h> |
22 | #include <linux/compiler.h> | 22 | #include <linux/compiler.h> |
23 | 23 | ||
24 | #include "hw_gmmu_gk20a.h" | ||
25 | #include "kind_gk20a.h" | 24 | #include "kind_gk20a.h" |
26 | 25 | ||
26 | #include <nvgpu/hw/gk20a/hw_gmmu_gk20a.h> | ||
27 | |||
27 | /* TBD: generate these from kind_macros.h */ | 28 | /* TBD: generate these from kind_macros.h */ |
28 | 29 | ||
29 | /* TBD: not sure on the work creation for gk20a, doubtful */ | 30 | /* TBD: not sure on the work creation for gk20a, doubtful */ |
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c index a81ed66c..103952ca 100644 --- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c | |||
@@ -19,9 +19,10 @@ | |||
19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
20 | #include <trace/events/gk20a.h> | 20 | #include <trace/events/gk20a.h> |
21 | 21 | ||
22 | #include "hw_ltc_gk20a.h" | ||
23 | #include "gk20a.h" | 22 | #include "gk20a.h" |
24 | 23 | ||
24 | #include <nvgpu/hw/gk20a/hw_ltc_gk20a.h> | ||
25 | |||
25 | #include "ltc_common.c" | 26 | #include "ltc_common.c" |
26 | 27 | ||
27 | static int gk20a_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) | 28 | static int gk20a_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) |
diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c index 57368235..107c851c 100644 --- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c | |||
@@ -18,7 +18,8 @@ | |||
18 | 18 | ||
19 | #include "gk20a.h" | 19 | #include "gk20a.h" |
20 | #include "mc_gk20a.h" | 20 | #include "mc_gk20a.h" |
21 | #include "hw_mc_gk20a.h" | 21 | |
22 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | ||
22 | 23 | ||
23 | irqreturn_t mc_gk20a_isr_stall(struct gk20a *g) | 24 | irqreturn_t mc_gk20a_isr_stall(struct gk20a *g) |
24 | { | 25 | { |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index d594a5a4..74476fe4 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -38,18 +38,18 @@ | |||
38 | #include "gk20a.h" | 38 | #include "gk20a.h" |
39 | #include "mm_gk20a.h" | 39 | #include "mm_gk20a.h" |
40 | #include "fence_gk20a.h" | 40 | #include "fence_gk20a.h" |
41 | #include "hw_gmmu_gk20a.h" | ||
42 | #include "hw_fb_gk20a.h" | ||
43 | #include "hw_bus_gk20a.h" | ||
44 | #include "hw_ram_gk20a.h" | ||
45 | #include "hw_pram_gk20a.h" | ||
46 | #include "hw_mc_gk20a.h" | ||
47 | #include "hw_flush_gk20a.h" | ||
48 | #include "hw_ltc_gk20a.h" | ||
49 | |||
50 | #include "kind_gk20a.h" | 41 | #include "kind_gk20a.h" |
51 | #include "semaphore_gk20a.h" | 42 | #include "semaphore_gk20a.h" |
52 | 43 | ||
44 | #include <nvgpu/hw/gk20a/hw_gmmu_gk20a.h> | ||
45 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> | ||
46 | #include <nvgpu/hw/gk20a/hw_bus_gk20a.h> | ||
47 | #include <nvgpu/hw/gk20a/hw_ram_gk20a.h> | ||
48 | #include <nvgpu/hw/gk20a/hw_pram_gk20a.h> | ||
49 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | ||
50 | #include <nvgpu/hw/gk20a/hw_flush_gk20a.h> | ||
51 | #include <nvgpu/hw/gk20a/hw_ltc_gk20a.h> | ||
52 | |||
53 | /* | 53 | /* |
54 | * Flip this to force all gk20a_mem* accesses via PRAMIN from the start of the | 54 | * Flip this to force all gk20a_mem* accesses via PRAMIN from the start of the |
55 | * boot, even for buffers that would work via cpu_va. In runtime, the flag is | 55 | * boot, even for buffers that would work via cpu_va. In runtime, the flag is |
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index 01b9dddf..1aa423a8 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -29,11 +29,12 @@ | |||
29 | #include "gk20a.h" | 29 | #include "gk20a.h" |
30 | #include "gr_gk20a.h" | 30 | #include "gr_gk20a.h" |
31 | #include "semaphore_gk20a.h" | 31 | #include "semaphore_gk20a.h" |
32 | #include "hw_mc_gk20a.h" | ||
33 | #include "hw_pwr_gk20a.h" | ||
34 | #include "hw_top_gk20a.h" | ||
35 | #include "nvgpu_common.h" | 32 | #include "nvgpu_common.h" |
36 | 33 | ||
34 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | ||
35 | #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h> | ||
36 | #include <nvgpu/hw/gk20a/hw_top_gk20a.h> | ||
37 | |||
37 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | 38 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC |
38 | #include "nvgpu_gpuid_t18x.h" | 39 | #include "nvgpu_gpuid_t18x.h" |
39 | #endif | 40 | #endif |
diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c index 695d646f..d16c5fd1 100644 --- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c | |||
@@ -19,9 +19,10 @@ | |||
19 | #include <linux/delay.h> /* for mdelay */ | 19 | #include <linux/delay.h> /* for mdelay */ |
20 | 20 | ||
21 | #include "gk20a.h" | 21 | #include "gk20a.h" |
22 | #include "hw_mc_gk20a.h" | 22 | |
23 | #include "hw_pri_ringmaster_gk20a.h" | 23 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
24 | #include "hw_pri_ringstation_sys_gk20a.h" | 24 | #include <nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h> |
25 | #include <nvgpu/hw/gk20a/hw_pri_ringstation_sys_gk20a.h> | ||
25 | 26 | ||
26 | void gk20a_reset_priv_ring(struct gk20a *g) | 27 | void gk20a_reset_priv_ring(struct gk20a *g) |
27 | { | 28 | { |
@@ -97,4 +98,3 @@ void gk20a_priv_ring_isr(struct gk20a *g) | |||
97 | gk20a_dbg_info("ringmaster intr status0: 0x%08x," | 98 | gk20a_dbg_info("ringmaster intr status0: 0x%08x," |
98 | " status1: 0x%08x", status0, status1); | 99 | " status1: 0x%08x", status0, status1); |
99 | } | 100 | } |
100 | |||
diff --git a/drivers/gpu/nvgpu/gk20a/sched_gk20a.c b/drivers/gpu/nvgpu/gk20a/sched_gk20a.c index a60be7ef..c2374b96 100644 --- a/drivers/gpu/nvgpu/gk20a/sched_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/sched_gk20a.c | |||
@@ -24,13 +24,15 @@ | |||
24 | #include <linux/debugfs.h> | 24 | #include <linux/debugfs.h> |
25 | #include <linux/log2.h> | 25 | #include <linux/log2.h> |
26 | #include <uapi/linux/nvgpu.h> | 26 | #include <uapi/linux/nvgpu.h> |
27 | |||
27 | #include "ctxsw_trace_gk20a.h" | 28 | #include "ctxsw_trace_gk20a.h" |
28 | #include "gk20a.h" | 29 | #include "gk20a.h" |
29 | #include "gr_gk20a.h" | 30 | #include "gr_gk20a.h" |
30 | #include "hw_ctxsw_prog_gk20a.h" | ||
31 | #include "hw_gr_gk20a.h" | ||
32 | #include "sched_gk20a.h" | 31 | #include "sched_gk20a.h" |
33 | 32 | ||
33 | #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h> | ||
34 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | ||
35 | |||
34 | ssize_t gk20a_sched_dev_read(struct file *filp, char __user *buf, | 36 | ssize_t gk20a_sched_dev_read(struct file *filp, char __user *buf, |
35 | size_t size, loff_t *off) | 37 | size_t size, loff_t *off) |
36 | { | 38 | { |
diff --git a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c index e983a814..234c2937 100644 --- a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c | |||
@@ -20,8 +20,9 @@ | |||
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include "gk20a.h" | 22 | #include "gk20a.h" |
23 | #include "hw_gr_gk20a.h" | 23 | |
24 | #include "hw_therm_gk20a.h" | 24 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> |
25 | #include <nvgpu/hw/gk20a/hw_therm_gk20a.h> | ||
25 | 26 | ||
26 | static int gk20a_init_therm_reset_enable_hw(struct gk20a *g) | 27 | static int gk20a_init_therm_reset_enable_hw(struct gk20a *g) |
27 | { | 28 | { |
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c index 8e6f763a..3b2cca0d 100644 --- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c | |||
@@ -23,7 +23,8 @@ | |||
23 | #include <linux/anon_inodes.h> | 23 | #include <linux/anon_inodes.h> |
24 | 24 | ||
25 | #include "gk20a.h" | 25 | #include "gk20a.h" |
26 | #include "hw_ccsr_gk20a.h" | 26 | |
27 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> | ||
27 | 28 | ||
28 | #define NVGPU_TSG_MIN_TIMESLICE_US 1000 | 29 | #define NVGPU_TSG_MIN_TIMESLICE_US 1000 |
29 | #define NVGPU_TSG_MAX_TIMESLICE_US 50000 | 30 | #define NVGPU_TSG_MAX_TIMESLICE_US 50000 |
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index 6cb238b7..367d5943 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |||
@@ -22,9 +22,9 @@ | |||
22 | #include "hw_top_gm20b.h" | 22 | #include "hw_top_gm20b.h" |
23 | #include "hw_pri_ringmaster_gm20b.h" | 23 | #include "hw_pri_ringmaster_gm20b.h" |
24 | 24 | ||
25 | #include "gk20a/ltc_common.c" | ||
26 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
27 | 26 | ||
27 | #include "gk20a/ltc_common.c" | ||
28 | 28 | ||
29 | static int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) | 29 | static int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) |
30 | { | 30 | { |
diff --git a/drivers/gpu/nvgpu/gk20a/hw_bus_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_bus_gk20a.h index 2c902f52..2c902f52 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_bus_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_bus_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_ccsr_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ccsr_gk20a.h index 4877e4a8..4877e4a8 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_ccsr_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ccsr_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_ce2_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ce2_gk20a.h index df1fa836..df1fa836 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_ce2_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ce2_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_ctxsw_prog_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h index 81293403..81293403 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_ctxsw_prog_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_fb_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fb_gk20a.h index b9e124b7..b9e124b7 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_fb_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fb_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fifo_gk20a.h index 4d54c89f..4d54c89f 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_fifo_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_fifo_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_flush_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_flush_gk20a.h index 9cd91fad..9cd91fad 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_flush_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_flush_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_gmmu_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gmmu_gk20a.h index 0a21b6ca..0a21b6ca 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_gmmu_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gmmu_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gr_gk20a.h index 1a888b53..1a888b53 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gr_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_ltc_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ltc_gk20a.h index 84b9c9a6..84b9c9a6 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_ltc_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ltc_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_mc_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_mc_gk20a.h index ea3c2528..ea3c2528 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_mc_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_mc_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pbdma_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pbdma_gk20a.h index 09cfc084..09cfc084 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_pbdma_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pbdma_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_perf_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_perf_gk20a.h index 1ca80d29..1ca80d29 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_perf_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_perf_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pram_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pram_gk20a.h index 918dad9a..918dad9a 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_pram_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pram_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pri_ringmaster_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h index d4007613..d4007613 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_pri_ringmaster_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_fbp_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringstation_fbp_gk20a.h index db16a8de..db16a8de 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_fbp_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringstation_fbp_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_gpc_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringstation_gpc_gk20a.h index e8aad933..e8aad933 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_gpc_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringstation_gpc_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_sys_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringstation_sys_gk20a.h index c281dd54..c281dd54 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_pri_ringstation_sys_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pri_ringstation_sys_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_proj_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_proj_gk20a.h index 047dc7d5..047dc7d5 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_proj_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_proj_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_pwr_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pwr_gk20a.h index ab1eb184..ab1eb184 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_pwr_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pwr_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_ram_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ram_gk20a.h index 0009be33..0009be33 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_ram_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_ram_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_sim_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_sim_gk20a.h index b1e6658d..b1e6658d 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_sim_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_sim_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_therm_gk20a.h index 3f3052ab..3f3052ab 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_therm_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_timer_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h index 4cb36cbe..4cb36cbe 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_timer_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_top_gk20a.h index d99e6135..d99e6135 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_top_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_top_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/gk20a/hw_trim_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_trim_gk20a.h index 3b0aa05b..3b0aa05b 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_trim_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_trim_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c index e9a2d582..339f2237 100644 --- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | |||
@@ -18,8 +18,9 @@ | |||
18 | 18 | ||
19 | #include "vgpu/vgpu.h" | 19 | #include "vgpu/vgpu.h" |
20 | #include "gk20a/ctxsw_trace_gk20a.h" | 20 | #include "gk20a/ctxsw_trace_gk20a.h" |
21 | #include "gk20a/hw_fifo_gk20a.h" | 21 | |
22 | #include "gk20a/hw_ram_gk20a.h" | 22 | #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h> |
23 | #include <nvgpu/hw/gk20a/hw_ram_gk20a.h> | ||
23 | 24 | ||
24 | static void vgpu_channel_bind(struct channel_gk20a *ch) | 25 | static void vgpu_channel_bind(struct channel_gk20a *ch) |
25 | { | 26 | { |
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c index 02a5e87e..6cafc49f 100644 --- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c | |||
@@ -14,9 +14,10 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "vgpu/vgpu.h" | 16 | #include "vgpu/vgpu.h" |
17 | #include "gk20a/hw_gr_gk20a.h" | ||
18 | #include "gk20a/dbg_gpu_gk20a.h" | 17 | #include "gk20a/dbg_gpu_gk20a.h" |
19 | 18 | ||
19 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | ||
20 | |||
20 | static void vgpu_gr_detect_sm_arch(struct gk20a *g) | 21 | static void vgpu_gr_detect_sm_arch(struct gk20a *g) |
21 | { | 22 | { |
22 | struct vgpu_priv_data *priv = vgpu_get_priv_data(g); | 23 | struct vgpu_priv_data *priv = vgpu_get_priv_data(g); |
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index c3dba7d1..0ac79345 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
@@ -23,13 +23,14 @@ | |||
23 | #include "vgpu/fecs_trace_vgpu.h" | 23 | #include "vgpu/fecs_trace_vgpu.h" |
24 | #include "gk20a/debug_gk20a.h" | 24 | #include "gk20a/debug_gk20a.h" |
25 | #include "gk20a/hal_gk20a.h" | 25 | #include "gk20a/hal_gk20a.h" |
26 | #include "gk20a/hw_mc_gk20a.h" | ||
27 | #include "gk20a/ctxsw_trace_gk20a.h" | 26 | #include "gk20a/ctxsw_trace_gk20a.h" |
28 | #include "gk20a/tsg_gk20a.h" | 27 | #include "gk20a/tsg_gk20a.h" |
29 | #include "gk20a/gk20a_scale.h" | 28 | #include "gk20a/gk20a_scale.h" |
30 | #include "gk20a/channel_gk20a.h" | 29 | #include "gk20a/channel_gk20a.h" |
31 | #include "gm20b/hal_gm20b.h" | 30 | #include "gm20b/hal_gm20b.h" |
32 | 31 | ||
32 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | ||
33 | |||
33 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC | 34 | #ifdef CONFIG_ARCH_TEGRA_18x_SOC |
34 | #include "nvgpu_gpuid_t18x.h" | 35 | #include "nvgpu_gpuid_t18x.h" |
35 | #endif | 36 | #endif |