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/gv100/bios_gv100.c   | 3 ++-
 drivers/gpu/nvgpu/gv100/fifo_gv100.c   | 1 +
 drivers/gpu/nvgpu/gv100/gr_gv100.c     | 1 +
 drivers/gpu/nvgpu/gv100/mc_gv100.c     | 1 +
 drivers/gpu/nvgpu/gv100/mm_gv100.c     | 3 ++-
 drivers/gpu/nvgpu/gv100/nvlink_gv100.c | 1 +
 6 files changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/drivers/gpu/nvgpu/gv100/bios_gv100.c b/drivers/gpu/nvgpu/gv100/bios_gv100.c
index 45d5ed31..a1a3d053 100644
--- a/drivers/gpu/nvgpu/gv100/bios_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/bios_gv100.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-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/bios.h>
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/timers.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gp106/bios_gp106.h"
diff --git a/drivers/gpu/nvgpu/gv100/fifo_gv100.c b/drivers/gpu/nvgpu/gv100/fifo_gv100.c
index 242e48f9..1dedb7d4 100644
--- a/drivers/gpu/nvgpu/gv100/fifo_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/fifo_gv100.c
@@ -26,6 +26,7 @@
 #include "fifo_gv100.h"
 #include <nvgpu/timers.h>
 #include <nvgpu/ptimer.h>
+#include <nvgpu/io.h>
 
 #include <nvgpu/hw/gv100/hw_ccsr_gv100.h>
 #include <nvgpu/hw/gk20a/hw_fifo_gk20a.h>
diff --git a/drivers/gpu/nvgpu/gv100/gr_gv100.c b/drivers/gpu/nvgpu/gv100/gr_gv100.c
index 5f891ce5..97affdd9 100644
--- a/drivers/gpu/nvgpu/gv100/gr_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/gr_gv100.c
@@ -25,6 +25,7 @@
 #include <nvgpu/log.h>
 #include <nvgpu/debug.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/gr_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gv100/mc_gv100.c b/drivers/gpu/nvgpu/gv100/mc_gv100.c
index 7d38a3fb..069a012a 100644
--- a/drivers/gpu/nvgpu/gv100/mc_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/mc_gv100.c
@@ -23,6 +23,7 @@
  */
 
 #include <nvgpu/types.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 
diff --git a/drivers/gpu/nvgpu/gv100/mm_gv100.c b/drivers/gpu/nvgpu/gv100/mm_gv100.c
index ffae11f5..38b876bf 100644
--- a/drivers/gpu/nvgpu/gv100/mm_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/mm_gv100.c
@@ -1,7 +1,7 @@
 /*
  * GV100 memory management
  *
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-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 "gv100/mm_gv100.h"
diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
index 41c2cd2b..add0448e 100644
--- a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
@@ -28,6 +28,7 @@
 #include <nvgpu/bitops.h>
 #include <nvgpu/nvlink.h>
 #include <nvgpu/enabled.h>
+#include <nvgpu/io.h>
 
 #include "gk20a/gk20a.h"
 #include "nvlink_gv100.h"
-- 
cgit v1.2.2