Commit 98d5d5f8 authored by Rebecca Schultz Zavin's avatar Rebecca Schultz Zavin Committed by Greg Kroah-Hartman

gpu: ion: use vmalloc to allocate page array to map kernel

When ion_map_kernel is execute the system must allocate
an array large enough to hold a pointer to each page in
the buffer.  If the buffer is very large and the system
memory has become very fragmented, there may not be
sufficient high order allocations available from kmalloc.
Use vmalloc instead.
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 b0599c01
...@@ -174,10 +174,12 @@ void *ion_system_heap_map_kernel(struct ion_heap *heap, ...@@ -174,10 +174,12 @@ void *ion_system_heap_map_kernel(struct ion_heap *heap,
pgprot_t pgprot; pgprot_t pgprot;
struct sg_table *table = buffer->priv_virt; struct sg_table *table = buffer->priv_virt;
int npages = PAGE_ALIGN(buffer->size) / PAGE_SIZE; int npages = PAGE_ALIGN(buffer->size) / PAGE_SIZE;
struct page **pages = kzalloc(sizeof(struct page *) * npages, struct page **pages = vmalloc(sizeof(struct page *) * npages);
GFP_KERNEL);
struct page **tmp = pages; struct page **tmp = pages;
if (!pages)
return 0;
if (buffer->flags & ION_FLAG_CACHED) if (buffer->flags & ION_FLAG_CACHED)
pgprot = PAGE_KERNEL; pgprot = PAGE_KERNEL;
else else
...@@ -192,7 +194,7 @@ void *ion_system_heap_map_kernel(struct ion_heap *heap, ...@@ -192,7 +194,7 @@ void *ion_system_heap_map_kernel(struct ion_heap *heap,
} }
} }
vaddr = vmap(pages, npages, VM_MAP, pgprot); vaddr = vmap(pages, npages, VM_MAP, pgprot);
kfree(pages); vfree(pages);
return vaddr; return vaddr;
} }
......
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