TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gpu: ion: set dma_address for contiguous heaps in ion_map_dma()

Browse Source 
Ion carveout and content protect heap buffers do not
have a struct page associated with them. Thus
sg_phys() will not work reliably on these buffers,
so set dma_address on their scatterlists.

CRs-Fixed: 345257
Change-Id: Ifdad5ce497de170f47b4ee2f7a93563a5cbe1a96
Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
This commit is contained in:
Jeremy Gebben
2012-03-23 10:25:23 -06:00
committed by Stephen Boyd
parent 2c60140ed2
commit 6fcef5e780
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/ion/ion_carveout_heap.c
View File

@@ -111,10 +111,6 @@ struct sg_table *ion_carveout_heap_map_dma(struct ion_heap *heap,
{ {
struct sg_table *table; struct sg_table *table;
int ret; int ret;
struct page *page = phys_to_page(buffer->priv_phys);
if (page == NULL)
return NULL;
table = kzalloc(sizeof(struct sg_table), GFP_KERNEL); table = kzalloc(sizeof(struct sg_table), GFP_KERNEL);
if (!table) if (!table)
@@ -123,7 +119,10 @@ struct sg_table *ion_carveout_heap_map_dma(struct ion_heap *heap,
ret = sg_alloc_table(table, 1, GFP_KERNEL); ret = sg_alloc_table(table, 1, GFP_KERNEL);
if (ret) if (ret)
goto err0; goto err0;
sg_set_page(sglist, page, buffer->size, 0);
table->sgl->length = buffer->size;
table->sgl->offset = 0;
table->sgl->dma_address = buffer->priv_phys;
return table; return table;

9
drivers/gpu/ion/ion_cp_heap.c
View File

@@ -303,10 +303,6 @@ struct sg_table *ion_cp_heap_create_sg_table(struct ion_buffer *buffer)
{ {
struct sg_table *table; struct sg_table *table;
int ret; int ret;
struct page *page = phys_to_page(buffer->priv_phys);
if (page == NULL)
return NULL;
table = kzalloc(sizeof(struct sg_table), GFP_KERNEL); table = kzalloc(sizeof(struct sg_table), GFP_KERNEL);
if (!table) if (!table)
@@ -315,7 +311,10 @@ struct sg_table *ion_cp_heap_create_sg_table(struct ion_buffer *buffer)
ret = sg_alloc_table(table, 1, GFP_KERNEL); ret = sg_alloc_table(table, 1, GFP_KERNEL);
if (ret) if (ret)
goto err0; goto err0;
sg_set_page(sglist, page, buffer->size, 0);
table->sgl->length = buffer->size;
table->sgl->offset = 0;
table->sgl->dma_address = buffer->priv_phys;
return table; return table;
err0: err0: