gpu: nvgpu: split nvhost dependency on plat interface

Add CONFIG_TEGRA_GK20A_NVHOST and remove the TEGRA_GRHOST ||
TEGRA_HOST1X dependency in CONFIG_TEGRA_GK20A to allow using the iGPU
without the nvhost driver. Use the new config to guard syncpt-related
code.

Also make TEGRA_ACR depend on GK20A too so that it aligns properly under
gk20a in menuconfig.

Bug 1853519

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

1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
index 11448094..ae22ee7d 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
@@ -31,11 +31,8 @@
 #include "../drivers/staging/android/sync.h"
 #endif
 
-#ifdef CONFIG_TEGRA_GK20A
+#ifdef CONFIG_TEGRA_GK20A_NVHOST
 #include <linux/nvhost.h>
-#endif
-
-#ifdef CONFIG_TEGRA_GK20A
 
 struct gk20a_channel_syncpt {
         struct gk20a_channel_sync ops;
@@ -382,7 +379,7 @@ gk20a_channel_syncpt_create(struct channel_gk20a *c)
 
         return &sp->ops;
 }
-#endif /* CONFIG_TEGRA_GK20A */
+#endif /* CONFIG_TEGRA_GK20A_NVHOST */
 
 struct gk20a_channel_semaphore {
         struct gk20a_channel_sync ops;
@@ -972,7 +969,7 @@ void gk20a_channel_sync_destroy(struct gk20a_channel_sync *sync)
 
 struct gk20a_channel_sync *gk20a_channel_sync_create(struct channel_gk20a *c)
 {
-#ifdef CONFIG_TEGRA_GK20A
+#ifdef CONFIG_TEGRA_GK20A_NVHOST
         if (gk20a_platform_has_syncpoints(c->g->dev))
                 return gk20a_channel_syncpt_create(c);
 #endif
@@ -981,9 +978,7 @@ struct gk20a_channel_sync *gk20a_channel_sync_create(struct channel_gk20a *c)
 
 bool gk20a_channel_sync_needs_sync_framework(struct channel_gk20a *c)
 {
-#ifdef CONFIG_TEGRA_GK20A
         if (gk20a_platform_has_syncpoints(c->g->dev))
                 return false;
-#endif
         return true;
 }