gpu: nvgpu: bring back tegra idle registration

To make do_idle work when nvgpu is built as a module, reverse the order
of call dependencies for do_idle. Don't provide visible
gk20a_do_{idle,unidle}() functions for the kernel but instead call the
kernel for registering and unregistering pointers to them when the
driver loads and unloads.

Refactor the internal __gk20a_do_{idle,unidle} functions to take a
struct gk20a * instead of struct device *, and use the callback api for
providing that g instead of retrieving the plat device from device tree.

Bug 200290850

Change-Id: Ibef8b069302e547b298069cbb97734f461a10cc3
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1493774
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

drivers/gpu/nvgpu/common/linux/module.c

@@ -288,9 +288,9 @@ static struct of_device_id tegra_gk20a_of_match[] = {
  * In success, we hold these locks and return
  * In failure, we release these locks and return
  */
-int __gk20a_do_idle(struct device *dev, bool force_reset)
+int __gk20a_do_idle(struct gk20a *g, bool force_reset)
 {
-	struct gk20a *g = get_gk20a(dev);
+	struct device *dev = g->dev;
 	struct gk20a_platform *platform = dev_get_drvdata(dev);
 	struct nvgpu_timeout timeout;
 	int ref_cnt;
@@ -419,25 +419,19 @@ fail_timeout:
  *
  * In success, this call MUST be balanced by caller with gk20a_do_unidle()
  */
-int gk20a_do_idle(void)
+static int gk20a_do_idle(void *_g)
 {
-	struct device_node *node =
+	struct gk20a *g = (struct gk20a *)_g;
-			of_find_matching_node(NULL, tegra_gk20a_of_match);
-	struct platform_device *pdev = of_find_device_by_node(node);
 
-	int ret =  __gk20a_do_idle(&pdev->dev, true);
+	return __gk20a_do_idle(g, true);
-
-	of_node_put(node);
-
-	return ret;
 }
 
 /**
  * __gk20a_do_unidle() - unblock all the tasks blocked by __gk20a_do_idle()
  */
-int __gk20a_do_unidle(struct device *dev)
+int __gk20a_do_unidle(struct gk20a *g)
 {
-	struct gk20a *g = get_gk20a(dev);
+	struct device *dev = g->dev;
 	struct gk20a_platform *platform = dev_get_drvdata(dev);
 	int err;
 
@@ -471,17 +465,11 @@ int __gk20a_do_unidle(struct device *dev)
 /**
  * gk20a_do_unidle() - wrap up for __gk20a_do_unidle()
  */
-int gk20a_do_unidle(void)
+static int gk20a_do_unidle(void *_g)
 {
-	struct device_node *node =
+	struct gk20a *g = (struct gk20a *)_g;
-			of_find_matching_node(NULL, tegra_gk20a_of_match);
-	struct platform_device *pdev = of_find_device_by_node(node);
 
-	int ret = __gk20a_do_unidle(&pdev->dev);
+	return __gk20a_do_unidle(g);
-
-	of_node_put(node);
-
-	return ret;
 }
 #endif
 
@@ -520,6 +508,8 @@ static irqreturn_t gk20a_intr_thread_stall(int irq, void *dev_id)
 
 void gk20a_remove_support(struct gk20a *g)
 {
+	tegra_unregister_idle_unidle(gk20a_do_idle);
+
 	nvgpu_kfree(g, g->dbg_regops_tmp_buf);
 
 	if (g->pmu.remove_support)
@@ -557,6 +547,8 @@ static int gk20a_init_support(struct platform_device *dev)
 	int err = 0;
 	struct gk20a *g = get_gk20a(&dev->dev);
 
+	tegra_register_idle_unidle(gk20a_do_idle, gk20a_do_unidle, g);
+
 	g->regs = gk20a_ioremap_resource(dev, GK20A_BAR0_IORESOURCE_MEM,
 					 &g->reg_mem);
 	if (IS_ERR(g->regs)) {

drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c

@@ -13,8 +13,6 @@
  * more details.
  */
 
-#include <linux/gk20a.h>
-
 #include <linux/version.h>
 
 #include <nvgpu/semaphore.h>

drivers/gpu/nvgpu/gk20a/fence_gk20a.c

@@ -13,7 +13,6 @@
 
 #include "fence_gk20a.h"
 
-#include <linux/gk20a.h>
 #include <linux/file.h>
 #include <linux/version.h>
 #include <linux/fs.h>

drivers/gpu/nvgpu/gk20a/gk20a.h

@@ -1485,10 +1485,8 @@ void gk20a_busy_noresume(struct device *dev);
 void gk20a_idle_nosuspend(struct device *dev);
 int __must_check gk20a_busy(struct gk20a *g);
 void gk20a_idle(struct gk20a *g);
-int gk20a_do_idle(void);
+int __gk20a_do_idle(struct gk20a *g, bool force_reset);
-int gk20a_do_unidle(void);
+int __gk20a_do_unidle(struct gk20a *g);
-int __gk20a_do_idle(struct device *dev, bool force_reset);
-int __gk20a_do_unidle(struct device *dev);
 
 int gk20a_can_busy(struct gk20a *g);
 void gk20a_driver_start_unload(struct gk20a *g);

drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c

@@ -22,7 +22,6 @@
 #include <linux/device.h>
 #include <linux/pm_runtime.h>
 #include <linux/fb.h>
-#include <linux/gk20a.h>
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
 #include <soc/tegra/tegra-dvfs.h>
 #endif
@@ -742,7 +741,7 @@ static ssize_t force_idle_store(struct device *dev,
 		if (g->forced_idle)
 			return count; /* do nothing */
 		else {
-			err = __gk20a_do_idle(dev, false);
+			err = __gk20a_do_idle(g, false);
 			if (!err) {
 				g->forced_idle = 1;
 				dev_info(dev, "gpu is idle : %d\n",
@@ -753,7 +752,7 @@ static ssize_t force_idle_store(struct device *dev,
 		if (!g->forced_idle)
 			return count; /* do nothing */
 		else {
-			err = __gk20a_do_unidle(dev);
+			err = __gk20a_do_unidle(g);
 			if (!err) {
 				g->forced_idle = 0;
 				dev_info(dev, "gpu is idle : %d\n",

drivers/gpu/nvgpu/vgpu/sysfs_vgpu.c

@@ -12,7 +12,6 @@
  */
 
 #include <linux/device.h>
-#include <linux/gk20a.h>
 
 #include "vgpu/vgpu.h"
 

include/linux/gk20a.h

@@ -1,35 +0,0 @@
-/*
- * gk20a GPU driver
- *
- * Copyright (c) 2014-2016, NVIDIA Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GK20A_H
-#define __GK20A_H
-
-#include <linux/errno.h>
-
-struct channel_gk20a;
-struct platform_device;
-
-#if defined(CONFIG_GK20A) && defined(CONFIG_PM)
-int gk20a_do_idle(void);
-int gk20a_do_unidle(void);
-#else
-static inline int gk20a_do_idle(void) { return -ENOSYS; }
-static inline int gk20a_do_unidle(void) { return -ENOSYS; }
-#endif
-
-#endif