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>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/vgpu/css_vgpu.c
index 0e44b81a..40ff8f90 100644
--- a/drivers/gpu/nvgpu/vgpu/css_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/css_vgpu.c
@@ -25,6 +25,7 @@
 #include <nvgpu/vgpu/vgpu.h>
 #include <nvgpu/vgpu/tegra_vgpu.h>
 #include <nvgpu/dt.h>
+#include <nvgpu/bug.h>
 
 #include "gk20a/gk20a.h"
 #include "gk20a/channel_gk20a.h"
@@ -43,13 +44,13 @@ static struct tegra_hv_ivm_cookie *vgpu_css_reserve_mempool(struct gk20a *g)
         err = nvgpu_dt_read_u32_index(g, "mempool-css", 1, &mempool);
         if (err) {
                 nvgpu_err(g, "dt missing mempool-css");
-                return ERR_PTR(err);
+                return (struct tegra_hv_ivm_cookie *)ERR_PTR(err);
         }
 
         cookie = vgpu_ivm_mempool_reserve(mempool);
         if (IS_ERR_OR_NULL(cookie)) {
                 nvgpu_err(g, "mempool  %u reserve failed", mempool);
-                return ERR_PTR(-EINVAL);
+                return (struct tegra_hv_ivm_cookie *)ERR_PTR(-EINVAL);
         }
         return cookie;
 }