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

gpu: ion: fill in buffer->{dev,size} before mapping new buffers

Browse source 
At least one map_dma() implementation (EXYNOS_CONTIG) assumes the fields
are filled in

Signed-off-by: Greg Hackmann <ghackmann@google.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:
Greg Hackmann 2013-12-13 14:23:45 -08:00 • committed by Greg Kroah-Hartman
parent ce1f147a2e
commit 056be39688
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/staging/android/ion/ion.c
View file

@ -151,6 +151,9 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
return ERR_PTR(ret); return ERR_PTR(ret);
} }
buffer->dev = dev;
buffer->size = len;
table = buffer->heap->ops->map_dma(buffer->heap, buffer); table = buffer->heap->ops->map_dma(buffer->heap, buffer);
if (IS_ERR_OR_NULL(table)) { if (IS_ERR_OR_NULL(table)) {
heap->ops->free(buffer); heap->ops->free(buffer);
@ -159,8 +162,6 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
} }
buffer->sg_table = table; buffer->sg_table = table;
buffer->dev = dev;
buffer->size = len;
mutex_init(&buffer->lock); mutex_init(&buffer->lock);
ion_buffer_add(dev, buffer); ion_buffer_add(dev, buffer);
return buffer; return buffer;