video: tegra: host: Revert dynamic syncpt patches

With dynamic syncpoint allocation ap_systemsw fails
intermittently for TN8. so reverting series of dynamic
syncpoint patches.

Bug 1305024
Bug 1467163

Revert "video: tegra: host: add pbdma syncpoint headers"
commit 62efc18329c5da0e6dc90f088c145e1099213f20.

Revert "video: tegra: host: print syncpt id in debug spew"
commit c918cc4494008fe764e746142060d896436a1d3c.

Revert "video: tegra: host: remove static from get_syncpt_name()"
commit c098ce933738d892bbeba003ab35505c4b7d7951.

Revert "video: tegra: host: remove unused variable"
commit a4dad0592c95165e8366ebe939367a1ece2cb9b9.

Revert "video: tegra: host: Hardcode AVP sync point"
commit 8da84e56de66f20806cb706ee005f263ca5e213f.

Revert "video: tegra: host: hard-code syncpts for t114"
commit 410536f668a62d94603bc3287efaef3dcffb1226.

Revert "video: tegra: host: remove static syncpt mappings"
commit 4cee1d17b01019cc122acf21604d4f01ac6f7474.

Revert "media: tegra_camera: use dynamic syncpts"
commit eae55c8e4cbb65e3ed1a8c8ef8150d8a6ba938bf.

Revert "video: tegra: dc: use dynamic syncpt"
commit 03d7c261ceb62bf1eb93cae48aaa84881d6de5b9.

Revert "video: tegra: host: use dynamic syncpt for hwctx"
commit 03136f549f54a26d77987f3751bf12d202614372.

Revert "video: tegra: host: implement dynamic synpt"
commit 6c2d1b43e51f2e0424b793c9da1c25adf63ea569.

Change-Id: I19a63e812680b7521bed3c1188858b2165a88c89
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-on: http://git-master/r/374169
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 16 insertions, 17 deletions

diff --git a/drivers/media/platform/soc_camera/tegra_camera/vi2.c b/drivers/media/platform/soc_camera/tegra_camera/vi2.c
index bf69682c85c8..f58c03bff8a5 100644
--- a/drivers/media/platform/soc_camera/tegra_camera/vi2.c
+++ b/drivers/media/platform/soc_camera/tegra_camera/vi2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2013, 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,
@@ -29,6 +29,9 @@
 
 #define TEGRA_SYNCPT_CSI_WAIT_TIMEOUT                   200
 
+#define TEGRA_VI_SYNCPT_CSI_A				NVSYNCPT_VI_0_3
+#define TEGRA_VI_SYNCPT_CSI_B				NVSYNCPT_VI_1_3
+
 #define TEGRA_VI_CFG_VI_INCR_SYNCPT			0x000
 #define TEGRA_VI_CFG_VI_INCR_SYNCPT_CNTRL		0x004
 #define TEGRA_VI_CFG_VI_INCR_SYNCPT_ERROR		0x008
@@ -435,27 +438,24 @@ static void vi2_clks_disable(struct tegra_camera_dev *cam)
 	}
 }
 
-static void vi2_init_syncpts(struct tegra_camera_dev *cam)
-{
-	cam->syncpt_id_csi_a = nvhost_get_syncpt_client_managed("vi_csi_A");
-
-	cam->syncpt_id_csi_b = nvhost_get_syncpt_client_managed("vi_csi_B");
-}
-
 static void vi2_save_syncpts(struct tegra_camera_dev *cam)
 {
 	cam->syncpt_csi_a =
-		nvhost_syncpt_read_ext(cam->ndev, cam->syncpt_id_csi_a);
+		nvhost_syncpt_read_ext(cam->ndev,
+				       TEGRA_VI_SYNCPT_CSI_A);
 
 	cam->syncpt_csi_b =
-		nvhost_syncpt_read_ext(cam->ndev, cam->syncpt_id_csi_b);
+		nvhost_syncpt_read_ext(cam->ndev,
+				       TEGRA_VI_SYNCPT_CSI_B);
 }
 
 static void vi2_incr_syncpts(struct tegra_camera_dev *cam)
 {
-	nvhost_syncpt_cpu_incr_ext(cam->ndev, cam->syncpt_id_csi_a);
+	nvhost_syncpt_cpu_incr_ext(cam->ndev,
+				   TEGRA_VI_SYNCPT_CSI_A);
 
-	nvhost_syncpt_cpu_incr_ext(cam->ndev, cam->syncpt_id_csi_b);
+	nvhost_syncpt_cpu_incr_ext(cam->ndev,
+				   TEGRA_VI_SYNCPT_CSI_B);
 }
 
 static void vi2_capture_clean(struct tegra_camera_dev *cam)
@@ -493,7 +493,7 @@ static int vi2_capture_setup_csi_0(struct tegra_camera_dev *cam,
 
 	/* VI_MWA_REQ_DONE */
 	TC_VI_REG_WT(cam, TEGRA_VI_CFG_VI_INCR_SYNCPT,
-			(0x4 << 8) | cam->syncpt_id_csi_a);
+			(0x4 << 8) | TEGRA_VI_SYNCPT_CSI_A);
 
 	if (cam->tpg_mode) {
 		TC_VI_REG_WT(cam, TEGRA_CSI_PATTERN_GENERATOR_CTRL_A,
@@ -546,7 +546,7 @@ static int vi2_capture_setup_csi_1(struct tegra_camera_dev *cam,
 
 	/* VI_MWB_REQ_DONE */
 	TC_VI_REG_WT(cam, TEGRA_VI_CFG_VI_INCR_SYNCPT,
-			(0x5 << 8) | cam->syncpt_id_csi_b);
+			(0x5 << 8) | TEGRA_VI_SYNCPT_CSI_B);
 
 	if (cam->tpg_mode) {
 		TC_VI_REG_WT(cam, TEGRA_CSI_PATTERN_GENERATOR_CTRL_B,
@@ -717,7 +717,7 @@ static int vi2_capture_start(struct tegra_camera_dev *cam,
 				0x0000f005);
 		TC_VI_REG_WT(cam, TEGRA_VI_CSI_0_SINGLE_SHOT, 0x1);
 		err = nvhost_syncpt_wait_timeout_ext(cam->ndev,
-				cam->syncpt_id_csi_a,
+				TEGRA_VI_SYNCPT_CSI_A,
 				cam->syncpt_csi_a,
 				TEGRA_SYNCPT_CSI_WAIT_TIMEOUT,
 				NULL,
@@ -728,7 +728,7 @@ static int vi2_capture_start(struct tegra_camera_dev *cam,
 				0x0000f005);
 		TC_VI_REG_WT(cam, TEGRA_VI_CSI_1_SINGLE_SHOT, 0x1);
 		err = nvhost_syncpt_wait_timeout_ext(cam->ndev,
-				cam->syncpt_id_csi_b,
+				TEGRA_VI_SYNCPT_CSI_B,
 				cam->syncpt_csi_b,
 				TEGRA_SYNCPT_CSI_WAIT_TIMEOUT,
 				NULL,
@@ -804,7 +804,6 @@ struct tegra_camera_ops vi2_ops = {
 
 	.activate = vi2_sw_reset,
 
-	.init_syncpts = vi2_init_syncpts,
 	.save_syncpts = vi2_save_syncpts,
 	.incr_syncpts = vi2_incr_syncpts,