OMAP: TILER: Pin the correct # of pages to 1D areas.

We may want to pin less pages to a 1D area than the area size, when we
will pre-allocate container areas to map arbitrary 1D memory to (to
make it "physically" contiguous.)  This patch makes this work.

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

2 files changed, 25 insertions, 1 deletions

diff --git a/drivers/media/video/tiler/tcm.h b/drivers/media/video/tiler/tcm.h
index 68b0d684dd5..11f3fa9fb2d 100644
--- a/drivers/media/video/tiler/tcm.h
+++ b/drivers/media/video/tiler/tcm.h
@@ -289,6 +289,19 @@ static inline u16 __tcm_sizeof(struct tcm_area *area)
 #define tcm_aheight(area) __tcm_area_height(&(area))
 #define tcm_is_in(pt, area) __tcm_is_in(&(pt), &(area))
 
+/* limit a 1D area to the first N pages */
+static inline s32 tcm_1d_limit(struct tcm_area *a, u32 num_pg)
+{
+        if (__tcm_sizeof(a) < num_pg)
+                return -ENOMEM;
+        if (!num_pg)
+                return -EINVAL;
+
+        a->p1.x = (a->p0.x + num_pg - 1) % a->tcm->width;
+        a->p1.y = a->p0.y + ((a->p0.x + num_pg - 1) / a->tcm->width);
+        return 0;
+}
+
 /**
  * Iterate through 2D slices of a valid area. Behaves
  * syntactically as a for(;;) statement.
diff --git a/drivers/media/video/tiler/tiler-main.c b/drivers/media/video/tiler/tiler-main.c
index 55ab178af27..93f66777ff1 100644
--- a/drivers/media/video/tiler/tiler-main.c
+++ b/drivers/media/video/tiler/tiler-main.c
@@ -952,6 +952,7 @@ static struct mem_info *alloc_block_area(enum tiler_fmt fmt, u32 width,
 static s32 pin_memory(struct mem_info *mi, struct tiler_pa_info *pa)
 {
         enum tiler_fmt fmt = tiler_fmt(mi->blk.phys);
+        struct tcm_area area = mi->area;
 
         /* ensure we can pin */
         if (!tmm_can_map(tmm[fmt]))
@@ -961,11 +962,21 @@ static s32 pin_memory(struct mem_info *mi, struct tiler_pa_info *pa)
         if (pa->num_pg > tcm_sizeof(mi->area))
                 return -ENOMEM;
 
+        /* for 2D area, pages must fit exactly */
+        if (fmt != TILFMT_PAGE &&
+            pa->num_pg != tcm_sizeof(mi->area))
+                return -EINVAL;
+
         /* save pages used */
         mi->pa = *pa;
         pa->mem = NULL; /* transfered array */
 
-        return refill_pat(tmm[fmt], &mi->area, mi->pa.mem);
+        /* only refill available pages for 1D */
+        if (fmt == TILFMT_PAGE)
+                tcm_1d_limit(&area, pa->num_pg);
+        if (mi->pa.num_pg)
+                return refill_pat(tmm[fmt], &area, mi->pa.mem);
+        return 0;
 }
 
 static void free_pa(struct tiler_pa_info *pa)