| Message ID | 20180804124526.46206-23-hverkuil@xs4all.nl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Request API | expand |
Em Sat, 4 Aug 2018 14:45:14 +0200 Hans Verkuil <hverkuil@xs4all.nl> escreveu: > From: Hans Verkuil <hans.verkuil@cisco.com> > > Make vb2_buffer a request object. > > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > --- > include/media/videobuf2-core.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h > index cbda3968d018..df92dcdeabb3 100644 > --- a/include/media/videobuf2-core.h > +++ b/include/media/videobuf2-core.h > @@ -17,6 +17,7 @@ > #include <linux/poll.h> > #include <linux/dma-buf.h> > #include <linux/bitops.h> > +#include <media/media-request.h> > > #define VB2_MAX_FRAME (32) > #define VB2_MAX_PLANES (8) > @@ -236,6 +237,8 @@ struct vb2_queue; > * @num_planes: number of planes in the buffer > * on an internal driver queue. > * @timestamp: frame timestamp in ns. > + * @req_obj: used to bind this buffer to a request. This > + * request object has a refcount. > */ > struct vb2_buffer { > struct vb2_queue *vb2_queue; > @@ -244,6 +247,7 @@ struct vb2_buffer { > unsigned int memory; > unsigned int num_planes; > u64 timestamp; > + struct media_request_object req_obj; > > /* private: internal use only > * Thanks, Mauro
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index cbda3968d018..df92dcdeabb3 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -17,6 +17,7 @@ #include <linux/poll.h> #include <linux/dma-buf.h> #include <linux/bitops.h> +#include <media/media-request.h> #define VB2_MAX_FRAME (32) #define VB2_MAX_PLANES (8) @@ -236,6 +237,8 @@ struct vb2_queue; * @num_planes: number of planes in the buffer * on an internal driver queue. * @timestamp: frame timestamp in ns. + * @req_obj: used to bind this buffer to a request. This + * request object has a refcount. */ struct vb2_buffer { struct vb2_queue *vb2_queue; @@ -244,6 +247,7 @@ struct vb2_buffer { unsigned int memory; unsigned int num_planes; u64 timestamp; + struct media_request_object req_obj; /* private: internal use only *