summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorScott Williams <scwilliams@nvidia.com>2012-03-21 12:41:05 -0700
committerVarun Wadekar <vwadekar@nvidia.com>2012-06-26 11:31:48 +0530
commitc2d93d44d5b8635a88dcd46d8b1f6ee4b0286af5 (patch)
treed4ce2e10b09f4d7ec9673f790a5b9f1290311f04 /drivers/video
parentca5700079918a863398d2bbe5769b6127a2dac62 (diff)
video: tegra: Update Tegra11 modules for nvmap_alloc()
Update GR3D, TSEC, and MSENC to new nvmap_alloc() calling conventions. Change-Id: If0f85820d1edf2bd2a2b2acb7dd68bdebf116bb2 Signed-off-by: Scott Williams <scwilliams@nvidia.com> Reviewed-on: http://git-master/r/91604 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/tegra/host/gr3d/gr3d_t114.c2
-rw-r--r--drivers/video/tegra/host/msenc/msenc.c2
-rw-r--r--drivers/video/tegra/host/tsec/tsec.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/tegra/host/gr3d/gr3d_t114.c b/drivers/video/tegra/host/gr3d/gr3d_t114.c
index 3351d5f5ca93..4a1e99f9bab4 100644
--- a/drivers/video/tegra/host/gr3d/gr3d_t114.c
+++ b/drivers/video/tegra/host/gr3d/gr3d_t114.c
@@ -320,7 +320,7 @@ struct nvhost_hwctx_handler * __init t114_nvhost_3dctx_handler_init(
setup_save(p, NULL);
p->save_buf = nvmap_alloc(nvmap, p->save_size * 4, 32,
- NVMAP_HANDLE_WRITE_COMBINE);
+ NVMAP_HANDLE_WRITE_COMBINE, 0);
if (IS_ERR(p->save_buf)) {
p->save_buf = NULL;
return NULL;
diff --git a/drivers/video/tegra/host/msenc/msenc.c b/drivers/video/tegra/host/msenc/msenc.c
index 870d5bde7208..d80589f1afcb 100644
--- a/drivers/video/tegra/host/msenc/msenc.c
+++ b/drivers/video/tegra/host/msenc/msenc.c
@@ -228,7 +228,7 @@ int msenc_read_ucode(struct nvhost_device *dev, const char *fw_name)
/* allocate pages for ucode */
m->mem_r = nvmap_alloc(nvhost_get_host(dev)->nvmap,
roundup(ucode_fw->size, PAGE_SIZE),
- PAGE_SIZE, NVMAP_HANDLE_UNCACHEABLE);
+ PAGE_SIZE, NVMAP_HANDLE_UNCACHEABLE, 0);
if (IS_ERR_OR_NULL(m->mem_r)) {
dev_err(&dev->dev, "nvmap alloc failed");
err = -ENOMEM;
diff --git a/drivers/video/tegra/host/tsec/tsec.c b/drivers/video/tegra/host/tsec/tsec.c
index 7f1193b9947b..37739276bbca 100644
--- a/drivers/video/tegra/host/tsec/tsec.c
+++ b/drivers/video/tegra/host/tsec/tsec.c
@@ -228,7 +228,7 @@ int tsec_read_ucode(struct nvhost_device *dev, const char *fw_name)
/* allocate pages for ucode */
m->mem_r = nvmap_alloc(nvhost_get_host(dev)->nvmap,
roundup(ucode_fw->size, PAGE_SIZE),
- PAGE_SIZE, NVMAP_HANDLE_UNCACHEABLE);
+ PAGE_SIZE, NVMAP_HANDLE_UNCACHEABLE, 0);
if (IS_ERR_OR_NULL(m->mem_r)) {
dev_err(&dev->dev, "nvmap alloc failed");
err = -ENOMEM;