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

Commit dcc2428a authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] vb2: move __qbuf_mmap before __qbuf_userptr 



__qbuf_mmap was sort of hidden in between the much larger __qbuf_userptr
and __qbuf_dmabuf functions. Move it before __qbuf_userptr which is
also conform the usual order these memory models are implemented: first
mmap, then userptr, then dmabuf.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarPawel Osciak <pawel@osciak.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent fd4354cf

drivers/media/v4l2-core/videobuf2-core.c

+9 −9
Original line number Diff line number Diff line
@@ -1304,6 +1304,15 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b 
	}

}



/**

 * __qbuf_mmap() - handle qbuf of an MMAP buffer

 */

static int __qbuf_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b)

{

	__fill_vb2_buffer(vb, b, vb->v4l2_planes);

	return call_vb_qop(vb, buf_prepare, vb);

}



/**

 * __qbuf_userptr() - handle qbuf of a USERPTR buffer

 */
@@ -1407,15 +1416,6 @@ static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b) 
	return ret;

}



/**

 * __qbuf_mmap() - handle qbuf of an MMAP buffer

 */

static int __qbuf_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b)

{

	__fill_vb2_buffer(vb, b, vb->v4l2_planes);

	return call_vb_qop(vb, buf_prepare, vb);

}



/**

 * __qbuf_dmabuf() - handle qbuf of a DMABUF buffer

 */