From b7fca01b0e01544c3a66d2e05a8b99bcb621a004 Mon Sep 17 00:00:00 2001
From: Terje Bergstrom <tbergstrom@nvidia.com>
Date: Fri, 14 Apr 2017 13:19:04 -0700
Subject: gpu: nvgpu: Scrub gk20a_platform dependencies

Remove gk20a_platform dependencies from gk20a.h. This makes
gk20a_platform a Linux platform specific data structure. Add #include
for platform_gk20a.h in the source files that still depend on Linux.

JIRA NVGPU-16

Change-Id: Ib098accd34a1f5066eb8680c387f9b178169f3f0
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1463547
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/clk/clk_arb.c    | 8 ++++++--
 drivers/gpu/nvgpu/clk/clk_common.c | 1 +
 drivers/gpu/nvgpu/clk/clk_mclk.c   | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

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

diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c
index 15439817..4400f3bb 100644
--- a/drivers/gpu/nvgpu/clk/clk_arb.c
+++ b/drivers/gpu/nvgpu/clk/clk_arb.c
@@ -26,10 +26,15 @@
 #include <nvgpu/atomic.h>
 #include <nvgpu/bug.h>
 #include <nvgpu/kref.h>
+#include <nvgpu/log.h>
 
 #include "gk20a/gk20a.h"
 #include "clk/clk_arb.h"
 
+#ifdef CONFIG_DEBUG_FS
+#include "gk20a/platform_gk20a.h"
+#endif
+
 #define MAX_F_POINTS 256
 #define DEFAULT_EVENT_NUMBER 32
 
@@ -1482,8 +1487,7 @@ static long nvgpu_clk_arb_ioctl_event_dev(struct file *filp, unsigned int cmd,
 				(struct nvgpu_gpu_set_event_filter_args *)buf);
 		break;
 	default:
-		dev_dbg(dev_from_gk20a(g),
-				"unrecognized event ioctl cmd: 0x%x", cmd);
+		nvgpu_warn(g, "unrecognized event ioctl cmd: 0x%x", cmd);
 		err = -ENOTTY;
 	}
 
diff --git a/drivers/gpu/nvgpu/clk/clk_common.c b/drivers/gpu/nvgpu/clk/clk_common.c
index 3230ded0..0704ba2b 100644
--- a/drivers/gpu/nvgpu/clk/clk_common.c
+++ b/drivers/gpu/nvgpu/clk/clk_common.c
@@ -17,6 +17,7 @@
 #include <linux/clk.h>
 
 #include "gk20a/gk20a.h"
+#include "gk20a/platform_gk20a.h"
 
 struct clk *gk20a_clk_get(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/clk/clk_mclk.c b/drivers/gpu/nvgpu/clk/clk_mclk.c
index cf04c98c..3996c0e1 100644
--- a/drivers/gpu/nvgpu/clk/clk_mclk.c
+++ b/drivers/gpu/nvgpu/clk/clk_mclk.c
@@ -18,6 +18,9 @@
 
 #include "gk20a/gk20a.h"
 #include "gk20a/pmu_gk20a.h"
+#ifdef CONFIG_DEBUG_FS
+#include "gk20a/platform_gk20a.h"
+#endif
 
 #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h>
 #include <nvgpu/hw/gp106/hw_fb_gp106.h>
-- 
cgit v1.2.2