From 947a23606351f1c81072cedcd4ab686d34042912 Mon Sep 17 00:00:00 2001
From: Terje Bergstrom <tbergstrom@nvidia.com>
Date: Mon, 10 Apr 2017 13:47:37 -0700
Subject: 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>
---
 drivers/gpu/nvgpu/gp10b/fifo_gp10b.c   | 2 --
 drivers/gpu/nvgpu/gp10b/gr_gp10b.c     | 6 ++----
 drivers/gpu/nvgpu/gp10b/hal_gp10b.c    | 3 ---
 drivers/gpu/nvgpu/gp10b/mm_gp10b.c     | 3 ---
 drivers/gpu/nvgpu/gp10b/pmu_gp10b.c    | 1 -
 drivers/gpu/nvgpu/gp10b/regops_gp10b.c | 1 -
 drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c   | 3 ---
 7 files changed, 2 insertions(+), 17 deletions(-)

(limited to 'drivers/gpu/nvgpu/gp10b')

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 @@
  * more details.
  */
 
-#include <linux/delay.h>
-
 #include <nvgpu/dma.h>
 #include <nvgpu/bug.h>
 
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 @@
  * more details.
  */
 
-#include <linux/delay.h>
-#include <linux/version.h>
 #include <soc/tegra/fuse.h>
 
 #include <dt-bindings/soc/gm20b-fuse.h>
@@ -1393,7 +1391,7 @@ static int gr_gp10b_wait_empty(struct gk20a *g, unsigned long duration_ms,
 			return 0;
 		}
 
-		usleep_range(delay, delay * 2);
+		nvgpu_usleep_range(delay, delay * 2);
 		delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX);
 	} while (!nvgpu_timeout_expired(&timeout));
 
@@ -2044,7 +2042,7 @@ static int gr_gp10b_suspend_contexts(struct gk20a *g,
 			if (!gr_ctx->t18x.cilp_preempt_pending)
 				break;
 
-			usleep_range(delay, delay * 2);
+			nvgpu_usleep_range(delay, delay * 2);
 			delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX);
 		} while (!nvgpu_timeout_expired(&timeout));
 
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 @@
  * more details.
  */
 
-#include <linux/printk.h>
-#include <linux/version.h>
-
 #include "gk20a/gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #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 @@
  * more details.
  */
 
-#include <linux/pm_runtime.h>
-#include <linux/dma-mapping.h>
-
 #include <nvgpu/dma.h>
 
 #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 @@
  * more details.
  */
 
-#include <linux/delay.h>	/* for udelay */
 #include <soc/tegra/fuse.h>
 
 #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 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/err.h>
 #include <uapi/linux/nvgpu.h>
 
 #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 @@
  * more details.
  */
 
-#include <linux/pm_runtime.h>
-#include <linux/dma-mapping.h>
-
 #include <nvgpu/dma.h>
 
 #include "gk20a/gk20a.h"
-- 
cgit v1.2.2