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>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
index 4c2f223..410c08e 100644 (file)
--- a/drivers/staging/android/ion/ion_chunk_heap.c
+++ b/drivers/staging/android/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));
        }
@@ -177,8 +178,9 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data)
        }
        free_vm_area(vm_struct);
 
-       __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/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c
index d624dee..855f30c 100644 (file)
--- a/drivers/staging/android/ion/ion_page_pool.c
+++ b/drivers/staging/android/ion/ion_page_pool.c
@@ -37,8 +37,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/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index fedbc0d..d4f0a56 100644 (file)
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/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;