From 2d8579274ab74d19e95c836ed4efc8b85278d9ac Mon Sep 17 00:00:00 2001
From: Manish Bhardwaj <mbhardwaj@nvidia.com>
Date: Fri, 20 Sep 2024 19:50:09 +0000
Subject: [PATCH] nvidia-oot: use ivc APIs based on conftest flag

Bug 4551265

Change-Id: I75809a5c112b9e3cd5da570c2d9641bd89cfe07e
Signed-off-by: Manish Bhardwaj <mbhardwaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3217450
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: svcacv <svcacv@nvidia.com>
---
 drivers/platform/tegra/rtcpu/ivc-bus.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/platform/tegra/rtcpu/ivc-bus.c b/drivers/platform/tegra/rtcpu/ivc-bus.c
index dae868b7..8d97516a 100644
--- a/drivers/platform/tegra/rtcpu/ivc-bus.c
+++ b/drivers/platform/tegra/rtcpu/ivc-bus.c
@@ -9,7 +9,11 @@
 #include <linux/of_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
+#if defined(NV_TEGRA_IVC_USE_IVC_EXT_DRIVER)
 #include <soc/tegra/ivc_ext.h>
+#else
+#include <soc/tegra/ivc-priv.h>
+#endif
 #include <linux/tegra-ivc-bus.h>
 #include <linux/bitops.h>
 #include <linux/version.h>
@@ -201,7 +205,11 @@ static struct tegra_ivc_channel *tegra_ivc_channel_create(
 
 	chan->group = channel_group;
 
+#if defined(NV_TEGRA_IVC_USE_IVC_EXT_DRIVER)
 	tegra_ivc_channel_reset(&chan->ivc);
+#else
+	tegra_ivc_reset(&chan->ivc);
+#endif
 
 	/* Fill channel descriptor */
 	tlv = (struct camrtc_tlv_ivc_setup *)
@@ -245,7 +253,11 @@ static void tegra_ivc_channel_notify(struct tegra_ivc_channel *chan)
 {
 	const struct tegra_ivc_channel_ops *ops;
 
+#if defined(NV_TEGRA_IVC_USE_IVC_EXT_DRIVER)
 	if (tegra_ivc_channel_notified(&chan->ivc) != 0)
+#else
+	if (tegra_ivc_notified(&chan->ivc) != 0)
+#endif
 		return;
 
 	if (!chan->is_ready)