diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/ce_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/ecc_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gp10b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gp10b.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_ctx_gp10b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 17 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/mm_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/regops_gp10b.c | 3 |
12 files changed, 22 insertions, 21 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c index 0c07c069..1800ac81 100644 --- a/drivers/gpu/nvgpu/gp10b/ce_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ce_gp10b.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/io.h> | 25 | #include <nvgpu/io.h> |
26 | #include "gk20a/gk20a.h" | 26 | #include <nvgpu/gk20a.h> |
27 | 27 | ||
28 | #include "ce_gp10b.h" | 28 | #include "ce_gp10b.h" |
29 | 29 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/ecc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ecc_gp10b.c index cf95c0d7..7c7218c2 100644 --- a/drivers/gpu/nvgpu/gp10b/ecc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ecc_gp10b.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/ecc.h> | 23 | #include <nvgpu/ecc.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "gp10b/ecc_gp10b.h" | 26 | #include "gp10b/ecc_gp10b.h" |
27 | 27 | ||
28 | int gp10b_ecc_init(struct gk20a *g) | 28 | int gp10b_ecc_init(struct gk20a *g) |
diff --git a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c index c477c77d..3dc672ff 100644 --- a/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fecs_trace_gp10b.c | |||
@@ -22,7 +22,8 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | 25 | #include <nvgpu/gk20a.h> |
26 | |||
26 | #include "gk20a/fecs_trace_gk20a.h" | 27 | #include "gk20a/fecs_trace_gk20a.h" |
27 | 28 | ||
28 | #include "fecs_trace_gp10b.h" | 29 | #include "fecs_trace_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index 7bf6e769..21fed4fc 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -28,11 +28,11 @@ | |||
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/io.h> | 29 | #include <nvgpu/io.h> |
30 | #include <nvgpu/utils.h> | 30 | #include <nvgpu/utils.h> |
31 | #include <nvgpu/gk20a.h> | ||
31 | #include <nvgpu/channel.h> | 32 | #include <nvgpu/channel.h> |
32 | 33 | ||
33 | #include "fifo_gp10b.h" | 34 | #include "fifo_gp10b.h" |
34 | 35 | ||
35 | #include "gk20a/gk20a.h" | ||
36 | #include "gm20b/fifo_gm20b.h" | 36 | #include "gm20b/fifo_gm20b.h" |
37 | #include "gk20a/channel_sync_gk20a.h" | 37 | #include "gk20a/channel_sync_gk20a.h" |
38 | 38 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/gp10b.c b/drivers/gpu/nvgpu/gp10b/gp10b.c index 6e09b860..773fb619 100644 --- a/drivers/gpu/nvgpu/gp10b/gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gp10b.c | |||
@@ -22,8 +22,7 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | 25 | #include <nvgpu/gk20a.h> |
26 | |||
27 | #include <nvgpu/enabled.h> | 26 | #include <nvgpu/enabled.h> |
28 | #include <nvgpu/io.h> | 27 | #include <nvgpu/io.h> |
29 | 28 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/gp10b.h b/drivers/gpu/nvgpu/gp10b/gp10b.h index cd850a07..61ad1e2b 100644 --- a/drivers/gpu/nvgpu/gp10b/gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/gp10b.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #ifndef GP10B_H | 25 | #ifndef GP10B_H |
26 | #define GP10B_H | 26 | #define GP10B_H |
27 | 27 | ||
28 | #include "gk20a/gk20a.h" | 28 | #include <nvgpu/gk20a.h> |
29 | 29 | ||
30 | int gp10b_init_gpu_characteristics(struct gk20a *g); | 30 | int gp10b_init_gpu_characteristics(struct gk20a *g); |
31 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/gr_ctx_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_ctx_gp10b.c index cf51e8b4..a06eca58 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_ctx_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_ctx_gp10b.c | |||
@@ -24,7 +24,8 @@ | |||
24 | * DEALINGS IN THE SOFTWARE. | 24 | * DEALINGS IN THE SOFTWARE. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include <nvgpu/gk20a.h> |
28 | |||
28 | #include "gr_ctx_gp10b.h" | 29 | #include "gr_ctx_gp10b.h" |
29 | 30 | ||
30 | int gr_gp10b_get_netlist_name(struct gk20a *g, int index, char *name) | 31 | int gr_gp10b_get_netlist_name(struct gk20a *g, int index, char *name) |
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index db6f5618..913434ab 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -32,9 +32,9 @@ | |||
32 | #include <nvgpu/enabled.h> | 32 | #include <nvgpu/enabled.h> |
33 | #include <nvgpu/io.h> | 33 | #include <nvgpu/io.h> |
34 | #include <nvgpu/utils.h> | 34 | #include <nvgpu/utils.h> |
35 | #include <nvgpu/gk20a.h> | ||
35 | #include <nvgpu/channel.h> | 36 | #include <nvgpu/channel.h> |
36 | 37 | ||
37 | #include "gk20a/gk20a.h" | ||
38 | #include "gk20a/gr_gk20a.h" | 38 | #include "gk20a/gr_gk20a.h" |
39 | #include "gk20a/dbg_gpu_gk20a.h" | 39 | #include "gk20a/dbg_gpu_gk20a.h" |
40 | #include "gk20a/regops_gk20a.h" | 40 | #include "gk20a/regops_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 9430595b..a524a551 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -21,6 +21,14 @@ | |||
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | #include <nvgpu/debug.h> | ||
25 | #include <nvgpu/bug.h> | ||
26 | #include <nvgpu/enabled.h> | ||
27 | #include <nvgpu/ptimer.h> | ||
28 | #include <nvgpu/ctxsw_trace.h> | ||
29 | #include <nvgpu/error_notifier.h> | ||
30 | #include <nvgpu/gk20a.h> | ||
31 | #include <nvgpu/channel.h> | ||
24 | 32 | ||
25 | #include "common/bus/bus_gk20a.h" | 33 | #include "common/bus/bus_gk20a.h" |
26 | #include "common/clock_gating/gp10b_gating_reglist.h" | 34 | #include "common/clock_gating/gp10b_gating_reglist.h" |
@@ -40,7 +48,6 @@ | |||
40 | #include "common/mc/mc_gm20b.h" | 48 | #include "common/mc/mc_gm20b.h" |
41 | #include "common/mc/mc_gp10b.h" | 49 | #include "common/mc/mc_gp10b.h" |
42 | 50 | ||
43 | #include "gk20a/gk20a.h" | ||
44 | #include "gk20a/fifo_gk20a.h" | 51 | #include "gk20a/fifo_gk20a.h" |
45 | #include "gk20a/fecs_trace_gk20a.h" | 52 | #include "gk20a/fecs_trace_gk20a.h" |
46 | #include "gk20a/mm_gk20a.h" | 53 | #include "gk20a/mm_gk20a.h" |
@@ -72,14 +79,6 @@ | |||
72 | #include "gp10b.h" | 79 | #include "gp10b.h" |
73 | #include "hal_gp10b.h" | 80 | #include "hal_gp10b.h" |
74 | 81 | ||
75 | #include <nvgpu/debug.h> | ||
76 | #include <nvgpu/bug.h> | ||
77 | #include <nvgpu/enabled.h> | ||
78 | #include <nvgpu/ptimer.h> | ||
79 | #include <nvgpu/ctxsw_trace.h> | ||
80 | #include <nvgpu/error_notifier.h> | ||
81 | #include <nvgpu/channel.h> | ||
82 | |||
83 | #include <nvgpu/hw/gp10b/hw_proj_gp10b.h> | 82 | #include <nvgpu/hw/gp10b/hw_proj_gp10b.h> |
84 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> | 83 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> |
85 | #include <nvgpu/hw/gp10b/hw_ram_gp10b.h> | 84 | #include <nvgpu/hw/gp10b/hw_ram_gp10b.h> |
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c index c8f71a19..2c0056e1 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <nvgpu/gmmu.h> | 27 | #include <nvgpu/gmmu.h> |
28 | #include <nvgpu/sizes.h> | 28 | #include <nvgpu/sizes.h> |
29 | #include <nvgpu/utils.h> | 29 | #include <nvgpu/utils.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | #include "gm20b/mm_gm20b.h" | 32 | #include "gm20b/mm_gm20b.h" |
33 | #include "mm_gp10b.h" | 33 | #include "mm_gp10b.h" |
34 | 34 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c index 32e7297f..5c7d1523 100644 --- a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <nvgpu/fuse.h> | 27 | #include <nvgpu/fuse.h> |
28 | #include <nvgpu/enabled.h> | 28 | #include <nvgpu/enabled.h> |
29 | #include <nvgpu/io.h> | 29 | #include <nvgpu/io.h> |
30 | #include <nvgpu/gk20a.h> | ||
30 | 31 | ||
31 | #include "gk20a/gk20a.h" | ||
32 | #include "gk20a/pmu_gk20a.h" | 32 | #include "gk20a/pmu_gk20a.h" |
33 | #include "gm20b/acr_gm20b.h" | 33 | #include "gm20b/acr_gm20b.h" |
34 | #include "gm20b/pmu_gm20b.h" | 34 | #include "gm20b/pmu_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/regops_gp10b.c b/drivers/gpu/nvgpu/gp10b/regops_gp10b.c index c61709e0..43551988 100644 --- a/drivers/gpu/nvgpu/gp10b/regops_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/regops_gp10b.c | |||
@@ -22,7 +22,8 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "gk20a/gk20a.h" | 25 | #include <nvgpu/gk20a.h> |
26 | |||
26 | #include "gk20a/regops_gk20a.h" | 27 | #include "gk20a/regops_gk20a.h" |
27 | #include "regops_gp10b.h" | 28 | #include "regops_gp10b.h" |
28 | 29 | ||