video: tegra: host: Move vpr functions to gk20a

Currently, vpr prototypes are defined inside nvhost.h but the correct
place for the headers is inside gk20a.h. This patch makes the necessary
modifications to the headers.

Change-Id: I779e242d36402102a5bb39440dd6d6d455937fc3
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-on: http://git-master/r/381426
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index a71ce95105fed2638eddf18697b5216c7d8a38a0..7709c850c73b23d0d269061eaaf683538cb9b464 100644 (file)
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -49,7 +49,7 @@
 #ifdef CONFIG_TRUSTED_LITTLE_KERNEL
 #include <linux/ote_protocol.h>
 #endif
-#include <linux/nvhost.h>
+#include <linux/gk20a.h>
 
 #ifdef CONFIG_ARM64
 #include <linux/irqchip/arm-gic.h>

diff --git a/include/linux/gk20a.h b/include/linux/gk20a.h
index decc95aa05de1cfbb3b7a6c73d42777dfbe9180a..8ad1b65585a96e9126e6b507664ff8a08a96755b 100644 (file)
--- a/include/linux/gk20a.h
+++ b/include/linux/gk20a.h
@@ -23,8 +23,13 @@ struct channel_gk20a;
 struct platform_device;
 
 #ifdef CONFIG_GK20A
+int nvhost_vpr_info_fetch(void);
 void gk20a_debug_dump_device(struct platform_device *pdev);
 #else
 static inline void gk20a_debug_dump_device(struct platform_device *pdev) {}
+static inline int nvhost_vpr_info_fetch(void)
+{
+       return -ENOSYS;
+}
 #endif
 #endif

diff --git a/include/linux/nvhost.h b/include/linux/nvhost.h
index ed1343c9e32daecd197a8421af01327d868f4e5c..300f06b9886b51928a641f1e5da3cc0cfa15fa02 100644 (file)
--- a/include/linux/nvhost.h
+++ b/include/linux/nvhost.h
@@ -296,14 +296,6 @@ int nvhost_intr_register_notifier(struct platform_device *pdev,
                                  void (*callback)(void *, int),
                                  void *private_data);
 
-#ifdef CONFIG_TEGRA_GK20A
-int nvhost_vpr_info_fetch(void);
-#else
-static inline int nvhost_vpr_info_fetch(void)
-{
-       return 0;
-}
-#endif
 
 #ifdef CONFIG_TEGRA_GRHOST
 void nvhost_debug_dump_device(struct platform_device *pdev);