diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-11 14:39:21 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-12 10:01:12 -0400 |
commit | 7665421874e66f0b00d52a5f1db5210895a9ab7b (patch) | |
tree | 039b5523ae1b44330c1d37bae145daf855714b2e /drivers/gpu/nvgpu/gk20a | |
parent | fb1f604f41435a206b866fba87d36bbc3e9ae474 (diff) |
gpu: nvgpu: Replace use of bitops.h and kernel.h
Remove use of linux/kernel.h and linux/compiler.h. We don't use
anything in those headers.
Also replace use of linux/bitops.h with new wrapper nvgpu/bitops.h.
JIRA NVGPU-13
Change-Id: Iefa6b4598d5a5e7fc386c0a7a554e778a87010d6
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1460777
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/bus_gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal_gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/kind_gk20a.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/kind_gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ltc_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/sync_gk20a.c | 1 |
9 files changed, 5 insertions, 14 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/bus_gk20a.h b/drivers/gpu/nvgpu/gk20a/bus_gk20a.h index b2f8f8c9..72710c35 100644 --- a/drivers/gpu/nvgpu/gk20a/bus_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/bus_gk20a.h | |||
@@ -16,6 +16,8 @@ | |||
16 | #ifndef BUS_GK20A_H | 16 | #ifndef BUS_GK20A_H |
17 | #define BUS_GK20A_H | 17 | #define BUS_GK20A_H |
18 | 18 | ||
19 | #include <nvgpu/types.h> | ||
20 | |||
19 | struct gk20a; | 21 | struct gk20a; |
20 | struct gpu_ops; | 22 | struct gpu_ops; |
21 | struct nvgpu_mem; | 23 | struct nvgpu_mem; |
diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c index 76237e03..48a60f5d 100644 --- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | |||
@@ -16,10 +16,10 @@ | |||
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/bitops.h> | ||
20 | #include <linux/dma-mapping.h> | 19 | #include <linux/dma-mapping.h> |
21 | #include <linux/dma-buf.h> | 20 | #include <linux/dma-buf.h> |
22 | 21 | ||
22 | #include <nvgpu/bitops.h> | ||
23 | #include <nvgpu/kmem.h> | 23 | #include <nvgpu/kmem.h> |
24 | #include <nvgpu/lock.h> | 24 | #include <nvgpu/lock.h> |
25 | #include <nvgpu/dma.h> | 25 | #include <nvgpu/dma.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c index 4b3bb83c..4d5854d4 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include <linux/version.h> | 21 | #include <linux/version.h> |
22 | #include <linux/device.h> | 22 | #include <linux/device.h> |
23 | #include <linux/pm_runtime.h> | 23 | #include <linux/pm_runtime.h> |
24 | #include <linux/kernel.h> | ||
25 | #include <linux/fb.h> | 24 | #include <linux/fb.h> |
26 | #include <linux/gk20a.h> | 25 | #include <linux/gk20a.h> |
27 | #include <linux/clk/tegra.h> | 26 | #include <linux/clk/tegra.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/hal.h b/drivers/gpu/nvgpu/gk20a/hal.h index da02cf5f..4203dbfa 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.h +++ b/drivers/gpu/nvgpu/gk20a/hal.h | |||
@@ -16,8 +16,6 @@ | |||
16 | #ifndef __HAL_GPU__ | 16 | #ifndef __HAL_GPU__ |
17 | #define __HAL_GPU__ | 17 | #define __HAL_GPU__ |
18 | 18 | ||
19 | #include <linux/kernel.h> | ||
20 | |||
21 | struct gk20a; | 19 | struct gk20a; |
22 | 20 | ||
23 | int gpu_init_hal(struct gk20a *g); | 21 | int gpu_init_hal(struct gk20a *g); |
diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.h b/drivers/gpu/nvgpu/gk20a/hal_gk20a.h index f214432a..f5475809 100644 --- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.h | |||
@@ -18,8 +18,6 @@ | |||
18 | #ifndef __HAL_GK20A__ | 18 | #ifndef __HAL_GK20A__ |
19 | #define __HAL_GK20A__ | 19 | #define __HAL_GK20A__ |
20 | 20 | ||
21 | #include <linux/kernel.h> | ||
22 | |||
23 | struct gk20a; | 21 | struct gk20a; |
24 | 22 | ||
25 | int gk20a_init_hal(struct gk20a *g); | 23 | int gk20a_init_hal(struct gk20a *g); |
diff --git a/drivers/gpu/nvgpu/gk20a/kind_gk20a.c b/drivers/gpu/nvgpu/gk20a/kind_gk20a.c index 00e7a54c..4e9ebe4b 100644 --- a/drivers/gpu/nvgpu/gk20a/kind_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/kind_gk20a.c | |||
@@ -1,9 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * drivers/video/tegra/host/gk20a/kind_gk20a.c | ||
3 | * | ||
4 | * GK20A memory kind management | 2 | * GK20A memory kind management |
5 | * | 3 | * |
6 | * Copyright (c) 2011-2014, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved. |
7 | * | 5 | * |
8 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
9 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -18,8 +16,6 @@ | |||
18 | * this program; if not, write to the Free Software Foundation, Inc., | 16 | * this program; if not, write to the Free Software Foundation, Inc., |
19 | * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | 17 | * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. |
20 | */ | 18 | */ |
21 | #include <linux/bitops.h> | ||
22 | #include <linux/compiler.h> | ||
23 | 19 | ||
24 | #include "kind_gk20a.h" | 20 | #include "kind_gk20a.h" |
25 | 21 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/kind_gk20a.h b/drivers/gpu/nvgpu/gk20a/kind_gk20a.h index 93f011d4..9dec84a5 100644 --- a/drivers/gpu/nvgpu/gk20a/kind_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/kind_gk20a.h | |||
@@ -21,6 +21,7 @@ | |||
21 | #ifndef __KIND_GK20A_H__ | 21 | #ifndef __KIND_GK20A_H__ |
22 | #define __KIND_GK20A_H__ | 22 | #define __KIND_GK20A_H__ |
23 | 23 | ||
24 | #include <nvgpu/bitops.h> | ||
24 | 25 | ||
25 | void gk20a_init_uncompressed_kind_map(void); | 26 | void gk20a_init_uncompressed_kind_map(void); |
26 | void gk20a_init_kind_attr(void); | 27 | void gk20a_init_kind_attr(void); |
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c index f8416d55..0d4d62b8 100644 --- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c | |||
@@ -16,8 +16,6 @@ | |||
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/kernel.h> | ||
20 | |||
21 | #include <trace/events/gk20a.h> | 19 | #include <trace/events/gk20a.h> |
22 | #include <nvgpu/timers.h> | 20 | #include <nvgpu/timers.h> |
23 | #include <nvgpu/log.h> | 21 | #include <nvgpu/log.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c index ecc96a7b..b5619db7 100644 --- a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c | |||
@@ -14,7 +14,6 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/version.h> | 16 | #include <linux/version.h> |
17 | #include <linux/kernel.h> | ||
18 | #include <linux/file.h> | 17 | #include <linux/file.h> |
19 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
20 | #include <linux/hrtimer.h> | 19 | #include <linux/hrtimer.h> |