OMAP: TILER: Expose 1D mapping/unmapping operations

Expose kernel methods to map a set of physical pages into TILER 1D
(reserve area + pin memory), and free those areas.

Signed-off-by: Lajos Molnar <molnar@ti.com>

4 files changed, 45 insertions, 15 deletions

diff --git a/arch/arm/mach-omap2/include/mach/tiler.h b/arch/arm/mach-omap2/include/mach/tiler.h
index aef6dab0222..20a1b362459 100644
--- a/arch/arm/mach-omap2/include/mach/tiler.h
+++ b/arch/arm/mach-omap2/include/mach/tiler.h
@@ -354,6 +354,30 @@ s32 tilview_rotate(struct tiler_view_t *view, s32 rotation);
 s32 tilview_flip(struct tiler_view_t *view, bool flip_x, bool flip_y);
 
 /*
+ * -------------------- TILER hooks for ION/HWC migration --------------------
+ */
+
+/* type of tiler memory */
+enum tiler_memtype {
+        TILER_MEM_ALLOCED,              /* tiler allocated the memory */
+        TILER_MEM_GOT_PAGES,            /* tiler used get_user_pages */
+        TILER_MEM_USING,                /* tiler is using the pages */
+};
+
+/* physical pages to pin - mem must be kmalloced */
+struct tiler_pa_info {
+        u32 num_pg;                     /* number of pages in page-list */
+        u32 *mem;                       /* list of phys page addresses */
+        enum tiler_memtype memtype;     /* how we got physical pages */
+};
+
+typedef struct mem_info *tiler_blk_handle;
+
+/* NOTE: this will take ownership pa->mem (will free it) */
+tiler_blk_handle tiler_map_1d_block(struct tiler_pa_info *pa);
+void tiler_free_block(tiler_blk_handle block);
+
+/*
  * ---------------------------- IOCTL Definitions ----------------------------
  */
 
diff --git a/drivers/media/video/tiler/_tiler.h b/drivers/media/video/tiler/_tiler.h
index 372444c4d45..742b31596d7 100644
--- a/drivers/media/video/tiler/_tiler.h
+++ b/drivers/media/video/tiler/_tiler.h
@@ -57,20 +57,6 @@ struct area_info {
         struct gid_info *gi;            /* link to parent, if still alive */
 };
 
-/* type of tiler memory */
-enum tiler_memtype {
-        TILER_MEM_ALLOCED,              /* tiler allocated the memory */
-        TILER_MEM_GOT_PAGES,            /* tiler used get_user_pages */
-        TILER_MEM_USING,                /* tiler is using the pages */
-};
-
-/* physical pages to pin */
-struct tiler_pa_info {
-        u32 num_pg;                     /* number of pages in page-list */
-        u32 *mem;                       /* list of phys page addresses */
-        enum tiler_memtype memtype;     /* how we got physical pages */
-};
-
 /* info for a block */
 struct mem_info {
         struct list_head global;        /* reserved / global blocks */
@@ -156,4 +142,6 @@ void tiler_iface_init(struct tiler_ops *tiler);
 void tiler_geom_init(struct tiler_ops *tiler);
 void tiler_reserve_init(struct tiler_ops *tiler);
 
+struct process_info *__get_pi(pid_t pid, bool kernel);
+
 #endif
diff --git a/drivers/media/video/tiler/tiler-iface.c b/drivers/media/video/tiler/tiler-iface.c
index eb396c58c81..1c4894a8139 100644
--- a/drivers/media/video/tiler/tiler-iface.c
+++ b/drivers/media/video/tiler/tiler-iface.c
@@ -183,7 +183,7 @@ static void _m_unregister_buf(struct __buf_info *_b)
  */
 
 /* get process info, and increment refs for device tracking */
-static struct process_info *__get_pi(pid_t pid, bool kernel)
+struct process_info *__get_pi(pid_t pid, bool kernel)
 {
         struct process_info *pi;
 
diff --git a/drivers/media/video/tiler/tiler-main.c b/drivers/media/video/tiler/tiler-main.c
index 93f66777ff1..c6e729d3c57 100644
--- a/drivers/media/video/tiler/tiler-main.c
+++ b/drivers/media/video/tiler/tiler-main.c
@@ -1360,6 +1360,24 @@ static void __exit tiler_exit(void)
         class_destroy(tilerdev_class);
 }
 
+tiler_blk_handle tiler_map_1d_block(struct tiler_pa_info *pa)
+{
+        struct mem_info *mi = NULL;
+        struct tiler_pa_info *pa_tmp = kmemdup(pa, sizeof(*pa), GFP_KERNEL);
+        s32 res = map_any_block(TILFMT_PAGE, pa->num_pg << PAGE_SHIFT, 1, 0, 0,
+                                                __get_pi(0, true), &mi, pa_tmp);
+        return res ? ERR_PTR(res) : mi;
+}
+EXPORT_SYMBOL(tiler_map_1d_block);
+
+void tiler_free_block(tiler_blk_handle block)
+{
+        mutex_lock(&mtx);
+        _m_try_free(block);
+        mutex_unlock(&mtx);
+}
+EXPORT_SYMBOL(tiler_free_block);
+
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Lajos Molnar <molnar@ti.com>");
 MODULE_AUTHOR("David Sin <davidsin@ti.com>");