On 13/08/18 16:50, Mauro Carvalho Chehab wrote:
> Em Sat, 4 Aug 2018 14:45:17 +0200
> Hans Verkuil <hverkuil@xxxxxxxxx> escreveu:
>
>> From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
>>
>> Add a new helper function to tell if a request object is a buffer.
>>
>> Add a new helper function that returns true if a media_request
>> contains at least one buffer.
>>
>> Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
>> ---
>> .../media/common/videobuf2/videobuf2-core.c | 24 +++++++++++++++++++
>> include/media/videobuf2-core.h | 15 ++++++++++++
>> 2 files changed, 39 insertions(+)
>>
>> diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
>> index 3e6db7d30989..f8af7add35ab 100644
>> --- a/drivers/media/common/videobuf2/videobuf2-core.c
>> +++ b/drivers/media/common/videobuf2/videobuf2-core.c
>> @@ -1362,6 +1362,30 @@ static const struct media_request_object_ops vb2_core_req_ops = {
>> .release = vb2_req_release,
>> };
>>
>> +bool vb2_request_object_is_buffer(struct media_request_object *obj)
>> +{
>> + return obj->ops == &vb2_core_req_ops;
>> +}
>> +EXPORT_SYMBOL_GPL(vb2_request_object_is_buffer);
>> +
>> +bool vb2_request_has_buffers(struct media_request *req)
>> +{
>> + struct media_request_object *obj;
>> + unsigned long flags;
>> + bool has_buffers = false;
>> +
>> + spin_lock_irqsave(&req->lock, flags);
>> + list_for_each_entry(obj, &req->objects, list) {
>> + if (vb2_request_object_is_buffer(obj)) {
>> + has_buffers = true;
>> + break;
>> + }
>> + }
>> + spin_unlock_irqrestore(&req->lock, flags);
>> + return has_buffers;
>> +}
>> +EXPORT_SYMBOL_GPL(vb2_request_has_buffers);
>> +
>> int vb2_core_prepare_buf(struct vb2_queue *q, unsigned int index, void *pb)
>> {
>> struct vb2_buffer *vb;
>> diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
>> index 8a8d7732d182..cad712403d14 100644
>> --- a/include/media/videobuf2-core.h
>> +++ b/include/media/videobuf2-core.h
>> @@ -1168,4 +1168,19 @@ bool vb2_buffer_in_use(struct vb2_queue *q, struct vb2_buffer *vb);
>> */
>> int vb2_verify_memory_type(struct vb2_queue *q,
>> enum vb2_memory memory, unsigned int type);
>> +
>> +/**
>> + * vb2_request_object_is_buffer() - return true if the object is a buffer
>> + *
>> + * @obj: the request object.
>
> It should be mentioned that it should be called with req->lock locked.
No, it doesn't.
All it does is:
bool vb2_request_object_is_buffer(struct media_request_object *obj)
{
return obj->ops == &vb2_core_req_ops;
}
EXPORT_SYMBOL_GPL(vb2_request_object_is_buffer);
That test doesn't require req->lock to be locked.
Regards,
Hans
>
> With such change:
>
> Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@xxxxxxxxxx>
>
>> + */
>> +bool vb2_request_object_is_buffer(struct media_request_object *obj);
>> +
>> +/**
>> + * vb2_request_has_buffers() - return true if the request contains buffers
>> + *
>> + * @req: the request.
>> + */
>> +bool vb2_request_has_buffers(struct media_request *req);
>> +
>> #endif /* _MEDIA_VIDEOBUF2_CORE_H */
>
>
>
> Thanks,
> Mauro
>
