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/gp106/hal_gp106.c | |
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/gp106/hal_gp106.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 25 |
1 files changed, 15 insertions, 10 deletions
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 = { |