Commit 8fae8312 authored by Rebecca Schultz Zavin's avatar Rebecca Schultz Zavin Committed by Greg Kroah-Hartman

gpu: ion: Don't flush allocatoins that come from the page pools

Signed-off-by: default avatarRebecca Schultz Zavin <rebecca@android.com>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31b9432b
...@@ -76,9 +76,14 @@ static struct page *alloc_buffer_page(struct ion_system_heap *heap, ...@@ -76,9 +76,14 @@ static struct page *alloc_buffer_page(struct ion_system_heap *heap,
if (order > 4) if (order > 4)
gfp_flags = high_order_gfp_flags; gfp_flags = high_order_gfp_flags;
page = alloc_pages(gfp_flags, order); page = alloc_pages(gfp_flags, order);
if (!page)
return 0;
__dma_page_cpu_to_dev(page, 0, PAGE_SIZE << order,
DMA_BIDIRECTIONAL);
} }
if (!page) if (!page)
return 0; return 0;
if (split_pages) if (split_pages)
split_page(page, order); split_page(page, order);
return page; return page;
...@@ -201,9 +206,6 @@ static int ion_system_heap_allocate(struct ion_heap *heap, ...@@ -201,9 +206,6 @@ static int ion_system_heap_allocate(struct ion_heap *heap,
kfree(info); kfree(info);
} }
dma_sync_sg_for_device(NULL, table->sgl, table->nents,
DMA_BIDIRECTIONAL);
buffer->priv_virt = table; buffer->priv_virt = table;
return 0; return 0;
err1: err1:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment