summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/host/mpe
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2012-01-02 11:14:26 +0200
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-01-24 10:50:35 -0800
commit3a74a9a1c0f6337f5c970de4d890f8f6841dc12f (patch)
treeaea0ca0cac1ec2760ec289fd6b85643db453b3ee /drivers/video/tegra/host/mpe
parent5665ef5e26fa8e3fd802153af908a39ea64c55c7 (diff)
video: tegra: host: Access nvhost_master via drvdata
Use standard drvdata interface for storing and accessing nvhost_master. Reviewed-on: http://git-master/r/72846 Change-Id: I191987c8f6d313a6ede9b59f723269cb6a197e8a Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/76815 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/video/tegra/host/mpe')
-rw-r--r--drivers/video/tegra/host/mpe/mpe.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/tegra/host/mpe/mpe.c b/drivers/video/tegra/host/mpe/mpe.c
index 5d497221a671..471702ea48fb 100644
--- a/drivers/video/tegra/host/mpe/mpe.c
+++ b/drivers/video/tegra/host/mpe/mpe.c
@@ -439,7 +439,7 @@ static u32 *save_ram(u32 *ptr, unsigned int *pending,
static struct nvhost_hwctx *ctxmpe_alloc(struct nvhost_channel *ch)
{
- struct nvmap_client *nvmap = ch->dev->host->nvmap;
+ struct nvmap_client *nvmap = nvhost_get_host(ch->dev)->nvmap;
struct nvhost_hwctx *ctx;
ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
@@ -482,7 +482,7 @@ static void ctxmpe_get(struct nvhost_hwctx *ctx)
static void ctxmpe_free(struct kref *ref)
{
struct nvhost_hwctx *ctx = container_of(ref, struct nvhost_hwctx, ref);
- struct nvmap_client *nvmap = ctx->channel->dev->host->nvmap;
+ struct nvmap_client *nvmap = nvhost_get_host(ctx->channel->dev)->nvmap;
if (ctx->restore_virt)
nvmap_munmap(ctx->restore, ctx->restore_virt);
@@ -522,7 +522,8 @@ static void ctxmpe_save_service(struct nvhost_hwctx *ctx)
IRFR_RAM_SIZE, IRFR_RAM_READ_CMD, IRFR_RAM_READ_DATA);
wmb();
- nvhost_syncpt_cpu_incr(&ctx->channel->dev->host->syncpt, NVSYNCPT_MPE);
+ nvhost_syncpt_cpu_incr(&nvhost_get_host(ctx->channel->dev)->syncpt,
+ NVSYNCPT_MPE);
}
int __init nvhost_mpe_ctxhandler_init(struct nvhost_hwctx_handler *h)
@@ -532,7 +533,7 @@ int __init nvhost_mpe_ctxhandler_init(struct nvhost_hwctx_handler *h)
u32 *save_ptr;
ch = container_of(h, struct nvhost_channel, ctxhandler);
- nvmap = ch->dev->host->nvmap;
+ nvmap = nvhost_get_host(ch->dev)->nvmap;
setup_save(NULL);