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

Commit b0e0e1f8 authored by Junghak Sung's avatar Junghak Sung Committed by Mauro Carvalho Chehab
Browse files

[media] media: videobuf2: Prepare to divide videobuf2 



Prepare to divide videobuf2
- Separate vb2 trace events from v4l2 trace event.
- Make wrapper functions that will move to v4l2-side.
- Make vb2_core_* functions that will remain in core-side.
- Add a callback function table for buffer operation which makes vb2-core
  to be able to invoke a v4l2-side functions.
- Rename internal functions as vb2_*.

Signed-off-by: default avatarJunghak Sung <jh1009.sung@samsung.com>
Signed-off-by: default avatarGeunyoung Kim <nenggun.kim@samsung.com>
Acked-by: default avatarSeung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: default avatarInki Dae <inki.dae@samsung.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent bed04f93

drivers/media/v4l2-core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ ifeq ($(CONFIG_OF),y) 
  videodev-objs += v4l2-of.o

endif

ifeq ($(CONFIG_TRACEPOINTS),y)

  videodev-objs += v4l2-trace.o

  videodev-objs += vb2-trace.o v4l2-trace.o

endif



obj-$(CONFIG_VIDEO_V4L2) += videodev.o

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

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#define CREATE_TRACE_POINTS

#include <trace/events/v4l2.h>



EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_buf_done);

EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_buf_queue);

EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_dqbuf);

EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_qbuf);
 
EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_v4l2_buf_done);

EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_v4l2_buf_queue);

EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_v4l2_dqbuf);

EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_v4l2_qbuf);

drivers/media/v4l2-core/vb2-trace.c

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#include <media/videobuf2-core.h>



#define CREATE_TRACE_POINTS

#include <trace/events/vb2.h>



EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_buf_done);

EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_buf_queue);

EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_dqbuf);

EXPORT_TRACEPOINT_SYMBOL_GPL(vb2_qbuf);

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

+385 −176

File changed.

Preview size limit exceeded, changes collapsed.

include/media/videobuf2-core.h

+10 −0
Original line number Diff line number Diff line
@@ -363,6 +363,12 @@ struct vb2_ops { 
	void (*buf_queue)(struct vb2_buffer *vb);

};



struct vb2_buf_ops {

	int (*fill_user_buffer)(struct vb2_buffer *vb, void *pb);

	int (*fill_vb2_buffer)(struct vb2_buffer *vb, const void *pb,

				struct vb2_plane *planes);

	int (*set_timestamp)(struct vb2_buffer *vb, const void *pb);

};



/**

 * struct vb2_queue - a videobuf queue
@@ -385,6 +391,8 @@ struct vb2_ops { 
 *		drivers to easily associate an owner filehandle with the queue.

 * @ops:	driver-specific callbacks

 * @mem_ops:	memory allocator specific callbacks

 * @buf_ops:	callbacks to deliver buffer information

 *		between user-space and kernel-space

 * @drv_priv:	driver private data

 * @buf_struct_size: size of the driver-specific buffer structure;

 *		"0" indicates the driver doesn't want to use a custom buffer
@@ -440,6 +448,8 @@ struct vb2_queue { 


	const struct vb2_ops		*ops;

	const struct vb2_mem_ops	*mem_ops;

	const struct vb2_buf_ops	*buf_ops;



	void				*drv_priv;

	unsigned int			buf_struct_size;

	u32				timestamp_flags;