summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/host/t20/channel_t20.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2011-08-17 14:36:51 +0300
committerVarun Colbert <vcolbert@nvidia.com>2011-09-07 17:35:16 -0700
commit0ef5f2d4d94464b8d5562327c9cf5b56fe93fff5 (patch)
treee060c8b05e402657fb85628bc60687681c1333e5 /drivers/video/tegra/host/t20/channel_t20.c
parentde7fd8768b32da66eaf4eaf58473c65f7a76808d (diff)
tegra: nvhost: Retrieve phys address from nvmap
Debug code used to rely on being able to calculate the base address of a pinned page by masking it. Now we always retrieve the physical address from nvmap and find the correct command buffer using that. Bug 840976 Change-Id: I6e370df47480c2968671194273bdd3c431afeb09 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/48105 Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com> Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/host/t20/channel_t20.c')
-rw-r--r--drivers/video/tegra/host/t20/channel_t20.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/tegra/host/t20/channel_t20.c b/drivers/video/tegra/host/t20/channel_t20.c
index 7a3e4895e3b1..386682b6f0ed 100644
--- a/drivers/video/tegra/host/t20/channel_t20.c
+++ b/drivers/video/tegra/host/t20/channel_t20.c
@@ -239,6 +239,7 @@ static int t20_channel_submit(struct nvhost_channel *channel,
/* gather restore buffer */
if (need_restore)
nvhost_cdma_push_gather(&channel->cdma,
+ channel->dev->nvmap,
nvmap_ref_to_handle(channel->cur_ctx->restore),
nvhost_opcode_gather(channel->cur_ctx->restore_size),
channel->cur_ctx->restore_phys);
@@ -279,6 +280,7 @@ static int t20_channel_submit(struct nvhost_channel *channel,
int i = 0;
for ( ; i < gather_end-gather; i += 2) {
nvhost_cdma_push_gather(&channel->cdma,
+ user_nvmap,
unpins[i/2],
nvhost_opcode_gather(gather[i]),
gather[i+1]);