From 82a90170d3ecbed5106409546f33afa5eaea3ddf Mon Sep 17 00:00:00 2001
From: Debarshi Dutta <ddutta@nvidia.com>
Date: Fri, 27 Jul 2018 11:17:41 +0530
Subject: gk20a: nvgpu: Remove io.h dependency from gk20a.h

In the current code, gk20a.h includes io.h which gets directly included
in a lot of other files. io.h contains methods which uses a struct
gk20a as a parameter leading to a circular dependency between io.h
and gk20a.h. This can be mitigated by removing io.h from gk20a.h as
part of larger effort to moving gk20a.h to nvgpu/gk20a.h

JIRA NVGPU-597

Change-Id: I93e504fa9371b88152737b342a75580c65e8f712
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1787316
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/common/bus/bus_gk20a.c       | 1 +
 drivers/gpu/nvgpu/common/bus/bus_gm20b.c       | 1 +
 drivers/gpu/nvgpu/common/bus/bus_gp10b.c       | 1 +
 drivers/gpu/nvgpu/common/bus/bus_gv100.c       | 1 +
 drivers/gpu/nvgpu/common/fb/fb_gk20a.c         | 1 +
 drivers/gpu/nvgpu/common/fb/fb_gm20b.c         | 2 ++
 drivers/gpu/nvgpu/common/fb/fb_gp106.c         | 2 ++
 drivers/gpu/nvgpu/common/fb/fb_gv100.c         | 1 +
 drivers/gpu/nvgpu/common/fb/fb_gv11b.c         | 1 +
 drivers/gpu/nvgpu/common/pramin.c              | 1 +
 drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c | 1 +
 drivers/gpu/nvgpu/common/sim_pci.c             | 1 +
 drivers/gpu/nvgpu/common/vbios/bios.c          | 1 +
 13 files changed, 15 insertions(+)

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

diff --git a/drivers/gpu/nvgpu/common/bus/bus_gk20a.c b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c
index d4ef41c1..d0091cee 100644
--- a/drivers/gpu/nvgpu/common/bus/bus_gk20a.c
+++ b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c
@@ -23,6 +23,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/soc.h>
 #include <nvgpu/mm.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "bus_gk20a.h"
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gm20b.c b/drivers/gpu/nvgpu/common/bus/bus_gm20b.c
index 669cb0ae..d2c4c2b7 100644
--- a/drivers/gpu/nvgpu/common/bus/bus_gm20b.c
+++ b/drivers/gpu/nvgpu/common/bus/bus_gm20b.c
@@ -25,6 +25,7 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/mm.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "bus_gm20b.h"
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gp10b.c b/drivers/gpu/nvgpu/common/bus/bus_gp10b.c
index 86b548f2..11e60c53 100644
--- a/drivers/gpu/nvgpu/common/bus/bus_gp10b.c
+++ b/drivers/gpu/nvgpu/common/bus/bus_gp10b.c
@@ -22,6 +22,7 @@
 
 #include <nvgpu/timers.h>
 #include <nvgpu/mm.h>
+#include <nvgpu/io.h>
 
 #include "bus_gp10b.h"
 #include "gk20a/gk20a.h"
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gv100.c b/drivers/gpu/nvgpu/common/bus/bus_gv100.c
index 2aa15e67..eb0387e6 100644
--- a/drivers/gpu/nvgpu/common/bus/bus_gv100.c
+++ b/drivers/gpu/nvgpu/common/bus/bus_gv100.c
@@ -22,6 +22,7 @@
 
 #include <nvgpu/timers.h>
 #include <nvgpu/mm.h>
+#include <nvgpu/io.h>
 
 #include "bus_gv100.h"
 #include "gk20a/gk20a.h"
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c
index d27ac9d0..14634923 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c
@@ -29,6 +29,7 @@
 #include "fb_gk20a.h"
 
 #include <nvgpu/timers.h>
+#include <nvgpu/io.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 bd093b31..00ae7b5f 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c
@@ -29,6 +29,8 @@
 #include "fb_gk20a.h"
 #include "fb_gm20b.h"
 
+#include <nvgpu/io.h>
+
 #include <nvgpu/hw/gm20b/hw_fb_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_top_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_gmmu_gm20b.h>
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gp106.c b/drivers/gpu/nvgpu/common/fb/fb_gp106.c
index 6f257db4..094f9fa4 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gp106.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gp106.c
@@ -25,6 +25,8 @@
 #include "fb_gp10b.h"
 #include "fb_gp106.h"
 
+#include <nvgpu/io.h>
+
 #include <nvgpu/hw/gp106/hw_fb_gp106.h>
 
 #define HW_SCRUB_TIMEOUT_DEFAULT	100 /* usec */
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv100.c b/drivers/gpu/nvgpu/common/fb/fb_gv100.c
index 155c1e8b..8857f02b 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gv100.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gv100.c
@@ -35,6 +35,7 @@
 #include <nvgpu/firmware.h>
 #include <nvgpu/pmu.h>
 #include <nvgpu/falcon.h>
+#include <nvgpu/io.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 a7e5de68..664b2dd1 100644
--- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c
@@ -30,6 +30,7 @@
 #include <nvgpu/bug.h>
 #include <nvgpu/soc.h>
 #include <nvgpu/ptimer.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/mm_gk20a.h"
diff --git a/drivers/gpu/nvgpu/common/pramin.c b/drivers/gpu/nvgpu/common/pramin.c
index 99d588aa..ba6a92ba 100644
--- a/drivers/gpu/nvgpu/common/pramin.c
+++ b/drivers/gpu/nvgpu/common/pramin.c
@@ -24,6 +24,7 @@
 #include <nvgpu/page_allocator.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/sizes.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c b/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c
index 52e47601..0b3188ee 100644
--- a/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c
+++ b/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c
@@ -21,6 +21,7 @@
  */
 
 #include <nvgpu/log.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "ptimer_gk20a.h"
diff --git a/drivers/gpu/nvgpu/common/sim_pci.c b/drivers/gpu/nvgpu/common/sim_pci.c
index b05504fe..65950c4c 100644
--- a/drivers/gpu/nvgpu/common/sim_pci.c
+++ b/drivers/gpu/nvgpu/common/sim_pci.c
@@ -25,6 +25,7 @@
 #include <nvgpu/dma.h>
 #include <nvgpu/hw_sim_pci.h>
 #include <nvgpu/sim.h>
+#include <nvgpu/io.h>
 #include "gk20a/gk20a.h"
 
 static inline u32 sim_msg_header_size(void)
diff --git a/drivers/gpu/nvgpu/common/vbios/bios.c b/drivers/gpu/nvgpu/common/vbios/bios.c
index de1b30e8..12c0eded 100644
--- a/drivers/gpu/nvgpu/common/vbios/bios.c
+++ b/drivers/gpu/nvgpu/common/vbios/bios.c
@@ -21,6 +21,7 @@
  */
 
 #include <nvgpu/bios.h>
+#include <nvgpu/io.h>
 #include <nvgpu/hw/gp106/hw_gc6_gp106.h>
 
 #include "gk20a/gk20a.h"
-- 
cgit v1.2.2