diff options
author | Alex Waterman <alexw@nvidia.com> | 2016-10-28 21:03:55 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-01-11 15:44:15 -0500 |
commit | 78ad8a23ea896abde95f76b2ced0fe353cb4cb60 (patch) | |
tree | c52725895a49d1b8a1f71816eba90ada3316c23e /drivers/gpu/nvgpu | |
parent | 865514be2dbd36b65c3ac128724036ea0ce63321 (diff) |
gpu: nvgpu: Move gp106 HW headers
Move the gp106 HW headers to a new directory specially for them:
include/nvgpu/hw/gp106
And change the code to include like so:
#include <nvgpu/hw/gp106/hw_fb_gp106.h>
This is part of the process to restructure the nvgpu driver.
Bug 1799159
Change-Id: I76a4ff2e92021150ce65a8843bc12bb614a0e68a
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1280327
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
42 files changed, 79 insertions, 43 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c index cf95f4c5..0f191b6f 100644 --- a/drivers/gpu/nvgpu/clk/clk_mclk.c +++ b/drivers/gpu/nvgpu/clk/clk_mclk.c | |||
@@ -11,17 +11,20 @@ | |||
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "gk20a/gk20a.h" | ||
15 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
16 | #include "pmuif/gpmuifseq.h" | 15 | |
17 | #include "gm206/bios_gm206.h" | 16 | #include "gk20a/gk20a.h" |
18 | #include "gk20a/pmu_gk20a.h" | 17 | #include "gk20a/pmu_gk20a.h" |
19 | 18 | ||
20 | #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h> | 19 | #include "pmuif/gpmuifseq.h" |
21 | #include "gp106/hw_fb_gp106.h" | 20 | |
21 | #include "gm206/bios_gm206.h" | ||
22 | 22 | ||
23 | #include "include/bios.h" | 23 | #include "include/bios.h" |
24 | 24 | ||
25 | #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h> | ||
26 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> | ||
27 | |||
25 | #define VREG_COUNT 24 | 28 | #define VREG_COUNT 24 |
26 | 29 | ||
27 | struct memory_link_training_pattern { | 30 | struct memory_link_training_pattern { |
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c index 649eb234..e2a209ee 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.c +++ b/drivers/gpu/nvgpu/clk/clk_vin.c | |||
@@ -12,17 +12,25 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "gk20a/gk20a.h" | 14 | #include "gk20a/gk20a.h" |
15 | #include "clk.h" | 15 | |
16 | #include "clk_vin.h" | ||
17 | #include "include/bios.h" | 16 | #include "include/bios.h" |
17 | |||
18 | #include "boardobj/boardobjgrp.h" | 18 | #include "boardobj/boardobjgrp.h" |
19 | #include "boardobj/boardobjgrp_e32.h" | 19 | #include "boardobj/boardobjgrp_e32.h" |
20 | |||
20 | #include "pmuif/gpmuifboardobj.h" | 21 | #include "pmuif/gpmuifboardobj.h" |
21 | #include "pmuif/gpmuifclk.h" | 22 | #include "pmuif/gpmuifclk.h" |
22 | #include "gm206/bios_gm206.h" | 23 | |
23 | #include "ctrl/ctrlvolt.h" | 24 | #include "ctrl/ctrlvolt.h" |
25 | |||
26 | #include "gm206/bios_gm206.h" | ||
24 | #include "gk20a/pmu_gk20a.h" | 27 | #include "gk20a/pmu_gk20a.h" |
25 | #include "gp106/hw_fuse_gp106.h" | 28 | |
29 | #include "clk.h" | ||
30 | #include "clk_vin.h" | ||
31 | |||
32 | |||
33 | #include <nvgpu/hw/gp106/hw_fuse_gp106.h> | ||
26 | 34 | ||
27 | static u32 devinit_get_vin_device_table(struct gk20a *g, | 35 | static u32 devinit_get_vin_device_table(struct gk20a *g, |
28 | struct avfsvinobjs *pvinobjs); | 36 | struct avfsvinobjs *pvinobjs); |
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index 5ed6300c..58c4e68a 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c | |||
@@ -22,15 +22,18 @@ | |||
22 | #include "gk20a/gk20a.h" | 22 | #include "gk20a/gk20a.h" |
23 | #include "gk20a/pmu_gk20a.h" | 23 | #include "gk20a/pmu_gk20a.h" |
24 | #include "gk20a/semaphore_gk20a.h" | 24 | #include "gk20a/semaphore_gk20a.h" |
25 | #include "gp106/hw_psec_gp106.h" | 25 | |
26 | #include "gp106/hw_pwr_gp106.h" | ||
27 | #include "gm206/acr_gm206.h" | 26 | #include "gm206/acr_gm206.h" |
28 | #include "gm20b/acr_gm20b.h" | 27 | #include "gm20b/acr_gm20b.h" |
29 | #include "gm206/pmu_gm206.h" | 28 | #include "gm206/pmu_gm206.h" |
29 | |||
30 | #include "sec2_gp106.h" | 30 | #include "sec2_gp106.h" |
31 | #include "nvgpu_gpuid_t18x.h" | 31 | #include "nvgpu_gpuid_t18x.h" |
32 | #include "nvgpu_common.h" | 32 | #include "nvgpu_common.h" |
33 | 33 | ||
34 | #include <nvgpu/hw/gp106/hw_psec_gp106.h> | ||
35 | #include <nvgpu/hw/gp106/hw_pwr_gp106.h> | ||
36 | |||
34 | /*Defines*/ | 37 | /*Defines*/ |
35 | #define gp106_dbg_pmu(fmt, arg...) \ | 38 | #define gp106_dbg_pmu(fmt, arg...) \ |
36 | gk20a_dbg(gpu_dbg_pmu, fmt, ##arg) | 39 | gk20a_dbg(gpu_dbg_pmu, fmt, ##arg) |
diff --git a/drivers/gpu/nvgpu/gp106/bios_gp106.c b/drivers/gpu/nvgpu/gp106/bios_gp106.c index 8be4314d..d3e565ca 100644 --- a/drivers/gpu/nvgpu/gp106/bios_gp106.c +++ b/drivers/gpu/nvgpu/gp106/bios_gp106.c | |||
@@ -13,8 +13,10 @@ | |||
13 | 13 | ||
14 | #include "gk20a/gk20a.h" | 14 | #include "gk20a/gk20a.h" |
15 | #include "gm206/bios_gm206.h" | 15 | #include "gm206/bios_gm206.h" |
16 | |||
16 | #include "bios_gp106.h" | 17 | #include "bios_gp106.h" |
17 | #include "hw_gc6_gp106.h" | 18 | |
19 | #include <nvgpu/hw/gp106/hw_gc6_gp106.h> | ||
18 | 20 | ||
19 | static void gp106_init_xmemsel_zm_nv_reg_array(struct gk20a *g, bool *condition, | 21 | static void gp106_init_xmemsel_zm_nv_reg_array(struct gk20a *g, bool *condition, |
20 | u32 reg, u32 stride, u32 count, u32 data_table_offset) | 22 | u32 reg, u32 stride, u32 count, u32 data_table_offset) |
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c index 4c9bc782..709527e3 100644 --- a/drivers/gpu/nvgpu/gp106/clk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c | |||
@@ -25,10 +25,12 @@ | |||
25 | #include <linux/tegra-fuse.h> | 25 | #include <linux/tegra-fuse.h> |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | #include "hw_trim_gp106.h" | 28 | |
29 | #include "clk_gp106.h" | 29 | #include "clk_gp106.h" |
30 | #include "clk/clk_arb.h" | 30 | #include "clk/clk_arb.h" |
31 | 31 | ||
32 | #include <nvgpu/hw/gp106/hw_trim_gp106.h> | ||
33 | |||
32 | #define gk20a_dbg_clk(fmt, arg...) \ | 34 | #define gk20a_dbg_clk(fmt, arg...) \ |
33 | gk20a_dbg(gpu_dbg_clk, fmt, ##arg) | 35 | gk20a_dbg(gpu_dbg_clk, fmt, ##arg) |
34 | 36 | ||
@@ -270,4 +272,3 @@ void gp106_init_clk_ops(struct gpu_ops *gops) { | |||
270 | gops->clk.get_crystal_clk_hz = gp106_crystal_clk_hz; | 272 | gops->clk.get_crystal_clk_hz = gp106_crystal_clk_hz; |
271 | gops->clk.get_rate = gp106_clk_get_rate; | 273 | gops->clk.get_rate = gp106_clk_get_rate; |
272 | } | 274 | } |
273 | |||
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.c b/drivers/gpu/nvgpu/gp106/fb_gp106.c index ef9f1094..81c52677 100644 --- a/drivers/gpu/nvgpu/gp106/fb_gp106.c +++ b/drivers/gpu/nvgpu/gp106/fb_gp106.c | |||
@@ -16,7 +16,8 @@ | |||
16 | 16 | ||
17 | #include "gk20a/gk20a.h" | 17 | #include "gk20a/gk20a.h" |
18 | #include "gp10b/fb_gp10b.h" | 18 | #include "gp10b/fb_gp10b.h" |
19 | #include "hw_fb_gp106.h" | 19 | |
20 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> | ||
20 | 21 | ||
21 | #define HW_SCRUB_TIMEOUT_DEFAULT 100 /* usec */ | 22 | #define HW_SCRUB_TIMEOUT_DEFAULT 100 /* usec */ |
22 | #define HW_SCRUB_TIMEOUT_MAX 2000000 /* usec */ | 23 | #define HW_SCRUB_TIMEOUT_MAX 2000000 /* usec */ |
diff --git a/drivers/gpu/nvgpu/gp106/fifo_gp106.c b/drivers/gpu/nvgpu/gp106/fifo_gp106.c index 3c70d517..5fa03d6f 100644 --- a/drivers/gpu/nvgpu/gp106/fifo_gp106.c +++ b/drivers/gpu/nvgpu/gp106/fifo_gp106.c | |||
@@ -13,9 +13,11 @@ | |||
13 | 13 | ||
14 | #include "gk20a/gk20a.h" | 14 | #include "gk20a/gk20a.h" |
15 | #include "gp10b/fifo_gp10b.h" | 15 | #include "gp10b/fifo_gp10b.h" |
16 | |||
16 | #include "fifo_gp106.h" | 17 | #include "fifo_gp106.h" |
17 | #include "hw_ccsr_gp106.h" | 18 | |
18 | #include "hw_fifo_gp106.h" | 19 | #include <nvgpu/hw/gp106/hw_ccsr_gp106.h> |
20 | #include <nvgpu/hw/gp106/hw_fifo_gp106.h> | ||
19 | 21 | ||
20 | static u32 gp106_fifo_get_num_fifos(struct gk20a *g) | 22 | static u32 gp106_fifo_get_num_fifos(struct gk20a *g) |
21 | { | 23 | { |
diff --git a/drivers/gpu/nvgpu/gp106/gr_gp106.c b/drivers/gpu/nvgpu/gp106/gr_gp106.c index cbcb5981..5b4de94a 100644 --- a/drivers/gpu/nvgpu/gp106/gr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/gr_gp106.c | |||
@@ -13,14 +13,14 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "gk20a/gk20a.h" /* FERMI and MAXWELL classes defined here */ | 16 | #include "gk20a/gk20a.h" |
17 | |||
18 | #include "gk20a/gr_gk20a.h" | 17 | #include "gk20a/gr_gk20a.h" |
19 | 18 | #include "gm20b/gr_gm20b.h" | |
20 | #include "gm20b/gr_gm20b.h" /* for MAXWELL classes */ | ||
21 | #include "gp10b/gr_gp10b.h" | 19 | #include "gp10b/gr_gp10b.h" |
20 | |||
22 | #include "gr_gp106.h" | 21 | #include "gr_gp106.h" |
23 | #include "hw_gr_gp106.h" | 22 | |
23 | #include <nvgpu/hw/gp106/hw_gr_gp106.h> | ||
24 | 24 | ||
25 | static bool gr_gp106_is_valid_class(struct gk20a *g, u32 class_num) | 25 | static bool gr_gp106_is_valid_class(struct gk20a *g, u32 class_num) |
26 | { | 26 | { |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index dd87de7d..e3874c06 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -19,37 +19,42 @@ | |||
19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
20 | 20 | ||
21 | #include "gk20a/gk20a.h" | 21 | #include "gk20a/gk20a.h" |
22 | #include "gk20a/dbg_gpu_gk20a.h" | ||
23 | #include "gk20a/css_gr_gk20a.h" | ||
22 | 24 | ||
23 | #include "gp10b/gr_gp10b.h" | 25 | #include "gp10b/gr_gp10b.h" |
24 | #include "gp10b/fecs_trace_gp10b.h" | 26 | #include "gp10b/fecs_trace_gp10b.h" |
25 | #include "gp10b/mc_gp10b.h" | 27 | #include "gp10b/mc_gp10b.h" |
26 | #include "gp106/ltc_gp106.h" | ||
27 | #include "gp10b/mm_gp10b.h" | 28 | #include "gp10b/mm_gp10b.h" |
28 | #include "gp10b/ce_gp10b.h" | 29 | #include "gp10b/ce_gp10b.h" |
29 | #include "gp106/fifo_gp106.h" | 30 | #include "gp10b/regops_gp10b.h" |
30 | #include "gp106/regops_gp106.h" | ||
31 | #include "gp10b/cde_gp10b.h" | 31 | #include "gp10b/cde_gp10b.h" |
32 | #include "gp106/therm_gp106.h" | ||
33 | #include "gp106/xve_gp106.h" | ||
34 | 32 | ||
35 | #include "gp106/bios_gp106.h" | 33 | #include "gp106/fifo_gp106.h" |
34 | #include "gp106/regops_gp106.h" | ||
36 | 35 | ||
37 | #include "gm20b/gr_gm20b.h" | 36 | #include "gm20b/gr_gm20b.h" |
38 | #include "gm20b/fifo_gm20b.h" | 37 | #include "gm20b/fifo_gm20b.h" |
39 | #include "gm20b/pmu_gm20b.h" | 38 | #include "gm20b/pmu_gm20b.h" |
39 | |||
40 | #include "gp106/clk_gp106.h" | 40 | #include "gp106/clk_gp106.h" |
41 | #include "gp106/clk_arb_gp106.h" | 41 | #include "gp106/clk_arb_gp106.h" |
42 | 42 | #include "gp106/bios_gp106.h" | |
43 | #include "gp106/therm_gp106.h" | ||
44 | #include "gp106/xve_gp106.h" | ||
45 | #include "gp106/fifo_gp106.h" | ||
46 | #include "gp106/ltc_gp106.h" | ||
47 | #include "gp106/clk_gp106.h" | ||
43 | #include "gp106/mm_gp106.h" | 48 | #include "gp106/mm_gp106.h" |
44 | #include "gp106/pmu_gp106.h" | 49 | #include "gp106/pmu_gp106.h" |
45 | #include "gp106/gr_ctx_gp106.h" | 50 | #include "gp106/gr_ctx_gp106.h" |
46 | #include "gp106/gr_gp106.h" | 51 | #include "gp106/gr_gp106.h" |
47 | #include "gp106/fb_gp106.h" | 52 | #include "gp106/fb_gp106.h" |
48 | #include "gp106/gp106_gating_reglist.h" | 53 | #include "gp106/gp106_gating_reglist.h" |
54 | |||
49 | #include "nvgpu_gpuid_t18x.h" | 55 | #include "nvgpu_gpuid_t18x.h" |
50 | #include "hw_proj_gp106.h" | 56 | |
51 | #include "gk20a/dbg_gpu_gk20a.h" | 57 | #include <nvgpu/hw/gp106/hw_proj_gp106.h> |
52 | #include "gk20a/css_gr_gk20a.h" | ||
53 | 58 | ||
54 | static struct gpu_ops gp106_ops = { | 59 | static struct gpu_ops gp106_ops = { |
55 | .clock_gating = { | 60 | .clock_gating = { |
diff --git a/drivers/gpu/nvgpu/gp106/mm_gp106.c b/drivers/gpu/nvgpu/gp106/mm_gp106.c index 3309a0d7..b7d7e8b8 100644 --- a/drivers/gpu/nvgpu/gp106/mm_gp106.c +++ b/drivers/gpu/nvgpu/gp106/mm_gp106.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include "gp10b/mm_gp10b.h" | 17 | #include "gp10b/mm_gp10b.h" |
18 | #include "gp106/mm_gp106.h" | 18 | #include "gp106/mm_gp106.h" |
19 | 19 | ||
20 | #include "hw_fb_gp106.h" | 20 | #include <nvgpu/hw/gp106/hw_fb_gp106.h> |
21 | 21 | ||
22 | static size_t gp106_mm_get_vidmem_size(struct gk20a *g) | 22 | static size_t gp106_mm_get_vidmem_size(struct gk20a *g) |
23 | { | 23 | { |
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c index c28073b6..f294b1e0 100644 --- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c +++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c | |||
@@ -12,21 +12,25 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/delay.h> /* for udelay */ | 14 | #include <linux/delay.h> /* for udelay */ |
15 | |||
15 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
16 | #include "gk20a/pmu_gk20a.h" | 17 | #include "gk20a/pmu_gk20a.h" |
17 | 18 | ||
18 | #include "gm206/pmu_gm206.h" | ||
19 | #include "gm20b/pmu_gm20b.h" | 19 | #include "gm20b/pmu_gm20b.h" |
20 | #include "gm206/pmu_gm206.h" | ||
20 | #include "gp10b/pmu_gp10b.h" | 21 | #include "gp10b/pmu_gp10b.h" |
21 | #include "gp106/pmu_gp106.h" | 22 | #include "gp106/pmu_gp106.h" |
22 | #include "gp106/acr_gp106.h" | 23 | #include "gp106/acr_gp106.h" |
23 | #include "gp106/hw_psec_gp106.h" | 24 | |
24 | #include "clk/clk_mclk.h" | 25 | #include "clk/clk_mclk.h" |
25 | #include "hw_mc_gp106.h" | 26 | |
26 | #include "hw_pwr_gp106.h" | ||
27 | #include "lpwr/lpwr.h" | 27 | #include "lpwr/lpwr.h" |
28 | #include "lpwr/rppg.h" | 28 | #include "lpwr/rppg.h" |
29 | 29 | ||
30 | #include <nvgpu/hw/gp106/hw_psec_gp106.h> | ||
31 | #include <nvgpu/hw/gp106/hw_mc_gp106.h> | ||
32 | #include <nvgpu/hw/gp106/hw_pwr_gp106.h> | ||
33 | |||
30 | #define PMU_MEM_SCRUBBING_TIMEOUT_MAX 1000 | 34 | #define PMU_MEM_SCRUBBING_TIMEOUT_MAX 1000 |
31 | #define PMU_MEM_SCRUBBING_TIMEOUT_DEFAULT 10 | 35 | #define PMU_MEM_SCRUBBING_TIMEOUT_DEFAULT 10 |
32 | 36 | ||
diff --git a/drivers/gpu/nvgpu/gp106/sec2_gp106.c b/drivers/gpu/nvgpu/gp106/sec2_gp106.c index 8f34edd1..738519cf 100644 --- a/drivers/gpu/nvgpu/gp106/sec2_gp106.c +++ b/drivers/gpu/nvgpu/gp106/sec2_gp106.c | |||
@@ -13,20 +13,26 @@ | |||
13 | 13 | ||
14 | #include <linux/delay.h> /* for udelay */ | 14 | #include <linux/delay.h> /* for udelay */ |
15 | #include <linux/clk.h> | 15 | #include <linux/clk.h> |
16 | |||
16 | #include "gk20a/gk20a.h" | 17 | #include "gk20a/gk20a.h" |
17 | #include "gk20a/pmu_gk20a.h" | 18 | #include "gk20a/pmu_gk20a.h" |
18 | 19 | ||
19 | #include "gm206/pmu_gm206.h" | 20 | #include "gm206/pmu_gm206.h" |
21 | |||
20 | #include "gm20b/pmu_gm20b.h" | 22 | #include "gm20b/pmu_gm20b.h" |
23 | |||
21 | #include "gp10b/pmu_gp10b.h" | 24 | #include "gp10b/pmu_gp10b.h" |
25 | |||
22 | #include "gp106/pmu_gp106.h" | 26 | #include "gp106/pmu_gp106.h" |
23 | #include "gp106/acr_gp106.h" | 27 | #include "gp106/acr_gp106.h" |
24 | #include "gp106/hw_mc_gp106.h" | 28 | |
25 | #include "gp106/hw_pwr_gp106.h" | ||
26 | #include "gp106/hw_psec_gp106.h" | ||
27 | #include "sec2_gp106.h" | 29 | #include "sec2_gp106.h" |
28 | #include "acr.h" | 30 | #include "acr.h" |
29 | 31 | ||
32 | #include <nvgpu/hw/gp106/hw_mc_gp106.h> | ||
33 | #include <nvgpu/hw/gp106/hw_pwr_gp106.h> | ||
34 | #include <nvgpu/hw/gp106/hw_psec_gp106.h> | ||
35 | |||
30 | /*Defines*/ | 36 | /*Defines*/ |
31 | #define gm20b_dbg_pmu(fmt, arg...) \ | 37 | #define gm20b_dbg_pmu(fmt, arg...) \ |
32 | gk20a_dbg(gpu_dbg_pmu, fmt, ##arg) | 38 | gk20a_dbg(gpu_dbg_pmu, fmt, ##arg) |
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c index bbcc5c80..c6ce6467 100644 --- a/drivers/gpu/nvgpu/gp106/therm_gp106.c +++ b/drivers/gpu/nvgpu/gp106/therm_gp106.c | |||
@@ -13,9 +13,10 @@ | |||
13 | 13 | ||
14 | #include "therm_gp106.h" | 14 | #include "therm_gp106.h" |
15 | #include <linux/debugfs.h> | 15 | #include <linux/debugfs.h> |
16 | #include "hw_therm_gp106.h" | ||
17 | #include "therm/thrmpmu.h" | 16 | #include "therm/thrmpmu.h" |
18 | 17 | ||
18 | #include <nvgpu/hw/gp106/hw_therm_gp106.h> | ||
19 | |||
19 | static void gp106_get_internal_sensor_limits(s32 *max_24_8, s32 *min_24_8) | 20 | static void gp106_get_internal_sensor_limits(s32 *max_24_8, s32 *min_24_8) |
20 | { | 21 | { |
21 | *max_24_8 = (0x87 << 8); | 22 | *max_24_8 = (0x87 << 8); |
diff --git a/drivers/gpu/nvgpu/gp106/xve_gp106.c b/drivers/gpu/nvgpu/gp106/xve_gp106.c index 71580e40..a0ee8108 100644 --- a/drivers/gpu/nvgpu/gp106/xve_gp106.c +++ b/drivers/gpu/nvgpu/gp106/xve_gp106.c | |||
@@ -22,8 +22,8 @@ | |||
22 | #include "gm206/bios_gm206.h" | 22 | #include "gm206/bios_gm206.h" |
23 | #include "gp106/xve_gp106.h" | 23 | #include "gp106/xve_gp106.h" |
24 | 24 | ||
25 | #include "gp106/hw_xp_gp106.h" | 25 | #include <nvgpu/hw/gp106/hw_xp_gp106.h> |
26 | #include "gp106/hw_xve_gp106.h" | 26 | #include <nvgpu/hw/gp106/hw_xve_gp106.h> |
27 | 27 | ||
28 | /** | 28 | /** |
29 | * Init a timer and place the timeout data in @timeout. | 29 | * Init a timer and place the timeout data in @timeout. |
diff --git a/drivers/gpu/nvgpu/gp106/hw_bus_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_bus_gp106.h index 6d80b6a6..6d80b6a6 100644 --- a/drivers/gpu/nvgpu/gp106/hw_bus_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_bus_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_ccsr_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ccsr_gp106.h index 65146d39..65146d39 100644 --- a/drivers/gpu/nvgpu/gp106/hw_ccsr_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ccsr_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_ce_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ce_gp106.h index 36311136..36311136 100644 --- a/drivers/gpu/nvgpu/gp106/hw_ce_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ce_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_ctxsw_prog_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ctxsw_prog_gp106.h index ed3e6009..ed3e6009 100644 --- a/drivers/gpu/nvgpu/gp106/hw_ctxsw_prog_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ctxsw_prog_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_fb_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h index 519679f5..519679f5 100644 --- a/drivers/gpu/nvgpu/gp106/hw_fb_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_fbpa_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fbpa_gp106.h index 7f02eeb6..7f02eeb6 100644 --- a/drivers/gpu/nvgpu/gp106/hw_fbpa_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fbpa_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_fifo_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fifo_gp106.h index ec02257e..ec02257e 100644 --- a/drivers/gpu/nvgpu/gp106/hw_fifo_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fifo_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_flush_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_flush_gp106.h index 83bd65bb..83bd65bb 100644 --- a/drivers/gpu/nvgpu/gp106/hw_flush_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_flush_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_fuse_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fuse_gp106.h index 32d8a4f2..32d8a4f2 100644 --- a/drivers/gpu/nvgpu/gp106/hw_fuse_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fuse_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_gc6_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gc6_gp106.h index 25aca9b5..25aca9b5 100644 --- a/drivers/gpu/nvgpu/gp106/hw_gc6_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gc6_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_gmmu_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gmmu_gp106.h index 96ab77df..96ab77df 100644 --- a/drivers/gpu/nvgpu/gp106/hw_gmmu_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gmmu_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_gr_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h index bb1f9fa9..bb1f9fa9 100644 --- a/drivers/gpu/nvgpu/gp106/hw_gr_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_ltc_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ltc_gp106.h index d760b588..d760b588 100644 --- a/drivers/gpu/nvgpu/gp106/hw_ltc_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ltc_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_mc_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_mc_gp106.h index 99ad8bc0..99ad8bc0 100644 --- a/drivers/gpu/nvgpu/gp106/hw_mc_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_mc_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_pbdma_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pbdma_gp106.h index 1e299bae..1e299bae 100644 --- a/drivers/gpu/nvgpu/gp106/hw_pbdma_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pbdma_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_perf_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_perf_gp106.h index cd3501a8..cd3501a8 100644 --- a/drivers/gpu/nvgpu/gp106/hw_perf_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_perf_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_pri_ringmaster_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pri_ringmaster_gp106.h index 0eb2187a..0eb2187a 100644 --- a/drivers/gpu/nvgpu/gp106/hw_pri_ringmaster_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pri_ringmaster_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_pri_ringstation_sys_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pri_ringstation_sys_gp106.h index a22d6a05..a22d6a05 100644 --- a/drivers/gpu/nvgpu/gp106/hw_pri_ringstation_sys_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pri_ringstation_sys_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_proj_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h index 8042bcae..8042bcae 100644 --- a/drivers/gpu/nvgpu/gp106/hw_proj_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_proj_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_psec_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_psec_gp106.h index f9c9f69c..f9c9f69c 100644 --- a/drivers/gpu/nvgpu/gp106/hw_psec_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_psec_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_pwr_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pwr_gp106.h index b4dfea0d..b4dfea0d 100644 --- a/drivers/gpu/nvgpu/gp106/hw_pwr_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pwr_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_ram_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ram_gp106.h index eb02ac28..eb02ac28 100644 --- a/drivers/gpu/nvgpu/gp106/hw_ram_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_ram_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_therm_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_therm_gp106.h index 36ffcc7a..36ffcc7a 100644 --- a/drivers/gpu/nvgpu/gp106/hw_therm_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_therm_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_timer_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_timer_gp106.h index 62771628..62771628 100644 --- a/drivers/gpu/nvgpu/gp106/hw_timer_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_timer_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_top_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_top_gp106.h index 85350954..85350954 100644 --- a/drivers/gpu/nvgpu/gp106/hw_top_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_top_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_trim_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_trim_gp106.h index 42d3fd32..42d3fd32 100644 --- a/drivers/gpu/nvgpu/gp106/hw_trim_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_trim_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_xp_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_xp_gp106.h index 40b14da1..40b14da1 100644 --- a/drivers/gpu/nvgpu/gp106/hw_xp_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_xp_gp106.h | |||
diff --git a/drivers/gpu/nvgpu/gp106/hw_xve_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_xve_gp106.h index 24434ae0..24434ae0 100644 --- a/drivers/gpu/nvgpu/gp106/hw_xve_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_xve_gp106.h | |||