video: tegra: host: Remove Tegra11 ops from master

Adjust Tegra11 code to the fact that chip_ops were removed from
nvhost_master.

Change-Id: I5d2438fc369cd8e10cf504300293a8d5d246dd15
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>

Conflicts:

	drivers/video/tegra/host/chip_support.c
	drivers/video/tegra/host/t114/t114.c

Change-Id: Iceb4e79540c63ea52a1eeaecfe2d1e0fc7a24cff
Reviewed-on: http://git-master/r/102640
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Prashant Malani <pmalani@nvidia.com>
Tested-by: Prashant Malani <pmalani@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>

4 files changed, 26 insertions, 16 deletions

diff --git a/drivers/video/tegra/host/chip_support.c b/drivers/video/tegra/host/chip_support.c
index de616e120a85..afb8ab1aa82e 100644
--- a/drivers/video/tegra/host/chip_support.c
+++ b/drivers/video/tegra/host/chip_support.c
@@ -22,12 +22,12 @@
 #include <linux/types.h>
 #include <linux/bug.h>
 
-#include <mach/hardware.h>
-
 #include "bus.h"
 #include "chip_support.h"
 #include "t20/t20.h"
 #include "t30/t30.h"
+#include "t114/t114.h"
+#include <mach/hardware.h>
 
 struct nvhost_chip_support *nvhost_get_chip_ops(void)
 {
@@ -50,6 +50,10 @@ int nvhost_init_chip_support(struct nvhost_master *host)
 		err = nvhost_init_t30_support(host, chip_ops);
 		break;
 
+	case TEGRA_CHIPID_TEGRA11:
+		err = nvhost_init_t114_support(host, chip_ops);
+		break;
+
 	default:
 		err = -ENODEV;
 	}
diff --git a/drivers/video/tegra/host/gr3d/gr3d_t114.c b/drivers/video/tegra/host/gr3d/gr3d_t114.c
index d398b51df1c0..3e9b537cfad3 100644
--- a/drivers/video/tegra/host/gr3d/gr3d_t114.c
+++ b/drivers/video/tegra/host/gr3d/gr3d_t114.c
@@ -123,8 +123,9 @@ static void save_push_v1(struct nvhost_hwctx *nctx, struct nvhost_cdma *cdma)
 			ctx->restore_phys);
 	/* gather the save buffer */
 	nvhost_cdma_push_gather(cdma,
-			(void *)NVHOST_CDMA_PUSH_GATHER_CTXSAVE,
-			(void *)NVHOST_CDMA_PUSH_GATHER_CTXSAVE,
+			nvhost_get_host(nctx->channel->dev)->nvmap,
+			p->save_buf->handle,
+			0,
 			nvhost_opcode_gather(p->save_size),
 			p->save_phys);
 }
diff --git a/drivers/video/tegra/host/t114/t114.c b/drivers/video/tegra/host/t114/t114.c
index c51bb8a43b69..acd8729cf90f 100644
--- a/drivers/video/tegra/host/t114/t114.c
+++ b/drivers/video/tegra/host/t114/t114.c
@@ -206,12 +206,13 @@ static int t114_channel_init(struct nvhost_channel *ch,
 	return t114_nvhost_hwctx_handler_init(ch);
 }
 
-int nvhost_init_t114_channel_support(struct nvhost_master *host)
+int nvhost_init_t114_channel_support(struct nvhost_master *host,
+	struct nvhost_chip_support *op)
 {
-	int result = nvhost_init_t20_channel_support(host);
+	int result = nvhost_init_t20_channel_support(host, op);
 	/* We're using 8 out of 9 channels supported by hw */
 	host->nb_channels = NV_HOST1X_CHANNELS_T114-1;
-	host->op.channel.init = t114_channel_init;
+	op->channel.init = t114_channel_init;
 
 	return result;
 }
@@ -229,26 +230,28 @@ static struct nvhost_device *t114_get_nvhost_device(struct nvhost_master *host,
 	return NULL;
 }
 
-int nvhost_init_t114_support(struct nvhost_master *host)
+int nvhost_init_t114_support(struct nvhost_master *host,
+	struct nvhost_chip_support *op)
 {
 	int err;
 
 	/* don't worry about cleaning up on failure... "remove" does it. */
-	err = nvhost_init_t114_channel_support(host);
+	err = nvhost_init_t114_channel_support(host, op);
 	if (err)
 		return err;
-	err = host1x_init_cdma_support(host);
+	err = host1x_init_cdma_support(op);
 	if (err)
 		return err;
-	err = nvhost_init_t20_debug_support(host);
+	err = nvhost_init_t20_debug_support(op);
 	if (err)
 		return err;
-	err = host1x_init_syncpt_support(host);
+	err = host1x_init_syncpt_support(host, op);
 	if (err)
 		return err;
-	err = nvhost_init_t20_intr_support(host);
+	err = nvhost_init_t20_intr_support(op);
 	if (err)
 		return err;
-	host->op.nvhost_dev.get_nvhost_device = t114_get_nvhost_device;
+	op->nvhost_dev.get_nvhost_device = t114_get_nvhost_device;
+
 	return 0;
 }
diff --git a/drivers/video/tegra/host/t114/t114.h b/drivers/video/tegra/host/t114/t114.h
index f14199a07bb2..72f42ac0e81a 100644
--- a/drivers/video/tegra/host/t114/t114.h
+++ b/drivers/video/tegra/host/t114/t114.h
@@ -40,7 +40,9 @@ enum {
 #define NVWAITBASE_MSENC  (4)
 #define NVWAITBASE_TSEC   (5)
 
-int nvhost_init_t114_channel_support(struct nvhost_master *);
-int nvhost_init_t114_support(struct nvhost_master *host);
+int nvhost_init_t114_channel_support(struct nvhost_master *,
+		struct nvhost_chip_support *);
+int nvhost_init_t114_support(struct nvhost_master *host,
+		struct nvhost_chip_support *);
 
 #endif