From c9f8f1ea05f089567f497379ce372450c14895f8 Mon Sep 17 00:00:00 2001
From: Vinod G <vinodg@nvidia.com>
Date: Wed, 25 Jul 2018 15:17:01 -0700
Subject: gpu: nvgpu: remove utils.h from gk20a.h

Removed the utils.h include from gk20a.h
utils.h is included in those files which
make use of the macros in utils.h

JIRA NVGPU-1005

Change-Id: Ifb41da58db6ff8682fa6b5dfdd8eda11a751fcac
Signed-off-by: Vinod G <vinodg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1785952
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/common/ce2.c           | 1 +
 drivers/gpu/nvgpu/common/fb/fb_gk20a.c   | 1 +
 drivers/gpu/nvgpu/common/fb/fb_gm20b.c   | 1 +
 drivers/gpu/nvgpu/common/fb/fb_gv100.c   | 1 +
 drivers/gpu/nvgpu/common/fb/fb_gv11b.c   | 1 +
 drivers/gpu/nvgpu/common/fifo/submit.c   | 1 +
 drivers/gpu/nvgpu/common/pmu/pmu.c       | 1 +
 drivers/gpu/nvgpu/common/pmu/pmu_fw.c    | 1 +
 drivers/gpu/nvgpu/common/pmu/pmu_pg.c    | 1 +
 drivers/gpu/nvgpu/common/sim.c           | 2 ++
 drivers/gpu/nvgpu/common/sim_pci.c       | 2 ++
 drivers/gpu/nvgpu/common/xve/xve_gp106.c | 1 +
 12 files changed, 14 insertions(+)

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

diff --git a/drivers/gpu/nvgpu/common/ce2.c b/drivers/gpu/nvgpu/common/ce2.c
index 9385b531..d4793ef6 100644
--- a/drivers/gpu/nvgpu/common/ce2.c
+++ b/drivers/gpu/nvgpu/common/ce2.c
@@ -22,6 +22,7 @@
 
 #include <nvgpu/types.h>
 #include <nvgpu/channel.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
 
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c
index 14634923..903bb983 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c
@@ -30,6 +30,7 @@
 
 #include <nvgpu/timers.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_fb_gk20a.h>
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
index 00ae7b5f..9f207771 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
@@ -23,6 +23,7 @@
  */
 
 #include <nvgpu/sizes.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv100.c b/drivers/gpu/nvgpu/common/fb/fb_gv100.c
index 8857f02b..e68062c0 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gv100.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gv100.c
@@ -36,6 +36,7 @@
 #include <nvgpu/pmu.h>
 #include <nvgpu/falcon.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #include "gm20b/acr_gm20b.h"
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
index 6973e04d..b6121f4d 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
@@ -31,6 +31,7 @@
 #include <nvgpu/soc.h>
 #include <nvgpu/ptimer.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
diff --git a/drivers/gpu/nvgpu/common/fifo/submit.c b/drivers/gpu/nvgpu/common/fifo/submit.c
index 00763036..d034f2d3 100644
--- a/drivers/gpu/nvgpu/common/fifo/submit.c
+++ b/drivers/gpu/nvgpu/common/fifo/submit.c
@@ -23,6 +23,7 @@
 #include <nvgpu/channel.h>
 #include <nvgpu/ltc.h>
 #include <nvgpu/os_sched.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
 
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c
index 2dcadb48..c71928c3 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu.c
@@ -28,6 +28,7 @@
 #include <nvgpu/barrier.h>
 #include <nvgpu/timers.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
index fc328401..a5ad6cb5 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
@@ -26,6 +26,7 @@
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include <nvgpu/firmware.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
index 30bf9008..c8559fdb 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
@@ -25,6 +25,7 @@
 #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h>
 #include <nvgpu/barrier.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/common/sim.c b/drivers/gpu/nvgpu/common/sim.c
index c46f0959..8261f270 100644
--- a/drivers/gpu/nvgpu/common/sim.c
+++ b/drivers/gpu/nvgpu/common/sim.c
@@ -27,6 +27,8 @@
 #include <nvgpu/io.h>
 #include <nvgpu/hw_sim.h>
 #include <nvgpu/sim.h>
+#include <nvgpu/utils.h>
+
 #include "gk20a/gk20a.h"
 
 int nvgpu_alloc_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem)
diff --git a/drivers/gpu/nvgpu/common/sim_pci.c b/drivers/gpu/nvgpu/common/sim_pci.c
index 65950c4c..edf2a401 100644
--- a/drivers/gpu/nvgpu/common/sim_pci.c
+++ b/drivers/gpu/nvgpu/common/sim_pci.c
@@ -26,6 +26,8 @@
 #include <nvgpu/hw_sim_pci.h>
 #include <nvgpu/sim.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
+
 #include "gk20a/gk20a.h"
 
 static inline u32 sim_msg_header_size(void)
diff --git a/drivers/gpu/nvgpu/common/xve/xve_gp106.c b/drivers/gpu/nvgpu/common/xve/xve_gp106.c
index 6cfbc9d9..5e662ee0 100644
--- a/drivers/gpu/nvgpu/common/xve/xve_gp106.c
+++ b/drivers/gpu/nvgpu/common/xve/xve_gp106.c
@@ -26,6 +26,7 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/xve.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "xve_gp106.h"
 
-- 
cgit v1.2.2