gpu: ion: omap: re-populate flags parameters into buffer

Since the flags function param of omap_tiler_heap_allocate
is used to pass the omap_tiler_info struct, pass the
actual flags param from the client inside omap_tiler_info
struct and re-populate it into the buffer struct.

Change-Id: I06f3b6125c2760f7b4bcc7f174458139d80ec000
Signed-off-by: Sundar Raman <a0393242@ti.com>

diff --git a/drivers/gpu/ion/omap/omap_tiler_heap.c b/drivers/gpu/ion/omap/omap_tiler_heap.c
index af4988ad2121cd5d4fd40e83e9c92c6248bcfa88..c3ac4f169c3dcb347a33fdd647e6e2661eeaa6b5 100644 (file)
--- a/drivers/gpu/ion/omap/omap_tiler_heap.c
+++ b/drivers/gpu/ion/omap/omap_tiler_heap.c
@@ -55,6 +55,7 @@ struct omap_tiler_info {
        u32 vsize;                      /* virtual stride of buffer */
        u32 vstride;                    /* virtual size of buffer */
        u32 phys_stride;                        /* Physical stride of the buffer */
+       u32 flags;                      /* Flags specifying cached or not */
 };
 
 static int omap_tiler_heap_allocate(struct ion_heap *heap,
@@ -62,6 +63,8 @@ static int omap_tiler_heap_allocate(struct ion_heap *heap,
                                    unsigned long size, unsigned long align,
                                    unsigned long flags)
 {
+       struct omap_tiler_info *info;
+
        /* This means the buffer is already allocated and populated, we're getting here because
         * of dummy handle creation, so simply return*/ 
        if (size == 0) {
@@ -70,7 +73,12 @@ static int omap_tiler_heap_allocate(struct ion_heap *heap,
                  * This will be used later on inside map_dma function to create
                  * the sg list for tiler buffer
                  */
-               buffer->priv_virt = (void *)flags;
+               info = (struct omap_tiler_info *) flags;
+               if (!info)
+                       pr_err("%s: flags argument is not setup\n", __func__);
+               buffer->priv_virt = info;
+               /* Re-update correct flags inside buffer */
+               buffer->flags = info->flags;
                return 0;
        }
 
@@ -174,6 +182,7 @@ int omap_tiler_alloc(struct ion_heap *heap,
        info->phys_addrs = (u32 *)(info + 1);
        info->tiler_addrs = info->phys_addrs + n_phys_pages;
        info->fmt = data->fmt;
+       info->flags = data->flags;
 
        /* Allocate tiler space
           FIXME: we only support PAGE_SIZE alignment right now. */