diff options
Diffstat (limited to 'drivers')
40 files changed, 78 insertions, 48 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c index e5082778..f19a4b0f 100644 --- a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c | |||
@@ -16,10 +16,12 @@ | |||
16 | * this program. | 16 | * this program. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include "gk20a/gk20a.h" /* FERMI and MAXWELL classes defined here */ | 19 | #include "gk20a/gk20a.h" |
20 | #include "hw_ce_gp10b.h" | 20 | |
21 | #include "ce_gp10b.h" | 21 | #include "ce_gp10b.h" |
22 | 22 | ||
23 | #include <nvgpu/hw/gp10b/hw_ce_gp10b.h> | ||
24 | |||
23 | static void ce_nonblockpipe_isr(struct gk20a *g, u32 fifo_intr) | 25 | static void ce_nonblockpipe_isr(struct gk20a *g, u32 fifo_intr) |
24 | { | 26 | { |
25 | gk20a_dbg(gpu_dbg_intr, "ce non-blocking pipe interrupt\n"); | 27 | gk20a_dbg(gpu_dbg_intr, "ce non-blocking pipe interrupt\n"); |
diff --git a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c index 5324b5ef..db4716f3 100644 --- a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include "gm20b/fb_gm20b.h" | 19 | #include "gm20b/fb_gm20b.h" |
20 | #include "gk20a/kind_gk20a.h" | 20 | #include "gk20a/kind_gk20a.h" |
21 | 21 | ||
22 | #include "hw_gmmu_gp10b.h" | 22 | #include <nvgpu/hw/gp10b/hw_gmmu_gp10b.h> |
23 | 23 | ||
24 | static void gp10b_init_uncompressed_kind_map(void) | 24 | static void gp10b_init_uncompressed_kind_map(void) |
25 | { | 25 | { |
diff --git a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c index 7dd200a9..d9e7e7bf 100644 --- a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c | |||
@@ -15,8 +15,9 @@ | |||
15 | 15 | ||
16 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
17 | #include "gk20a/fecs_trace_gk20a.h" | 17 | #include "gk20a/fecs_trace_gk20a.h" |
18 | #include "gp10b/hw_ctxsw_prog_gp10b.h" | 18 | |
19 | #include "gp10b/hw_gr_gp10b.h" | 19 | #include <nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h> |
20 | #include <nvgpu/hw/gp10b/hw_gr_gp10b.h> | ||
20 | 21 | ||
21 | #ifdef CONFIG_GK20A_CTXSW_TRACE | 22 | #ifdef CONFIG_GK20A_CTXSW_TRACE |
22 | static int gp10b_fecs_trace_flush(struct gk20a *g) | 23 | static int gp10b_fecs_trace_flush(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index 40bfa2a5..d5c5327f 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -16,14 +16,16 @@ | |||
16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
18 | 18 | ||
19 | #include "fifo_gp10b.h" | ||
20 | |||
19 | #include "gk20a/gk20a.h" | 21 | #include "gk20a/gk20a.h" |
20 | #include "gm20b/fifo_gm20b.h" | 22 | #include "gm20b/fifo_gm20b.h" |
21 | #include "hw_pbdma_gp10b.h" | 23 | |
22 | #include "fifo_gp10b.h" | 24 | #include <nvgpu/hw/gp10b/hw_pbdma_gp10b.h> |
23 | #include "hw_ccsr_gp10b.h" | 25 | #include <nvgpu/hw/gp10b/hw_ccsr_gp10b.h> |
24 | #include "hw_fifo_gp10b.h" | 26 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> |
25 | #include "hw_ram_gp10b.h" | 27 | #include <nvgpu/hw/gp10b/hw_ram_gp10b.h> |
26 | #include "hw_top_gp10b.h" | 28 | #include <nvgpu/hw/gp10b/hw_top_gp10b.h> |
27 | 29 | ||
28 | static void gp10b_set_pdb_fault_replay_flags(struct gk20a *g, | 30 | static void gp10b_set_pdb_fault_replay_flags(struct gk20a *g, |
29 | struct mem_desc *mem) | 31 | struct mem_desc *mem) |
@@ -145,7 +147,7 @@ static int channel_gp10b_setup_ramfc(struct channel_gk20a *c, | |||
145 | 147 | ||
146 | static u32 gp10b_fifo_get_pbdma_signature(struct gk20a *g) | 148 | static u32 gp10b_fifo_get_pbdma_signature(struct gk20a *g) |
147 | { | 149 | { |
148 | return g->gpu_characteristics.gpfifo_class | 150 | return g->gpu_characteristics.gpfifo_class |
149 | | pbdma_signature_sw_zero_f(); | 151 | | pbdma_signature_sw_zero_f(); |
150 | } | 152 | } |
151 | 153 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h index 3ef8247f..da0e82a9 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.h | |||
@@ -15,7 +15,11 @@ | |||
15 | 15 | ||
16 | #ifndef FIFO_GP10B_H | 16 | #ifndef FIFO_GP10B_H |
17 | #define FIFO_GP10B_H | 17 | #define FIFO_GP10B_H |
18 | |||
18 | struct gpu_ops; | 19 | struct gpu_ops; |
20 | struct channel_gk20a; | ||
21 | |||
19 | void gp10b_init_fifo(struct gpu_ops *gops); | 22 | void gp10b_init_fifo(struct gpu_ops *gops); |
20 | int channel_gp10b_commit_userd(struct channel_gk20a *c); | 23 | int channel_gp10b_commit_userd(struct channel_gk20a *c); |
24 | |||
21 | #endif | 25 | #endif |
diff --git a/drivers/gpu/nvgpu/gp10b/gp10b.c b/drivers/gpu/nvgpu/gp10b/gp10b.c index a541dda3..e2e27258 100644 --- a/drivers/gpu/nvgpu/gp10b/gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gp10b.c | |||
@@ -17,8 +17,9 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include "gk20a/gk20a.h" | 19 | #include "gk20a/gk20a.h" |
20 | #include "hw_fuse_gp10b.h" | 20 | |
21 | #include "hw_gr_gp10b.h" | 21 | #include <nvgpu/hw/gp10b/hw_fuse_gp10b.h> |
22 | #include <nvgpu/hw/gp10b/hw_gr_gp10b.h> | ||
22 | 23 | ||
23 | static u64 gp10b_detect_ecc_enabled_units(struct gk20a *g) | 24 | static u64 gp10b_detect_ecc_enabled_units(struct gk20a *g) |
24 | { | 25 | { |
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 45820c5c..93d7dcbd 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -13,27 +13,28 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "gk20a/gk20a.h" /* FERMI and MAXWELL classes defined here */ | ||
17 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
18 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
19 | #include <linux/tegra-fuse.h> | 18 | #include <linux/tegra-fuse.h> |
20 | #include <linux/version.h> | 19 | #include <linux/version.h> |
20 | #include <linux/vmalloc.h> | ||
21 | 21 | ||
22 | #include <dt-bindings/soc/gm20b-fuse.h> | 22 | #include <dt-bindings/soc/gm20b-fuse.h> |
23 | #include <dt-bindings/soc/gp10b-fuse.h> | 23 | #include <dt-bindings/soc/gp10b-fuse.h> |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | ||
25 | #include "gk20a/gr_gk20a.h" | 26 | #include "gk20a/gr_gk20a.h" |
26 | #include "gk20a/semaphore_gk20a.h" | 27 | #include "gk20a/semaphore_gk20a.h" |
27 | #include "gk20a/dbg_gpu_gk20a.h" | 28 | #include "gk20a/dbg_gpu_gk20a.h" |
28 | 29 | ||
29 | #include "gm20b/gr_gm20b.h" /* for MAXWELL classes */ | 30 | #include "gm20b/gr_gm20b.h" |
30 | #include "gp10b/gr_gp10b.h" | 31 | #include "gp10b/gr_gp10b.h" |
31 | #include "hw_gr_gp10b.h" | ||
32 | #include "hw_fifo_gp10b.h" | ||
33 | #include "hw_ctxsw_prog_gp10b.h" | ||
34 | #include "hw_mc_gp10b.h" | ||
35 | #include "gp10b_sysfs.h" | 32 | #include "gp10b_sysfs.h" |
36 | #include <linux/vmalloc.h> | 33 | |
34 | #include <nvgpu/hw/gp10b/hw_gr_gp10b.h> | ||
35 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> | ||
36 | #include <nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h> | ||
37 | #include <nvgpu/hw/gp10b/hw_mc_gp10b.h> | ||
37 | 38 | ||
38 | #define NVGPU_GFXP_WFI_TIMEOUT_US 100LL | 39 | #define NVGPU_GFXP_WFI_TIMEOUT_US 100LL |
39 | 40 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index a656f10d..d6379374 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -16,10 +16,12 @@ | |||
16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
17 | #include <linux/printk.h> | 17 | #include <linux/printk.h> |
18 | #include <linux/version.h> | 18 | #include <linux/version.h> |
19 | |||
20 | #include <linux/types.h> | 19 | #include <linux/types.h> |
20 | #include <linux/tegra-fuse.h> | ||
21 | 21 | ||
22 | #include "gk20a/gk20a.h" | 22 | #include "gk20a/gk20a.h" |
23 | #include "gk20a/dbg_gpu_gk20a.h" | ||
24 | #include "gk20a/css_gr_gk20a.h" | ||
23 | 25 | ||
24 | #include "gp10b/gr_gp10b.h" | 26 | #include "gp10b/gr_gp10b.h" |
25 | #include "gp10b/fecs_trace_gp10b.h" | 27 | #include "gp10b/fecs_trace_gp10b.h" |
@@ -40,12 +42,10 @@ | |||
40 | #include "gm20b/fifo_gm20b.h" | 42 | #include "gm20b/fifo_gm20b.h" |
41 | #include "gm20b/pmu_gm20b.h" | 43 | #include "gm20b/pmu_gm20b.h" |
42 | #include "gm20b/clk_gm20b.h" | 44 | #include "gm20b/clk_gm20b.h" |
43 | #include <linux/tegra-fuse.h> | ||
44 | 45 | ||
45 | #include "gp10b.h" | 46 | #include "gp10b.h" |
46 | #include "hw_proj_gp10b.h" | 47 | |
47 | #include "gk20a/dbg_gpu_gk20a.h" | 48 | #include <nvgpu/hw/gp10b/hw_proj_gp10b.h> |
48 | #include "gk20a/css_gr_gk20a.h" | ||
49 | 49 | ||
50 | #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) | 50 | #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) |
51 | #define FUSE_OPT_PRIV_SEC_EN_0 0x264 | 51 | #define FUSE_OPT_PRIV_SEC_EN_0 0x264 |
diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c index 31c79aff..c429bcc2 100644 --- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | |||
@@ -19,8 +19,9 @@ | |||
19 | 19 | ||
20 | #include "gk20a/gk20a.h" | 20 | #include "gk20a/gk20a.h" |
21 | #include "gm20b/ltc_gm20b.h" | 21 | #include "gm20b/ltc_gm20b.h" |
22 | #include "hw_mc_gp10b.h" | 22 | |
23 | #include "hw_ltc_gp10b.h" | 23 | #include <nvgpu/hw/gp10b/hw_mc_gp10b.h> |
24 | #include <nvgpu/hw/gp10b/hw_ltc_gp10b.h> | ||
24 | 25 | ||
25 | #include "gk20a/ltc_common.c" | 26 | #include "gk20a/ltc_common.c" |
26 | 27 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c index eda961b6..76848159 100644 --- a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c | |||
@@ -16,8 +16,10 @@ | |||
16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
17 | 17 | ||
18 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |
19 | |||
19 | #include "mc_gp10b.h" | 20 | #include "mc_gp10b.h" |
20 | #include "hw_mc_gp10b.h" | 21 | |
22 | #include <nvgpu/hw/gp10b/hw_mc_gp10b.h> | ||
21 | 23 | ||
22 | void mc_gp10b_intr_enable(struct gk20a *g) | 24 | void mc_gp10b_intr_enable(struct gk20a *g) |
23 | { | 25 | { |
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c index 1b6b6641..835d33f3 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c | |||
@@ -15,14 +15,17 @@ | |||
15 | 15 | ||
16 | #include <linux/pm_runtime.h> | 16 | #include <linux/pm_runtime.h> |
17 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
18 | |||
18 | #include "gk20a/gk20a.h" | 19 | #include "gk20a/gk20a.h" |
20 | #include "gk20a/semaphore_gk20a.h" | ||
21 | |||
19 | #include "mm_gp10b.h" | 22 | #include "mm_gp10b.h" |
20 | #include "rpfb_gp10b.h" | 23 | #include "rpfb_gp10b.h" |
21 | #include "hw_fb_gp10b.h" | 24 | |
22 | #include "hw_ram_gp10b.h" | 25 | #include <nvgpu/hw/gp10b/hw_fb_gp10b.h> |
23 | #include "hw_bus_gp10b.h" | 26 | #include <nvgpu/hw/gp10b/hw_ram_gp10b.h> |
24 | #include "hw_gmmu_gp10b.h" | 27 | #include <nvgpu/hw/gp10b/hw_bus_gp10b.h> |
25 | #include "gk20a/semaphore_gk20a.h" | 28 | #include <nvgpu/hw/gp10b/hw_gmmu_gp10b.h> |
26 | 29 | ||
27 | static u32 gp10b_mm_get_physical_addr_bits(struct gk20a *g) | 30 | static u32 gp10b_mm_get_physical_addr_bits(struct gk20a *g) |
28 | { | 31 | { |
diff --git a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c index 9fabe1f5..c198f9f1 100644 --- a/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/gp10b/platform_gp10b_tegra.c | |||
@@ -18,22 +18,28 @@ | |||
18 | #include <linux/debugfs.h> | 18 | #include <linux/debugfs.h> |
19 | #include <linux/tegra-powergate.h> | 19 | #include <linux/tegra-powergate.h> |
20 | #include <linux/platform_data/tegra_edp.h> | 20 | #include <linux/platform_data/tegra_edp.h> |
21 | #include <uapi/linux/nvgpu.h> | ||
22 | #include <linux/dma-buf.h> | 21 | #include <linux/dma-buf.h> |
23 | #include <linux/nvmap.h> | 22 | #include <linux/nvmap.h> |
24 | #include <linux/reset.h> | 23 | #include <linux/reset.h> |
25 | #include <soc/tegra/tegra_bpmp.h> | ||
26 | #include <linux/hashtable.h> | 24 | #include <linux/hashtable.h> |
25 | |||
26 | #include <linux/platform/tegra/emc_bwmgr.h> | ||
27 | |||
28 | #include <uapi/linux/nvgpu.h> | ||
29 | |||
30 | #include <soc/tegra/tegra_bpmp.h> | ||
31 | |||
27 | #include "gk20a/platform_gk20a.h" | 32 | #include "gk20a/platform_gk20a.h" |
28 | #include "gk20a/gk20a.h" | 33 | #include "gk20a/gk20a.h" |
29 | #include "gk20a/gk20a_scale.h" | 34 | #include "gk20a/gk20a_scale.h" |
35 | |||
30 | #include "platform_tegra.h" | 36 | #include "platform_tegra.h" |
31 | #include "gr_gp10b.h" | 37 | #include "gr_gp10b.h" |
32 | #include "ltc_gp10b.h" | 38 | #include "ltc_gp10b.h" |
33 | #include "hw_gr_gp10b.h" | ||
34 | #include "hw_ltc_gp10b.h" | ||
35 | #include "gp10b_sysfs.h" | 39 | #include "gp10b_sysfs.h" |
36 | #include <linux/platform/tegra/emc_bwmgr.h> | 40 | |
41 | #include <nvgpu/hw/gp10b/hw_gr_gp10b.h> | ||
42 | #include <nvgpu/hw/gp10b/hw_ltc_gp10b.h> | ||
37 | 43 | ||
38 | /* Select every GP10B_FREQ_SELECT_STEP'th frequency from h/w table */ | 44 | /* Select every GP10B_FREQ_SELECT_STEP'th frequency from h/w table */ |
39 | #define GP10B_FREQ_SELECT_STEP 8 | 45 | #define GP10B_FREQ_SELECT_STEP 8 |
diff --git a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c index cf702ac6..fc535985 100644 --- a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | |||
@@ -15,16 +15,18 @@ | |||
15 | 15 | ||
16 | #include <linux/delay.h> /* for udelay */ | 16 | #include <linux/delay.h> /* for udelay */ |
17 | #include <linux/tegra-fuse.h> | 17 | #include <linux/tegra-fuse.h> |
18 | |||
18 | #include "gk20a/gk20a.h" | 19 | #include "gk20a/gk20a.h" |
19 | #include "gk20a/pmu_gk20a.h" | 20 | #include "gk20a/pmu_gk20a.h" |
20 | #include "gm20b/acr_gm20b.h" | 21 | #include "gm20b/acr_gm20b.h" |
21 | #include "gm20b/pmu_gm20b.h" | 22 | #include "gm20b/pmu_gm20b.h" |
22 | 23 | ||
23 | #include "pmu_gp10b.h" | 24 | #include "pmu_gp10b.h" |
24 | #include "hw_pwr_gp10b.h" | ||
25 | #include "hw_fuse_gp10b.h" | ||
26 | #include "gp10b_sysfs.h" | 25 | #include "gp10b_sysfs.h" |
27 | 26 | ||
27 | #include <nvgpu/hw/gp10b/hw_pwr_gp10b.h> | ||
28 | #include <nvgpu/hw/gp10b/hw_fuse_gp10b.h> | ||
29 | |||
28 | #define gp10b_dbg_pmu(fmt, arg...) \ | 30 | #define gp10b_dbg_pmu(fmt, arg...) \ |
29 | gk20a_dbg(gpu_dbg_pmu, fmt, ##arg) | 31 | gk20a_dbg(gpu_dbg_pmu, fmt, ##arg) |
30 | /*! | 32 | /*! |
diff --git a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c index f88718b6..e73bcd8f 100644 --- a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c | |||
@@ -15,12 +15,15 @@ | |||
15 | 15 | ||
16 | #include <linux/pm_runtime.h> | 16 | #include <linux/pm_runtime.h> |
17 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
18 | |||
18 | #include "gk20a/gk20a.h" | 19 | #include "gk20a/gk20a.h" |
20 | |||
19 | #include "rpfb_gp10b.h" | 21 | #include "rpfb_gp10b.h" |
20 | #include "hw_fifo_gp10b.h" | 22 | |
21 | #include "hw_fb_gp10b.h" | 23 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> |
22 | #include "hw_bus_gp10b.h" | 24 | #include <nvgpu/hw/gp10b/hw_fb_gp10b.h> |
23 | #include "hw_gmmu_gp10b.h" | 25 | #include <nvgpu/hw/gp10b/hw_bus_gp10b.h> |
26 | #include <nvgpu/hw/gp10b/hw_gmmu_gp10b.h> | ||
24 | 27 | ||
25 | int gp10b_replayable_pagefault_buffer_init(struct gk20a *g) | 28 | int gp10b_replayable_pagefault_buffer_init(struct gk20a *g) |
26 | { | 29 | { |
diff --git a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c index 7f43cb56..4b346313 100644 --- a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c | |||
@@ -16,7 +16,8 @@ | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |
19 | #include "hw_therm_gp10b.h" | 19 | |
20 | #include <nvgpu/hw/gp10b/hw_therm_gp10b.h> | ||
20 | 21 | ||
21 | static int gp10b_init_therm_setup_hw(struct gk20a *g) | 22 | static int gp10b_init_therm_setup_hw(struct gk20a *g) |
22 | { | 23 | { |
diff --git a/drivers/gpu/nvgpu/gp10b/hw_bus_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_bus_gp10b.h index 02c06610..02c06610 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_bus_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_bus_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_ccsr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ccsr_gp10b.h index 99398961..99398961 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_ccsr_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ccsr_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_ce_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ce_gp10b.h index 3f6e1470..3f6e1470 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_ce_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ce_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_chiplet_pwr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_chiplet_pwr_gp10b.h index 640453ce..640453ce 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_chiplet_pwr_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_chiplet_pwr_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_ctxsw_prog_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h index eef9a96f..eef9a96f 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_ctxsw_prog_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ctxsw_prog_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_fb_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h index ec340777..ec340777 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_fb_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_fifo_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fifo_gp10b.h index 8370d4c6..8370d4c6 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_fifo_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fifo_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_flush_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_flush_gp10b.h index e2dff490..e2dff490 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_flush_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_flush_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_fuse_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fuse_gp10b.h index 2b1acf2f..2b1acf2f 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_fuse_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fuse_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gmmu_gp10b.h index d231ee44..d231ee44 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_gmmu_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gmmu_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h index 9e3137e7..9e3137e7 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_ltc_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ltc_gp10b.h index 4a3f634e..4a3f634e 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_ltc_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ltc_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_mc_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_mc_gp10b.h index 30165e66..30165e66 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_mc_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_mc_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h index 65aedccd..65aedccd 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_pbdma_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_perf_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_perf_gp10b.h index ea1a61d2..ea1a61d2 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_perf_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_perf_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_pram_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pram_gp10b.h index 12a83a71..12a83a71 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_pram_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pram_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_pri_ringmaster_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pri_ringmaster_gp10b.h index 7a458858..7a458858 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_pri_ringmaster_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pri_ringmaster_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_pri_ringstation_sys_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pri_ringstation_sys_gp10b.h index eb711452..eb711452 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_pri_ringstation_sys_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pri_ringstation_sys_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h index 3392242c..3392242c 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_proj_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_proj_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_pwr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pwr_gp10b.h index 9a3591c7..9a3591c7 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_pwr_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pwr_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_ram_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ram_gp10b.h index 89dfbc21..89dfbc21 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_ram_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_ram_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_therm_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_therm_gp10b.h index 8a587b7c..8a587b7c 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_therm_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_therm_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_timer_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_gp10b.h index df27154f..df27154f 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_timer_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/hw_top_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_top_gp10b.h index c6645ca0..c6645ca0 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_top_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_top_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c index 85dc8c22..6027ba7f 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c | |||
@@ -12,10 +12,11 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "vgpu/vgpu.h" | 14 | #include "vgpu/vgpu.h" |
15 | #include "vgpu_gr_gp10b.h" | ||
16 | #include "vgpu/gm20b/vgpu_gr_gm20b.h" | 15 | #include "vgpu/gm20b/vgpu_gr_gm20b.h" |
17 | 16 | ||
18 | #include "gp10b/hw_gr_gp10b.h" | 17 | #include "vgpu_gr_gp10b.h" |
18 | |||
19 | #include <nvgpu/hw/gp10b/hw_gr_gp10b.h> | ||
19 | 20 | ||
20 | static void vgpu_gr_gp10b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm, | 21 | static void vgpu_gr_gp10b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm, |
21 | struct gr_ctx_desc *gr_ctx) | 22 | struct gr_ctx_desc *gr_ctx) |