MALI: rockchip: not to use sg_dma_len.

When CONFIG_NEED_SG_DMA_LENGTH is enabled,
sg_dma_len is defined as follow :
"#define sg_dma_len(sg)             ((sg)->dma_length)"
But, dma_length is not used by the framework indeed.

Change-Id: Ibfd3223b38b96701f839cdc91207a49f20789fec
Signed-off-by: chenzhen <chenzhen@rock-chips.com>

diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd.c b/drivers/gpu/arm/midgard/mali_kbase_jd.c
index 7e5da2944304aca11cc2ea4f9afabc85fcc1699f..0938d8ecd29dd5ae0464fb6742378d8a561de202 100644 (file)
--- a/drivers/gpu/arm/midgard/mali_kbase_jd.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_jd.c
@@ -315,10 +315,13 @@ static void kbase_jd_user_buf_unmap(struct kbase_context *kctx,
        alloc->nents = 0;
 }
 
+/* not to use sg_dma_len. */
+#define MALI_SG_DMA_LEN(sg)            ((sg)->length)
+
 #ifdef CONFIG_DMA_SHARED_BUFFER
 static int kbase_jd_umm_map(struct kbase_context *kctx, struct kbase_va_region *reg)
 {
-       struct sg_table *sgt;
+       struct sg_table *sgt;   /* scatterlist_table */
        struct scatterlist *s;
        int i;
        phys_addr_t *pa;
@@ -343,11 +346,17 @@ static int kbase_jd_umm_map(struct kbase_context *kctx, struct kbase_va_region *
 
        for_each_sg(sgt->sgl, s, sgt->nents, i) {
                int j;
-               size_t pages = PFN_UP(sg_dma_len(s));
+               /* size_t pages = PFN_UP(sg_dma_len(s)); */
+               size_t pages = PFN_UP(MALI_SG_DMA_LEN(s));
 
+               WARN_ONCE(MALI_SG_DMA_LEN(s) & (PAGE_SIZE-1),
+               "MALI_SG_DMA_LEN(s)=%u is not a multiple of PAGE_SIZE\n",
+               MALI_SG_DMA_LEN(s));
+               /*
                WARN_ONCE(sg_dma_len(s) & (PAGE_SIZE-1),
                "sg_dma_len(s)=%u is not a multiple of PAGE_SIZE\n",
                sg_dma_len(s));
+               */
 
                WARN_ONCE(sg_dma_address(s) & (PAGE_SIZE-1),
                "sg_dma_address(s)=%llx is not aligned to PAGE_SIZE\n",
@@ -355,14 +364,17 @@ static int kbase_jd_umm_map(struct kbase_context *kctx, struct kbase_va_region *
 
                for (j = 0; (j < pages) && (count < reg->nr_pages); j++, count++)
                        *pa++ = sg_dma_address(s) + (j << PAGE_SHIFT);
+
                WARN_ONCE(j < pages,
                "sg list from dma_buf_map_attachment > dma_buf->size=%zu\n",
                alloc->imported.umm.dma_buf->size);
        }
 
        if (WARN_ONCE(count < reg->nr_pages,
-                       "sg list from dma_buf_map_attachment < dma_buf->size=%zu\n",
-                       alloc->imported.umm.dma_buf->size)) {
+                       "sg list from dma_buf_map_attachment < dma_buf->size=%zu, count : %lu, reg->nr_pages : %lu. \n",
+                       alloc->imported.umm.dma_buf->size,
+                       count,
+                       reg->nr_pages)) {
                err = -EINVAL;
                goto out;
        }