diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-10 16:47:37 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-13 16:44:41 -0400 |
commit | 947a23606351f1c81072cedcd4ab686d34042912 (patch) | |
tree | 79a29254b726d40713d06c6a17d71860c112cc64 /drivers/gpu/nvgpu/gp10b | |
parent | 22426a5452ba943ac48867722fb0927baf66d4ac (diff) |
gpu: nvgpu: gm20b: Use new delay APIs
Use platform agnostic delay functions instead of Linux kernel APIs.
This allows removing dependency to Linux header linux/delay.h. At the
same time remove #include lines for other unused Linux headers.
JIRA NVGPU-16
Change-Id: I05df9d72edaf4bb061febe0cb40fc8a7cf9f51c7
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1460114
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/mm_gp10b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/regops_gp10b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c | 3 |
7 files changed, 2 insertions, 17 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index bc9fc843..019b2471 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -13,8 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/delay.h> | ||
17 | |||
18 | #include <nvgpu/dma.h> | 16 | #include <nvgpu/dma.h> |
19 | #include <nvgpu/bug.h> | 17 | #include <nvgpu/bug.h> |
20 | 18 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 6e6223c8..24e7ffad 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -13,8 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/delay.h> | ||
17 | #include <linux/version.h> | ||
18 | #include <soc/tegra/fuse.h> | 16 | #include <soc/tegra/fuse.h> |
19 | 17 | ||
20 | #include <dt-bindings/soc/gm20b-fuse.h> | 18 | #include <dt-bindings/soc/gm20b-fuse.h> |
@@ -1393,7 +1391,7 @@ static int gr_gp10b_wait_empty(struct gk20a *g, unsigned long duration_ms, | |||
1393 | return 0; | 1391 | return 0; |
1394 | } | 1392 | } |
1395 | 1393 | ||
1396 | usleep_range(delay, delay * 2); | 1394 | nvgpu_usleep_range(delay, delay * 2); |
1397 | delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); | 1395 | delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); |
1398 | } while (!nvgpu_timeout_expired(&timeout)); | 1396 | } while (!nvgpu_timeout_expired(&timeout)); |
1399 | 1397 | ||
@@ -2044,7 +2042,7 @@ static int gr_gp10b_suspend_contexts(struct gk20a *g, | |||
2044 | if (!gr_ctx->t18x.cilp_preempt_pending) | 2042 | if (!gr_ctx->t18x.cilp_preempt_pending) |
2045 | break; | 2043 | break; |
2046 | 2044 | ||
2047 | usleep_range(delay, delay * 2); | 2045 | nvgpu_usleep_range(delay, delay * 2); |
2048 | delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); | 2046 | delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); |
2049 | } while (!nvgpu_timeout_expired(&timeout)); | 2047 | } while (!nvgpu_timeout_expired(&timeout)); |
2050 | 2048 | ||
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index ebba76b2..6990b4ef 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -13,9 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/printk.h> | ||
17 | #include <linux/version.h> | ||
18 | |||
19 | #include "gk20a/gk20a.h" | 16 | #include "gk20a/gk20a.h" |
20 | #include "gk20a/dbg_gpu_gk20a.h" | 17 | #include "gk20a/dbg_gpu_gk20a.h" |
21 | #include "gk20a/css_gr_gk20a.h" | 18 | #include "gk20a/css_gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c index 2f894435..c2e0fddf 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c | |||
@@ -13,9 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/pm_runtime.h> | ||
17 | #include <linux/dma-mapping.h> | ||
18 | |||
19 | #include <nvgpu/dma.h> | 16 | #include <nvgpu/dma.h> |
20 | 17 | ||
21 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c index 2d9882c9..1167006d 100644 --- a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | |||
@@ -13,7 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/delay.h> /* for udelay */ | ||
17 | #include <soc/tegra/fuse.h> | 16 | #include <soc/tegra/fuse.h> |
18 | 17 | ||
19 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/regops_gp10b.c b/drivers/gpu/nvgpu/gp10b/regops_gp10b.c index 33e331a4..885221df 100644 --- a/drivers/gpu/nvgpu/gp10b/regops_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/regops_gp10b.c | |||
@@ -16,7 +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/err.h> | ||
20 | #include <uapi/linux/nvgpu.h> | 19 | #include <uapi/linux/nvgpu.h> |
21 | 20 | ||
22 | #include "gk20a/gk20a.h" | 21 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c index 77c6853c..0fb4248c 100644 --- a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c | |||
@@ -13,9 +13,6 @@ | |||
13 | * more details. | 13 | * more details. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/pm_runtime.h> | ||
17 | #include <linux/dma-mapping.h> | ||
18 | |||
19 | #include <nvgpu/dma.h> | 16 | #include <nvgpu/dma.h> |
20 | 17 | ||
21 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |