1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/video/tegra/nvmap/nvmap_priv.h b/drivers/video/tegra/nvmap/nvmap_priv.h
index 781260b1d..9d668cd2e 100644
--- a/drivers/video/tegra/nvmap/nvmap_priv.h
+++ b/drivers/video/tegra/nvmap/nvmap_priv.h
@@ -174,6 +174,7 @@ struct nvmap_handle {
         bool from_va;           /* handle memory is from VA */
         u32 heap_type;          /* handle heap is allocated from */
         u32 userflags;          /* flags passed from userspace */
+        u32 userheap_mask;      /* heap_mask passed from userspace */
         void *vaddr;            /* mapping used inside kernel */
         struct list_head vmas;  /* list of all user vma's */
         atomic_t umap_count;    /* number of outstanding maps from user */
@@ -191,6 +192,9 @@ struct nvmap_handle_info {
         struct nvmap_handle *handle;
         struct list_head maps;
         struct mutex maps_lock;
+        // Allow drivers such as nvgpu to optionally store pointers to their
+        // own internal state tracking structures
+        struct list_head user_priv_list;
 };
 
 struct nvmap_tag_entry {
@@ -415,12 +419,16 @@ void nvmap_free_handle(struct nvmap_client *c, struct nvmap_handle *h);
 
 void nvmap_free_handle_fd(struct nvmap_client *c, int fd);
 
+void nvmap_dealloc_fd(struct nvmap_client *client, int fd);
+
 int nvmap_handle_remove(struct nvmap_device *dev, struct nvmap_handle *h);
 
 void nvmap_handle_add(struct nvmap_device *dev, struct nvmap_handle *h);
 
 int is_nvmap_vma(struct vm_area_struct *vma);
 
+bool dmabuf_is_nvmap(struct dma_buf *dmabuf);
+
 int nvmap_get_dmabuf_fd(struct nvmap_client *client, struct nvmap_handle *h);
 struct nvmap_handle *nvmap_handle_get_from_dmabuf_fd(
                                 struct nvmap_client *client, int fd);