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/gp106/acr_gp106.c   | 1 +
 drivers/gpu/nvgpu/gp106/bios_gp106.c  | 1 +
 drivers/gpu/nvgpu/gp106/clk_gp106.c   | 1 +
 drivers/gpu/nvgpu/gp106/fuse_gp106.c  | 1 +
 drivers/gpu/nvgpu/gp106/gr_gp106.c    | 2 ++
 drivers/gpu/nvgpu/gp106/mclk_gp106.c  | 1 +
 drivers/gpu/nvgpu/gp106/mm_gp106.c    | 3 ++-
 drivers/gpu/nvgpu/gp106/pmu_gp106.c   | 1 +
 drivers/gpu/nvgpu/gp106/sec2_gp106.c  | 1 +
 drivers/gpu/nvgpu/gp106/therm_gp106.c | 1 +
 drivers/gpu/nvgpu/gp106/xve_gp106.c   | 1 +
 11 files changed, 13 insertions(+), 1 deletion(-)

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

diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c
index 2b50d339..63386547 100644
--- a/drivers/gpu/nvgpu/gp106/acr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c
@@ -27,6 +27,7 @@
 #include <nvgpu/firmware.h>
 #include <nvgpu/pmu.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp106/bios_gp106.c b/drivers/gpu/nvgpu/gp106/bios_gp106.c
index 09d7b9af..deeae2fe 100644
--- a/drivers/gpu/nvgpu/gp106/bios_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/bios_gp106.c
@@ -26,6 +26,7 @@
 #include <nvgpu/timers.h>
 #include <nvgpu/falcon.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gm20b/fifo_gm20b.h"
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c
index 2c529e52..b1fa7cad 100644
--- a/drivers/gpu/nvgpu/gp106/clk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c
@@ -28,6 +28,7 @@
 #endif
 
 #include <nvgpu/kmem.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gp106/mclk_gp106.h"
diff --git a/drivers/gpu/nvgpu/gp106/fuse_gp106.c b/drivers/gpu/nvgpu/gp106/fuse_gp106.c
index 0303830c..82e3217f 100644
--- a/drivers/gpu/nvgpu/gp106/fuse_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/fuse_gp106.c
@@ -23,6 +23,7 @@
  */
 
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gp106/fuse_gp106.h"
diff --git a/drivers/gpu/nvgpu/gp106/gr_gp106.c b/drivers/gpu/nvgpu/gp106/gr_gp106.c
index 2e5f29ee..233357c8 100644
--- a/drivers/gpu/nvgpu/gp106/gr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/gr_gp106.c
@@ -29,6 +29,8 @@
 #include "gm20b/gr_gm20b.h"
 #include "gp10b/gr_gp10b.h"
 
+#include <nvgpu/io.h>
+
 #include "gr_gp106.h"
 
 #include <nvgpu/hw/gp106/hw_gr_gp106.h>
diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
index 4ea9e6f6..d4d3f370 100644
--- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c
@@ -24,6 +24,7 @@
 #include <nvgpu/bios.h>
 #include <nvgpu/kmem.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #ifdef CONFIG_DEBUG_FS
diff --git a/drivers/gpu/nvgpu/gp106/mm_gp106.c b/drivers/gpu/nvgpu/gp106/mm_gp106.c
index 88482a6f..4a3a4a19 100644
--- a/drivers/gpu/nvgpu/gp106/mm_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/mm_gp106.c
@@ -1,7 +1,7 @@
 /*
  * GP106 memory management
  *
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,6 +23,7 @@
  */
 
 #include <nvgpu/sizes.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gp10b/mm_gp10b.h"
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
index 2a52dd4e..005523dc 100644
--- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
@@ -22,6 +22,7 @@
 
 #include <nvgpu/pmu.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gp106/sec2_gp106.c b/drivers/gpu/nvgpu/gp106/sec2_gp106.c
index 29fc2df0..6762d034 100644
--- a/drivers/gpu/nvgpu/gp106/sec2_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/sec2_gp106.c
@@ -23,6 +23,7 @@
 #include <nvgpu/pmu.h>
 #include <nvgpu/falcon.h>
 #include <nvgpu/mm.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "sec2_gp106.h"
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c
index b1f6fefb..ab465e6c 100644
--- a/drivers/gpu/nvgpu/gp106/therm_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/therm_gp106.c
@@ -20,6 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <nvgpu/io.h>
 #include "gk20a/gk20a.h"
 
 #include "therm_gp106.h"
diff --git a/drivers/gpu/nvgpu/gp106/xve_gp106.c b/drivers/gpu/nvgpu/gp106/xve_gp106.c
index e77ea5c1..40b0ff04 100644
--- a/drivers/gpu/nvgpu/gp106/xve_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/xve_gp106.c
@@ -26,6 +26,7 @@
 
 #include <nvgpu/bug.h>
 #include <nvgpu/xve.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gp106/hw_xp_gp106.h>
 #include <nvgpu/hw/gp106/hw_xve_gp106.h>
-- 
cgit v1.2.2