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/os/linux/ioctl_ctrl.c | 2 ++
 drivers/gpu/nvgpu/os/linux/module.c     | 1 +
 2 files changed, 3 insertions(+)

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

diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
index e87d5822..8130b7d0 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
@@ -29,6 +29,8 @@
 #include <nvgpu/log.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/sizes.h>
+#include <nvgpu/list.h>
+#include <nvgpu/clk_arb.h>
 
 #include "ioctl_ctrl.h"
 #include "ioctl_dbg.h"
diff --git a/drivers/gpu/nvgpu/os/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c
index e3667947..46a82d86 100644
--- a/drivers/gpu/nvgpu/os/linux/module.c
+++ b/drivers/gpu/nvgpu/os/linux/module.c
@@ -42,6 +42,7 @@
 #include <nvgpu/ctxsw_trace.h>
 #include <nvgpu/vidmem.h>
 #include <nvgpu/sim.h>
+#include <nvgpu/clk_arb.h>
 
 #include "platform_gk20a.h"
 #include "sysfs.h"
-- 
cgit v1.2.2