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>

4 files changed, 4 insertions, 10 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
index 3d313ce8..1b650cdd 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
+++ b/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>
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
index 5392e77c..51363059 100644
--- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c
+++ b/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>
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 79118fca..34f89fc8 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/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_unidle(void);
-int __gk20a_do_idle(struct device *dev, bool force_reset);
-int __gk20a_do_unidle(struct device *dev);
+int __gk20a_do_idle(struct gk20a *g, bool force_reset);
+int __gk20a_do_unidle(struct gk20a *g);
 
 int gk20a_can_busy(struct gk20a *g);
 void gk20a_driver_start_unload(struct gk20a *g);
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c b/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
index 275b663f..8c1dbd37 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a_sysfs.c
+++ b/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",