gpu: ion: __dma_page_cpu_to_dev -> arm_dma_ops.sync_single_for_device hack

Signed-off-by: Arve Hjønnevåg <arve@android.com>

3 files changed, 13 insertions, 8 deletions

diff --git a/drivers/gpu/ion/ion_chunk_heap.c b/drivers/gpu/ion/ion_chunk_heap.c
index 687af63b9f5..3e77de59223 100644
--- a/drivers/gpu/ion/ion_chunk_heap.c
+++ b/drivers/gpu/ion/ion_chunk_heap.c
@@ -105,8 +105,9 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer)
 
         for_each_sg(table->sgl, sg, table->nents, i) {
                 if (ion_buffer_cached(buffer))
-                        __dma_page_cpu_to_dev(sg_page(sg), 0, sg_dma_len(sg),
-                                              DMA_BIDIRECTIONAL);
+                        arm_dma_ops.sync_single_for_device(NULL,
+                                pfn_to_dma(NULL, page_to_pfn(sg_page(sg))),
+                                sg_dma_len(sg), DMA_BIDIRECTIONAL);
                 gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),
                               sg_dma_len(sg));
         }
@@ -155,8 +156,9 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data)
         chunk_heap->base = heap_data->base;
         chunk_heap->size = heap_data->size;
         chunk_heap->allocated = 0;
-        __dma_page_cpu_to_dev(phys_to_page(heap_data->base), 0, heap_data->size,
-                              DMA_BIDIRECTIONAL);
+        arm_dma_ops.sync_single_for_device(NULL,
+                pfn_to_dma(NULL, page_to_pfn(phys_to_page(heap_data->base))),
+                heap_data->size, DMA_BIDIRECTIONAL);
         gen_pool_add(chunk_heap->pool, chunk_heap->base, heap_data->size, -1);
         chunk_heap->heap.ops = &chunk_heap_ops;
         chunk_heap->heap.type = ION_HEAP_TYPE_CHUNK;
diff --git a/drivers/gpu/ion/ion_page_pool.c b/drivers/gpu/ion/ion_page_pool.c
index cd57b30e875..7158d9e5560 100644
--- a/drivers/gpu/ion/ion_page_pool.c
+++ b/drivers/gpu/ion/ion_page_pool.c
@@ -43,8 +43,10 @@ static void *ion_page_pool_alloc_pages(struct ion_page_pool *pool)
         /* this is only being used to flush the page for dma,
            this api is not really suitable for calling from a driver
            but no better way to flush a page for dma exist at this time */
-        __dma_page_cpu_to_dev(page, 0, PAGE_SIZE << pool->order,
-                              DMA_BIDIRECTIONAL);
+        arm_dma_ops.sync_single_for_device(NULL,
+                                           pfn_to_dma(NULL, page_to_pfn(page)),
+                                           PAGE_SIZE << pool->order,
+                                           DMA_BIDIRECTIONAL);
         return page;
 }
 
diff --git a/drivers/gpu/ion/ion_system_heap.c b/drivers/gpu/ion/ion_system_heap.c
index c1061a801a4..1e06bd97831 100644
--- a/drivers/gpu/ion/ion_system_heap.c
+++ b/drivers/gpu/ion/ion_system_heap.c
@@ -78,8 +78,9 @@ static struct page *alloc_buffer_page(struct ion_system_heap *heap,
                 page = alloc_pages(gfp_flags, order);
                 if (!page)
                         return 0;
-                __dma_page_cpu_to_dev(page, 0, PAGE_SIZE << order,
-                                      DMA_BIDIRECTIONAL);
+                arm_dma_ops.sync_single_for_device(NULL,
+                        pfn_to_dma(NULL, page_to_pfn(page)),
+                        PAGE_SIZE << order, DMA_BIDIRECTIONAL);
         }
         if (!page)
                 return 0;