summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Chew <achew@nvidia.com>2012-08-24 16:25:03 -0700
committerWinnie Hsu <whsu@nvidia.com>2012-12-17 11:31:46 -0800
commit970c54cc0abc7321d3993caba54d3df3ec0bbdf2 (patch)
treed8ef240b05f1780b9896ca6772da05c3002e0c3f
parent681999b928434ecb46d379e2381adb31b83e5437 (diff)
tegra: Add nvmap_mark_global()
Add this function, to be able to set the global field of an nvmap_handle while preserving the nvmap API's encapsulation mechanisms. Change-Id: I62de773a65119722f059b114e2d0e906c7e04e83 Signed-off-by: Andrew Chew <achew@nvidia.com> Signed-off-by: Bryan Wu <pengw@nvidia.com> Reviewed-on: http://git-master/r/169834 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Winnie Hsu <whsu@nvidia.com>
-rw-r--r--drivers/video/tegra/nvmap/nvmap.c13
-rw-r--r--include/linux/nvmap.h2
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/video/tegra/nvmap/nvmap.c b/drivers/video/tegra/nvmap/nvmap.c
index a0dcf26337f8..19b821d41284 100644
--- a/drivers/video/tegra/nvmap/nvmap.c
+++ b/drivers/video/tegra/nvmap/nvmap.c
@@ -605,3 +605,16 @@ void nvmap_free(struct nvmap_client *client, struct nvmap_handle_ref *r)
nvmap_free_handle_id(client, nvmap_ref_to_id(r));
}
+
+int nvmap_mark_global(struct nvmap_client *client, struct nvmap_handle_ref *r)
+{
+ struct nvmap_handle *h;
+
+ h = nvmap_get_handle_id(client, (unsigned long)r->handle);
+ if (!h)
+ return -EINVAL;
+ r->handle->global = true;
+ nvmap_handle_put(h);
+
+ return 0;
+}
diff --git a/include/linux/nvmap.h b/include/linux/nvmap.h
index 692956b2fc4f..9cc978ec5a7f 100644
--- a/include/linux/nvmap.h
+++ b/include/linux/nvmap.h
@@ -124,6 +124,8 @@ void nvmap_unpin_handles(struct nvmap_client *client,
struct nvmap_handle_ref *nvmap_duplicate_handle_id(struct nvmap_client *client,
unsigned long id);
+int nvmap_mark_global(struct nvmap_client *client, struct nvmap_handle_ref *r);
+
struct nvmap_platform_carveout {
const char *name;
unsigned int usage_mask;