From db7bb6548b6f3c9da0f40a87ccbb9233c761c598 Mon Sep 17 00:00:00 2001
From: Debarshi Dutta <ddutta@nvidia.com>
Date: Thu, 2 Aug 2018 11:48:44 +0530
Subject: gpu: nvgpu: remove clk_arb.h to gk20a.h circular dependency

clk_arb.h and gk20a.h has circular dependencies to each other. This is
removed by forward declaring struct gk20a in clk_arb.h and removing the
header gk20a.h from clk_arb.h and similarly forward declaring struct
nvgpu_clk_arb in gk20a.h and removing the header clk_arb.h from gk20a.h
alongwith putting headers in every execution unit which calls clk_arb.h
related methods.

JIRA NVGPU-597

Change-Id: I7cedca17206c148b21d93e5d7f0d88c2f98b979a
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1790915
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/gp106/clk_gp106.c  | 2 ++
 drivers/gpu/nvgpu/gp106/fifo_gp106.c | 2 ++
 drivers/gpu/nvgpu/gp106/hal_gp106.c  | 1 +
 drivers/gpu/nvgpu/gp106/pmu_gp106.c  | 1 +
 4 files changed, 6 insertions(+)

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

diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c
index b1fa7cad..27a3039c 100644
--- a/drivers/gpu/nvgpu/gp106/clk_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c
@@ -29,6 +29,8 @@
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/io.h>
+#include <nvgpu/list.h>
+#include <nvgpu/clk_arb.h>
 
 #include "gk20a/gk20a.h"
 #include "gp106/mclk_gp106.h"
diff --git a/drivers/gpu/nvgpu/gp106/fifo_gp106.c b/drivers/gpu/nvgpu/gp106/fifo_gp106.c
index 9b1dd768..c1428306 100644
--- a/drivers/gpu/nvgpu/gp106/fifo_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/fifo_gp106.c
@@ -28,6 +28,8 @@
 #include <nvgpu/hw/gp106/hw_ccsr_gp106.h>
 #include <nvgpu/hw/gp106/hw_fifo_gp106.h>
 
+#include <nvgpu/bug.h>
+
 u32 gp106_fifo_get_num_fifos(struct gk20a *g)
 {
 	return ccsr_channel__size_1_v();
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 286ed3c7..2cb43327 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -94,6 +94,7 @@
 #include <nvgpu/enabled.h>
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/error_notifier.h>
+#include <nvgpu/clk_arb.h>
 
 #include <nvgpu/hw/gp106/hw_proj_gp106.h>
 #include <nvgpu/hw/gp106/hw_fifo_gp106.h>
diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
index 005523dc..45924828 100644
--- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c
@@ -23,6 +23,7 @@
 #include <nvgpu/pmu.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/io.h>
+#include <nvgpu/clk_arb.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
-- 
cgit v1.2.2