summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/ext/dev.c
diff options
context:
space:
mode:
authorRobert Morell <rmorell@nvidia.com>2011-02-22 17:15:06 -0800
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:48:12 -0800
commit5197ed5e5f11b4f77bdcf9020a01bada5db45f1a (patch)
tree5c218005ce10d6483f4834c5fbf7fbce7f01abc2 /drivers/video/tegra/dc/ext/dev.c
parentc1c9c8660b49eb0b67ae02a3e21e07fe7135232a (diff)
video: tegra: Move pin function to new util file
This will be used in forthcoming cursor support in addition to the existing overlay flipping support. bug 818525 Original-Change-Id: Ic27267deeaefad4ec803eb457a02b22c0d9a1373 Signed-off-by: Robert Morell <rmorell@nvidia.com> Reviewed-on: http://git-master/r/40517 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Rebase-Id: Rc1e18fe5248f9dfd1f9ee23184cd2c102539ca61
Diffstat (limited to 'drivers/video/tegra/dc/ext/dev.c')
-rw-r--r--drivers/video/tegra/dc/ext/dev.c52
1 files changed, 3 insertions, 49 deletions
diff --git a/drivers/video/tegra/dc/ext/dev.c b/drivers/video/tegra/dc/ext/dev.c
index b549f77222c8..2fa11d9da189 100644
--- a/drivers/video/tegra/dc/ext/dev.c
+++ b/drivers/video/tegra/dc/ext/dev.c
@@ -237,54 +237,6 @@ static void tegra_dc_ext_flip_worker(struct work_struct *work)
kfree(data);
}
-static int tegra_dc_ext_pin_window(struct tegra_dc_ext_user *user,
- struct tegra_dc_ext_flip_win *flip_win)
-{
- struct tegra_dc_ext *ext = user->ext;
- struct nvmap_handle_ref *win_dup;
- struct nvmap_handle *win_handle;
- u32 id = flip_win->attr.buff_id;
-
- if (!id) {
- flip_win->handle = NULL;
- flip_win->phys_addr = -1;
-
- return 0;
- }
-
- /*
- * Take a reference to the buffer using the user's nvmap context, to
- * make sure they have permissions to access it.
- */
- win_handle = nvmap_get_handle_id(user->nvmap, id);
- if (!win_handle)
- return -EACCES;
-
- /*
- * Duplicate the buffer's handle into the dc_ext driver's nvmap
- * context, to ensure that the handle won't be freed as long as it is
- * in use by display.
- */
- win_dup = nvmap_duplicate_handle_id(ext->nvmap, id);
-
- /* Release the reference we took in the user's context above */
- nvmap_handle_put(win_handle);
-
- if (IS_ERR(win_dup))
- return PTR_ERR(win_dup);
-
- flip_win->handle = win_dup;
-
- flip_win->phys_addr = nvmap_pin(ext->nvmap, win_dup);
- /* XXX this isn't correct for non-pointers... */
- if (IS_ERR((void *)flip_win->phys_addr)) {
- nvmap_free(ext->nvmap, win_dup);
- return PTR_ERR((void *)flip_win->phys_addr);
- }
-
- return 0;
-}
-
static int lock_windows_for_flip(struct tegra_dc_ext_user *user,
struct tegra_dc_ext_flip *args)
{
@@ -394,7 +346,9 @@ static int tegra_dc_ext_flip(struct tegra_dc_ext_user *user,
if (index < 0)
continue;
- ret = tegra_dc_ext_pin_window(user, flip_win);
+ ret = tegra_dc_ext_pin_window(user, flip_win->attr.buff_id,
+ &flip_win->handle,
+ &flip_win->phys_addr);
if (ret)
goto fail_pin;
}