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: [PATCH] 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 +
 drivers/gpu/nvgpu/gk20a/ce2_gk20a.c        | 6 +++---
 drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c     | 1 +
 drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c    | 1 +
 drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | 1 +
 drivers/gpu/nvgpu/gk20a/fifo_gk20a.c       | 1 +
 drivers/gpu/nvgpu/gk20a/gk20a.h            | 1 -
 drivers/gpu/nvgpu/gk20a/gr_gk20a.c         | 1 +
 drivers/gpu/nvgpu/gk20a/mm_gk20a.c         | 1 +
 drivers/gpu/nvgpu/gk20a/pmu_gk20a.c        | 1 +
 drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c  | 1 +
 drivers/gpu/nvgpu/gk20a/therm_gk20a.c      | 1 +
 drivers/gpu/nvgpu/gm20b/acr_gm20b.c        | 1 +
 drivers/gpu/nvgpu/gm20b/clk_gm20b.c        | 1 +
 drivers/gpu/nvgpu/gm20b/gr_gm20b.c         | 1 +
 drivers/gpu/nvgpu/gm20b/ltc_gm20b.c        | 1 +
 drivers/gpu/nvgpu/gp106/acr_gp106.c        | 1 +
 drivers/gpu/nvgpu/gp106/mclk_gp106.c       | 1 +
 drivers/gpu/nvgpu/gp106/therm_gp106.c      | 2 ++
 drivers/gpu/nvgpu/gp10b/fifo_gp10b.c       | 1 +
 drivers/gpu/nvgpu/gp10b/gr_gp10b.c         | 1 +
 drivers/gpu/nvgpu/gp10b/mm_gp10b.c         | 1 +
 drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c  | 1 +
 drivers/gpu/nvgpu/gp10b/therm_gp10b.c      | 1 +
 drivers/gpu/nvgpu/gv100/nvlink_gv100.c     | 1 +
 drivers/gpu/nvgpu/gv11b/acr_gv11b.c        | 1 +
 drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c     | 1 +
 drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c    | 2 ++
 drivers/gpu/nvgpu/gv11b/fifo_gv11b.c       | 1 +
 drivers/gpu/nvgpu/gv11b/gr_gv11b.c         | 1 +
 drivers/gpu/nvgpu/gv11b/ltc_gv11b.c        | 2 ++
 drivers/gpu/nvgpu/gv11b/pmu_gv11b.c        | 1 +
 drivers/gpu/nvgpu/gv11b/subctx_gv11b.c     | 1 +
 drivers/gpu/nvgpu/gv11b/therm_gv11b.c      | 1 +
 drivers/gpu/nvgpu/os/linux/cde.c           | 1 +
 drivers/gpu/nvgpu/os/linux/ioctl_dbg.c     | 1 +
 drivers/gpu/nvgpu/os/linux/vm.c            | 1 +
 48 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/nvgpu/common/ce2.c b/drivers/gpu/nvgpu/common/ce2.c
index 9385b5313..d4793ef66 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 14634923b..903bb9836 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 00ae7b5f1..9f207771f 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 8857f02b0..e68062c02 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 6973e04d0..b6121f4d7 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 00763036b..d034f2d33 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 2dcadb48f..c71928c35 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 fc3284015..a5ad6cb58 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 30bf9008e..c8559fdbe 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 c46f09592..8261f2702 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 65950c4c6..edf2a4019 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 6cfbc9d99..5e662ee06 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"
 
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
index a012949b2..5aae06135 100644
--- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
@@ -25,12 +25,12 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/dma.h>
 #include <nvgpu/os_sched.h>
-
-#include "gk20a.h"
-
 #include <nvgpu/log.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
+
+#include "gk20a.h"
 
 #include <nvgpu/hw/gk20a/hw_ce2_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c
index c174c5bcd..14ae17eaa 100644
--- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c
@@ -32,6 +32,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a.h"
 #include "css_gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index cac3f92ab..a257d7099 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -29,6 +29,7 @@
 #include <nvgpu/mm.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a.h"
 #include "gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
index 786ea50cd..08feb35c4 100644
--- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c
@@ -38,6 +38,7 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "fecs_trace_gk20a.h"
 #include "gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 23e22c21a..fc6c9ad2a 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -42,6 +42,7 @@
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/ptimer.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a.h"
 #include "mm_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index e8815b539..bd4772084 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -63,7 +63,6 @@ struct nvgpu_ctxsw_trace_filter;
 #include <nvgpu/nvlink.h>
 #include <nvgpu/sim.h>
 #include <nvgpu/ecc.h>
-#include <nvgpu/utils.h>
 
 #include "clk_gk20a.h"
 #include "ce2_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 8ef7d04d0..bedd39ebe 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -40,6 +40,7 @@
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/ecc.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a.h"
 #include "gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 255404c3e..5bba5d9c8 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -41,6 +41,7 @@
 #include <nvgpu/vidmem.h>
 #include <nvgpu/sizes.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a.h"
 #include "mm_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 90d6e15bc..dcaf11b14 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -33,6 +33,7 @@
 #include <nvgpu/mm.h>
 #include <nvgpu/io.h>
 #include <nvgpu/clk_arb.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a.h"
 #include "gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
index d63cfe5c8..0e004a5d1 100644
--- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
@@ -28,6 +28,7 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/hw/gk20a/hw_mc_gk20a.h>
 #include <nvgpu/hw/gk20a/hw_pri_ringmaster_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c
index e86988cae..b4a81aed8 100644
--- a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c
@@ -24,6 +24,7 @@
 
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
index 2350f362c..a93117592 100644
--- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
@@ -34,6 +34,7 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/mm.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
index 558415f84..ea7d1fe7a 100644
--- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
@@ -31,6 +31,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/types.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/hw/gm20b/hw_trim_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_therm_gm20b.h>
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 04ec28989..49b817830 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -28,6 +28,7 @@
 #include <nvgpu/debug.h>
 #include <nvgpu/fuse.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
index 066e41f72..65945fadc 100644
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -29,6 +29,7 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/ltc.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/hw/gm20b/hw_mc_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_ltc_gm20b.h>
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c
index 63386547a..817a196e7 100644
--- a/drivers/gpu/nvgpu/gp106/acr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c
@@ -28,6 +28,7 @@
 #include <nvgpu/pmu.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
index d4d3f3703..108eed56a 100644
--- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
@@ -25,6 +25,7 @@
 #include <nvgpu/kmem.h>
 #include <nvgpu/timers.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #ifdef CONFIG_DEBUG_FS
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c
index ab465e6c3..1f82aa7a8 100644
--- a/drivers/gpu/nvgpu/gp106/therm_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/therm_gp106.c
@@ -33,6 +33,8 @@
 
 #include <nvgpu/hw/gp106/hw_therm_gp106.h>
 
+#include <nvgpu/utils.h>
+
 void gp106_get_internal_sensor_limits(s32 *max_24_8, s32 *min_24_8)
 {
 	*max_24_8 = (0x87 << 8);
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
index 2e7735943..6b1398626 100644
--- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c
@@ -27,6 +27,7 @@
 #include <nvgpu/log2.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "fifo_gp10b.h"
 
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 5a22af803..a4e8ecde5 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -31,6 +31,7 @@
 #include <nvgpu/fuse.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c
index 7036ca15b..75ae3d04b 100644
--- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c
@@ -26,6 +26,7 @@
 #include <nvgpu/dma.h>
 #include <nvgpu/gmmu.h>
 #include <nvgpu/sizes.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #include "gm20b/mm_gm20b.h"
diff --git a/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c b/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c
index 87d9c28da..9fcf060b0 100644
--- a/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/priv_ring_gp10b.c
@@ -28,6 +28,7 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/hw/gp10b/hw_mc_gp10b.h>
 #include <nvgpu/hw/gp10b/hw_pri_ringmaster_gp10b.h>
diff --git a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
index 03be6d4a5..905ff178a 100644
--- a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
@@ -27,6 +27,7 @@
 
 #include <nvgpu/soc.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/hw/gp10b/hw_therm_gp10b.h>
 
diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
index add0448e8..ef1343d89 100644
--- a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
@@ -29,6 +29,7 @@
 #include <nvgpu/nvlink.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #include "nvlink_gv100.h"
diff --git a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
index d09283356..fdd0f123a 100644
--- a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
@@ -32,6 +32,7 @@
 #include <nvgpu/acr/nvgpu_acr.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #include "acr_gv11b.h"
diff --git a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c
index 4ab502440..17d9e0515 100644
--- a/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/css_gr_gv11b.c
@@ -34,6 +34,7 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/dma.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/css_gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c
index 0ab6d4451..94d75b201 100644
--- a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c
@@ -24,6 +24,8 @@
 
 #include <nvgpu/log.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
+
 #include "gk20a/gk20a.h"
 #include "gv11b/dbg_gpu_gv11b.h"
 #include <nvgpu/hw/gv11b/hw_perf_gv11b.h>
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
index 56012dd72..0e0c1e362 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
@@ -38,6 +38,7 @@
 #include <nvgpu/io_usermode.h>
 #include <nvgpu/ptimer.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 791c0d6f0..057dea032 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -33,6 +33,7 @@
 #include <nvgpu/error_notifier.h>
 #include <nvgpu/soc.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
index 673f14932..32f722080 100644
--- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
@@ -34,6 +34,8 @@
 #include <nvgpu/hw/gv11b/hw_mc_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_pri_ringmaster_gv11b.h>
 
+#include <nvgpu/utils.h>
+
 /*
  * Sets the ZBC stencil for the passed index.
  */
diff --git a/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c b/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c
index d3d954397..80d6be3d5 100644
--- a/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/pmu_gv11b.c
@@ -27,6 +27,7 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/mm.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include "gk20a/gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
index 8f12bbe57..f0cf920cd 100644
--- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c
@@ -29,6 +29,7 @@
 #include <nvgpu/dma.h>
 #include <nvgpu/log.h>
 #include <nvgpu/gmmu.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/hw/gv11b/hw_ram_gv11b.h>
 #include <nvgpu/hw/gv11b/hw_ctxsw_prog_gv11b.h>
diff --git a/drivers/gpu/nvgpu/gv11b/therm_gv11b.c b/drivers/gpu/nvgpu/gv11b/therm_gv11b.c
index cce4e4a8d..acc2c509e 100644
--- a/drivers/gpu/nvgpu/gv11b/therm_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/therm_gv11b.c
@@ -27,6 +27,7 @@
 
 #include <nvgpu/soc.h>
 #include <nvgpu/io.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/hw/gv11b/hw_therm_gv11b.h>
 
diff --git a/drivers/gpu/nvgpu/os/linux/cde.c b/drivers/gpu/nvgpu/os/linux/cde.c
index 39b7d1f5a..850f6debb 100644
--- a/drivers/gpu/nvgpu/os/linux/cde.c
+++ b/drivers/gpu/nvgpu/os/linux/cde.c
@@ -33,6 +33,7 @@
 #include <nvgpu/firmware.h>
 #include <nvgpu/os_sched.h>
 #include <nvgpu/channel.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/linux/vm.h>
 
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c
index 0e7bbf245..e7bb67003 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c
@@ -29,6 +29,7 @@
 #include <nvgpu/vm.h>
 #include <nvgpu/atomic.h>
 #include <nvgpu/cond.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/linux/vm.h>
 
diff --git a/drivers/gpu/nvgpu/os/linux/vm.c b/drivers/gpu/nvgpu/os/linux/vm.c
index 2b5ed103a..ef6015d8c 100644
--- a/drivers/gpu/nvgpu/os/linux/vm.c
+++ b/drivers/gpu/nvgpu/os/linux/vm.c
@@ -25,6 +25,7 @@
 #include <nvgpu/nvgpu_mem.h>
 #include <nvgpu/page_allocator.h>
 #include <nvgpu/vidmem.h>
+#include <nvgpu/utils.h>
 
 #include <nvgpu/linux/vm.h>
 #include <nvgpu/linux/nvgpu_mem.h>