[PATCH] staging: android: ion: fix ion_dma_buf_attach signatur

Christian König ckoenig.leichtzumerken at gmail.com
Thu Jun 21 10:02:16 UTC 2018


Am 21.06.2018 um 08:34 schrieb Daniel Vetter:
> On Wed, Jun 20, 2018 at 08:52:19PM +0200, Christian König wrote:
>> Fixup for "dma_buf: remove device parameter from attach callback v2".
>>
>> I missed this driver, sorry for the noise. Patch is not even compile
>> tested.
>>
>> Signed-off-by: Christian König <christian.koenig at amd.com>
> Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
>
> Also
>
> Fixes: f664a5269542 ("dma-buf: remove kmap_atomic interface")

Actually that one was caused by the other patch I pushed, so I didn't 
added this tag.

> just for the record. Please push asap, double check that ion is enabled
> somewhere in one of the 3 drm-misc defconfigs, and reply to Padovan's
> drm-misc pull request that he needs to redo because of this fumble.

Pushed and also enabled ION on my own test build now.

Sorry for the noise,
Christian.

>
> Cheers, Daniel
>> ---
>>   drivers/staging/android/ion/ion.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
>> index a5220445b5e8..3d4d35558937 100644
>> --- a/drivers/staging/android/ion/ion.c
>> +++ b/drivers/staging/android/ion/ion.c
>> @@ -201,7 +201,7 @@ struct ion_dma_buf_attachment {
>>   	struct list_head list;
>>   };
>>   
>> -static int ion_dma_buf_attach(struct dma_buf *dmabuf, struct device *dev,
>> +static int ion_dma_buf_attach(struct dma_buf *dmabuf,
>>   			      struct dma_buf_attachment *attachment)
>>   {
>>   	struct ion_dma_buf_attachment *a;
>> @@ -219,7 +219,7 @@ static int ion_dma_buf_attach(struct dma_buf *dmabuf, struct device *dev,
>>   	}
>>   
>>   	a->table = table;
>> -	a->dev = dev;
>> +	a->dev = attachment->dev;
>>   	INIT_LIST_HEAD(&a->list);
>>   
>>   	attachment->priv = a;
>> -- 
>> 2.14.1
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel



More information about the dri-devel mailing list