evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpu: ion: Switch to using kmalloc rather than kmap during allocation

Browse source 
Previously, metadata was stored in the allocated pages themselves
during allocation.  However the system can only have a limited
number of kmapped pages.  A very large allocation might exceed
this limit.

Signed-off-by: Rebecca Schultz Zavin <rebecca@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>
This commit is contained in:
Rebecca Schultz Zavin 2013-12-13 14:23:59 -08:00 • committed by Greg Kroah-Hartman
parent b82302438b
commit 708f0cac89
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/android/ion/ion_system_heap.c
View file

@ -46,7 +46,7 @@ static struct page_info *alloc_largest_available(unsigned long size)
if (!page) if (!page)
continue; continue;
split_page(page, orders[i]); split_page(page, orders[i]);
info = kmap(page); info = kmalloc(sizeof(struct page_info *), GFP_KERNEL);
info->page = page; info->page = page;
info->order = orders[i]; info->order = orders[i];
return info; return info;
@ -93,7 +93,7 @@ static int ion_system_heap_allocate(struct ion_heap *heap,
} }
list_del(&info->list); list_del(&info->list);
memset(info, 0, sizeof(struct page_info)); memset(info, 0, sizeof(struct page_info));
kunmap(page); kfree(info);
} }
dma_sync_sg_for_device(NULL, table->sgl, table->nents, dma_sync_sg_for_device(NULL, table->sgl, table->nents,
@ -107,7 +107,7 @@ err:
list_for_each_entry(info, &pages, list) { list_for_each_entry(info, &pages, list) {
for (i = 0; i < (1 << info->order); i++) for (i = 0; i < (1 << info->order); i++)
__free_page(info->page + i); __free_page(info->page + i);
kunmap(info->page); kfree(info);
} }
return -ENOMEM; return -ENOMEM;
} }