Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea42c8ec authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mauro Carvalho Chehab
Browse files

[media] media: vb2: fix incorrect v4l2_buffer->flags handling 



Videobuf2 core assumes that driver doesn't set any buffer flags.
This is correct for buffer state flags that videobuf2 manages,
but the other flags like V4L2_BUF_FLAG_{KEY,P,B}FRAME,
V4L2_BUF_FLAG_TIMECODE and V4L2_BUF_FLAG_INPUT should be passed from or to
the driver.

Reported-by: default avatarJonghun Han <jonghun.han@samsung.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
CC: Pawel Osciak <pawel@osciak.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 89582654

drivers/media/video/videobuf2-core.c

+10 −2
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ module_param(debug, int, 0644); 
#define call_qop(q, op, args...)					\

	(((q)->ops->op) ? ((q)->ops->op(args)) : 0)



#define V4L2_BUFFER_STATE_FLAGS	(V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_QUEUED | \

				 V4L2_BUF_FLAG_DONE | V4L2_BUF_FLAG_ERROR)



/**

 * __vb2_buf_mem_alloc() - allocate video memory for the given buffer

 */
@@ -284,7 +287,7 @@ static int __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b) 
	struct vb2_queue *q = vb->vb2_queue;

	int ret = 0;



	/* Copy back data such as timestamp, input, etc. */

	/* Copy back data such as timestamp, flags, input, etc. */

	memcpy(b, &vb->v4l2_buf, offsetof(struct v4l2_buffer, m));

	b->input = vb->v4l2_buf.input;

	b->reserved = vb->v4l2_buf.reserved;
@@ -313,7 +316,10 @@ static int __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b) 
			b->m.userptr = vb->v4l2_planes[0].m.userptr;

	}



	b->flags = 0;

	/*

	 * Clear any buffer state related flags.

	 */

	b->flags &= ~V4L2_BUFFER_STATE_FLAGS;



	switch (vb->state) {

	case VB2_BUF_STATE_QUEUED:
@@ -715,6 +721,8 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b, 


	vb->v4l2_buf.field = b->field;

	vb->v4l2_buf.timestamp = b->timestamp;

	vb->v4l2_buf.input = b->input;

	vb->v4l2_buf.flags = b->flags & ~V4L2_BUFFER_STATE_FLAGS;



	return 0;

}