openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpu: ion: remove unnecessary function from system heap 

ion_system_contig_heap buffers have an sglist, just call
ion_heap_map_user to map it.

Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Colin Cross 2013-12-13 19:26:15 -08:00 committed by Greg Kroah-Hartman
parent e61fc915fa
commit a82130f470
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/android/ion/ion_system_heap.c
View File

@ -422,17 +422,6 @@ void ion_system_contig_heap_unmap_dma(struct ion_heap *heap,
kfree(buffer->sg_table); kfree(buffer->sg_table);
} }
int ion_system_contig_heap_map_user(struct ion_heap *heap,
struct ion_buffer *buffer,
struct vm_area_struct *vma)
{
unsigned long pfn = page_to_pfn(virt_to_page(buffer->priv_virt));
return remap_pfn_range(vma, vma->vm_start, pfn + vma->vm_pgoff,
vma->vm_end - vma->vm_start,
vma->vm_page_prot);
}
static struct ion_heap_ops kmalloc_ops = { static struct ion_heap_ops kmalloc_ops = {
.allocate = ion_system_contig_heap_allocate, .allocate = ion_system_contig_heap_allocate,
.free = ion_system_contig_heap_free, .free = ion_system_contig_heap_free,
@ -441,7 +430,7 @@ static struct ion_heap_ops kmalloc_ops = {
.unmap_dma = ion_system_contig_heap_unmap_dma, .unmap_dma = ion_system_contig_heap_unmap_dma,
.map_kernel = ion_heap_map_kernel, .map_kernel = ion_heap_map_kernel,
.unmap_kernel = ion_heap_unmap_kernel, .unmap_kernel = ion_heap_unmap_kernel,
.map_user = ion_system_contig_heap_map_user, .map_user = ion_heap_map_user,
}; };
struct ion_heap *ion_system_contig_heap_create(struct ion_platform_heap *unused) struct ion_heap *ion_system_contig_heap_create(struct ion_platform_heap *unused)