diff options
Diffstat (limited to 'drivers/gpu')
26 files changed, 22 insertions, 36 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h index c3136023..8b1f85a1 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h | |||
@@ -18,8 +18,6 @@ | |||
18 | #ifndef _GK20A_CHANNEL_SYNC_H_ | 18 | #ifndef _GK20A_CHANNEL_SYNC_H_ |
19 | #define _GK20A_CHANNEL_SYNC_H_ | 19 | #define _GK20A_CHANNEL_SYNC_H_ |
20 | 20 | ||
21 | #include <linux/types.h> | ||
22 | |||
23 | struct gk20a_channel_sync; | 21 | struct gk20a_channel_sync; |
24 | struct priv_cmd_entry; | 22 | struct priv_cmd_entry; |
25 | struct channel_gk20a; | 23 | struct channel_gk20a; |
diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c index 28dfee01..44f0ac4c 100644 --- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c | |||
@@ -13,7 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | #include <trace/events/gk20a.h> | 16 | #include <trace/events/gk20a.h> |
18 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
19 | 18 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h index 9d9fde85..fccf0c27 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.h | |||
@@ -17,7 +17,6 @@ | |||
17 | #ifndef _GK20A_FENCE_H_ | 17 | #ifndef _GK20A_FENCE_H_ |
18 | #define _GK20A_FENCE_H_ | 18 | #define _GK20A_FENCE_H_ |
19 | 19 | ||
20 | #include <linux/types.h> | ||
21 | #include <linux/kref.h> | 20 | #include <linux/kref.h> |
22 | #include <linux/wait.h> | 21 | #include <linux/wait.h> |
23 | 22 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_gating_reglist.c b/drivers/gpu/nvgpu/gk20a/gk20a_gating_reglist.c index dc1c0afb..e218ce94 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_gating_reglist.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a_gating_reglist.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #ifndef __gk20a_gating_reglist_h__ | 20 | #ifndef __gk20a_gating_reglist_h__ |
21 | #define __gk20a_gating_reglist_h__ | 21 | #define __gk20a_gating_reglist_h__ |
22 | 22 | ||
23 | #include <linux/types.h> | ||
24 | #include "gk20a_gating_reglist.h" | 23 | #include "gk20a_gating_reglist.h" |
25 | 24 | ||
26 | struct gating_desc { | 25 | struct gating_desc { |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_scale.c b/drivers/gpu/nvgpu/gk20a/gk20a_scale.c index aabe673a..5c1350d3 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_scale.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a_scale.c | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | #include <linux/devfreq.h> | 19 | #include <linux/devfreq.h> |
20 | #include <linux/debugfs.h> | 20 | #include <linux/debugfs.h> |
21 | #include <linux/types.h> | ||
22 | #include <linux/export.h> | 21 | #include <linux/export.h> |
23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
24 | #include <soc/tegra/chip-id.h> | 23 | #include <soc/tegra/chip-id.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c index de90355d..18fd3648 100644 --- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c | |||
@@ -13,7 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
18 | #include <trace/events/gk20a.h> | 17 | #include <trace/events/gk20a.h> |
19 | 18 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/sync_gk20a.h b/drivers/gpu/nvgpu/gk20a/sync_gk20a.h index 5dcdfe15..33112bb3 100644 --- a/drivers/gpu/nvgpu/gk20a/sync_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/sync_gk20a.h | |||
@@ -18,7 +18,6 @@ | |||
18 | #ifndef _GK20A_SYNC_H_ | 18 | #ifndef _GK20A_SYNC_H_ |
19 | #define _GK20A_SYNC_H_ | 19 | #define _GK20A_SYNC_H_ |
20 | 20 | ||
21 | #include <linux/types.h> | ||
22 | #include <linux/version.h> | 21 | #include <linux/version.h> |
23 | 22 | ||
24 | struct sync_timeline; | 23 | struct sync_timeline; |
diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c index b50cb2d1..9c5b730b 100644 --- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c | |||
@@ -13,8 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | |||
18 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
19 | #include "gk20a/kind_gk20a.h" | 17 | #include "gk20a/kind_gk20a.h" |
20 | #include "gk20a/fb_gk20a.h" | 18 | #include "gk20a/fb_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/gm20b_gating_reglist.c b/drivers/gpu/nvgpu/gm20b/gm20b_gating_reglist.c index 3cd4e968..00e7cce0 100644 --- a/drivers/gpu/nvgpu/gm20b/gm20b_gating_reglist.c +++ b/drivers/gpu/nvgpu/gm20b/gm20b_gating_reglist.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #ifndef __gm20b_gating_reglist_h__ | 20 | #ifndef __gm20b_gating_reglist_h__ |
21 | #define __gm20b_gating_reglist_h__ | 21 | #define __gm20b_gating_reglist_h__ |
22 | 22 | ||
23 | #include <linux/types.h> | ||
24 | #include "gm20b_gating_reglist.h" | 23 | #include "gm20b_gating_reglist.h" |
25 | 24 | ||
26 | struct gating_desc { | 25 | struct gating_desc { |
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c index a43fcdab..7d9e47d6 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c | |||
@@ -13,7 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
18 | #include <linux/io.h> | 17 | #include <linux/io.h> |
19 | #include <linux/vmalloc.h> | 18 | #include <linux/vmalloc.h> |
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 5e19a5ae..bfae27c0 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -13,8 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | |||
18 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
19 | #include "gk20a/dbg_gpu_gk20a.h" | 17 | #include "gk20a/dbg_gpu_gk20a.h" |
20 | #include "gk20a/css_gr_gk20a.h" | 18 | #include "gk20a/css_gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index a2c46600..491112fc 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |||
@@ -13,7 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | #include <trace/events/gk20a.h> | 16 | #include <trace/events/gk20a.h> |
18 | 17 | ||
19 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gm20b/mc_gm20b.c b/drivers/gpu/nvgpu/gm20b/mc_gm20b.c index 7d0d052d..05504e82 100644 --- a/drivers/gpu/nvgpu/gm20b/mc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/mc_gm20b.c | |||
@@ -13,8 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | |||
18 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
19 | #include "gk20a/mc_gk20a.h" | 17 | #include "gk20a/mc_gk20a.h" |
20 | #include "mc_gm20b.h" | 18 | #include "mc_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.c b/drivers/gpu/nvgpu/gp106/fb_gp106.c index 81c52677..b2e264cd 100644 --- a/drivers/gpu/nvgpu/gp106/fb_gp106.c +++ b/drivers/gpu/nvgpu/gp106/fb_gp106.c | |||
@@ -11,7 +11,6 @@ | |||
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/types.h> | ||
15 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
16 | 15 | ||
17 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp106/gp106_gating_reglist.c b/drivers/gpu/nvgpu/gp106/gp106_gating_reglist.c index 0b6b8beb..5f85f0bf 100644 --- a/drivers/gpu/nvgpu/gp106/gp106_gating_reglist.c +++ b/drivers/gpu/nvgpu/gp106/gp106_gating_reglist.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #ifndef __gp106_gating_reglist_h__ | 16 | #ifndef __gp106_gating_reglist_h__ |
17 | #define __gp106_gating_reglist_h__ | 17 | #define __gp106_gating_reglist_h__ |
18 | 18 | ||
19 | #include <linux/types.h> | ||
20 | #include "gp106_gating_reglist.h" | 19 | #include "gp106_gating_reglist.h" |
21 | 20 | ||
22 | struct gating_desc { | 21 | struct gating_desc { |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 80ec8525..e8ea2e8d 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -13,11 +13,8 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | #include <linux/printk.h> | 16 | #include <linux/printk.h> |
18 | 17 | ||
19 | #include <linux/types.h> | ||
20 | |||
21 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |
22 | #include "gk20a/dbg_gpu_gk20a.h" | 19 | #include "gk20a/dbg_gpu_gk20a.h" |
23 | #include "gk20a/css_gr_gk20a.h" | 20 | #include "gk20a/css_gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp106/ltc_gp106.c b/drivers/gpu/nvgpu/gp106/ltc_gp106.c index b162ddb3..755e4b05 100644 --- a/drivers/gpu/nvgpu/gp106/ltc_gp106.c +++ b/drivers/gpu/nvgpu/gp106/ltc_gp106.c | |||
@@ -11,8 +11,6 @@ | |||
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/types.h> | ||
15 | |||
16 | #include "gk20a/gk20a.h" | 14 | #include "gk20a/gk20a.h" |
17 | #include "gm20b/ltc_gm20b.h" | 15 | #include "gm20b/ltc_gm20b.h" |
18 | #include "gp10b/ltc_gp10b.h" | 16 | #include "gp10b/ltc_gp10b.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c index db4716f3..aa6b543a 100644 --- a/drivers/gpu/nvgpu/gp10b/fb_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fb_gp10b.c | |||
@@ -13,8 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | |||
18 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
19 | #include "gm20b/fb_gm20b.h" | 17 | #include "gm20b/fb_gm20b.h" |
20 | #include "gk20a/kind_gk20a.h" | 18 | #include "gk20a/kind_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index 6f576e3f..6f1a0298 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -14,7 +14,6 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
17 | #include <linux/types.h> | ||
18 | 17 | ||
19 | #include "fifo_gp10b.h" | 18 | #include "fifo_gp10b.h" |
20 | 19 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/gp10b_gating_reglist.c b/drivers/gpu/nvgpu/gp10b/gp10b_gating_reglist.c index 563819de..afb933e9 100644 --- a/drivers/gpu/nvgpu/gp10b/gp10b_gating_reglist.c +++ b/drivers/gpu/nvgpu/gp10b/gp10b_gating_reglist.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #ifndef __gp10b_gating_reglist_h__ | 20 | #ifndef __gp10b_gating_reglist_h__ |
21 | #define __gp10b_gating_reglist_h__ | 21 | #define __gp10b_gating_reglist_h__ |
22 | 22 | ||
23 | #include <linux/types.h> | ||
24 | #include "gp10b_gating_reglist.h" | 23 | #include "gp10b_gating_reglist.h" |
25 | 24 | ||
26 | struct gating_desc { | 25 | struct gating_desc { |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index fc1168f5..95fdccea 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -13,10 +13,8 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | #include <linux/printk.h> | 16 | #include <linux/printk.h> |
18 | #include <linux/version.h> | 17 | #include <linux/version.h> |
19 | #include <linux/types.h> | ||
20 | 18 | ||
21 | #include "gk20a/gk20a.h" | 19 | #include "gk20a/gk20a.h" |
22 | #include "gk20a/dbg_gpu_gk20a.h" | 20 | #include "gk20a/dbg_gpu_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c index 9a11d90b..e1aa34a9 100644 --- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | |||
@@ -13,8 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | |||
18 | #include <dt-bindings/memory/tegra-swgroup.h> | 16 | #include <dt-bindings/memory/tegra-swgroup.h> |
19 | 17 | ||
20 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c index 4a8dc4c1..5842cb62 100644 --- a/drivers/gpu/nvgpu/gp10b/mc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mc_gp10b.c | |||
@@ -13,8 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/types.h> | ||
17 | |||
18 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
19 | #include "gk20a/mc_gk20a.h" | 17 | #include "gk20a/mc_gk20a.h" |
20 | 18 | ||
diff --git a/drivers/gpu/nvgpu/include/nvgpu/bios.h b/drivers/gpu/nvgpu/include/nvgpu/bios.h index 6fbf068c..edd4e08c 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/bios.h +++ b/drivers/gpu/nvgpu/include/nvgpu/bios.h | |||
@@ -14,7 +14,7 @@ | |||
14 | #ifndef NVGPU_BIOS_H | 14 | #ifndef NVGPU_BIOS_H |
15 | #define NVGPU_BIOS_H | 15 | #define NVGPU_BIOS_H |
16 | 16 | ||
17 | #include <linux/types.h> | 17 | #include <nvgpu/types.h> |
18 | 18 | ||
19 | struct gk20a; | 19 | struct gk20a; |
20 | 20 | ||
diff --git a/drivers/gpu/nvgpu/include/nvgpu/types.h b/drivers/gpu/nvgpu/include/nvgpu/types.h new file mode 100644 index 00000000..4bfdddb7 --- /dev/null +++ b/drivers/gpu/nvgpu/include/nvgpu/types.h | |||
@@ -0,0 +1,20 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify it | ||
5 | * under the terms and conditions of the GNU General Public License, | ||
6 | * version 2, as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
11 | * more details. | ||
12 | */ | ||
13 | #ifndef __NVGPU_TYPES_H__ | ||
14 | #define __NVGPU_TYPES_H__ | ||
15 | |||
16 | #ifdef __KERNEL__ | ||
17 | #include <linux/types.h> | ||
18 | #endif | ||
19 | |||
20 | #endif | ||
diff --git a/drivers/gpu/nvgpu/platform_tegra.h b/drivers/gpu/nvgpu/platform_tegra.h index 815ac657..63aed5a7 100644 --- a/drivers/gpu/nvgpu/platform_tegra.h +++ b/drivers/gpu/nvgpu/platform_tegra.h | |||
@@ -16,7 +16,7 @@ | |||
16 | #ifndef _NVGPU_PLATFORM_TEGRA_H_ | 16 | #ifndef _NVGPU_PLATFORM_TEGRA_H_ |
17 | #define _NVGPU_PLATFORM_TEGRA_H_ | 17 | #define _NVGPU_PLATFORM_TEGRA_H_ |
18 | 18 | ||
19 | #include <linux/types.h> | 19 | #include <nvgpu/types.h> |
20 | 20 | ||
21 | struct platform_device; | 21 | struct platform_device; |
22 | struct gr_ctx_buffer_desc; | 22 | struct gr_ctx_buffer_desc; |