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

Commit f0710815 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: use event class to deduplicate v4l2 trace events 



Trace events with exactly the same parameters and trace output, such as
coda_enc_pic_run and coda_enc_pic_done, are supposed to use the
DECLARE_EVENT_CLASS and DEFINE_EVENT macros instead of duplicated
TRACE_EVENT macro calls.
This patch changes the order of parameters to coda_dec_rot_done and adds
a timestamp so it can share an event class with coda_bit_queue.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 8076c7e3

drivers/media/platform/coda/coda-bit.c

+1 −1
Original line number Diff line number Diff line
@@ -1978,7 +1978,7 @@ static void coda_finish_decode(struct coda_ctx *ctx) 
		dst_buf->v4l2_buf.timecode = meta->timecode;

		dst_buf->v4l2_buf.timestamp = meta->timestamp;



		trace_coda_dec_rot_done(ctx, meta, dst_buf);

		trace_coda_dec_rot_done(ctx, dst_buf, meta);



		switch (q_data_dst->fourcc) {

		case V4L2_PIX_FMT_YUV420:

drivers/media/platform/coda/trace.h

+25 −64
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ TRACE_EVENT(coda_bit_done, 
	TP_printk("minor = %d, ctx = %d", __entry->minor, __entry->ctx)

);



TRACE_EVENT(coda_enc_pic_run,

DECLARE_EVENT_CLASS(coda_buf_class,

	TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf),



	TP_ARGS(ctx, buf),
@@ -69,28 +69,17 @@ TRACE_EVENT(coda_enc_pic_run, 
		  __entry->minor, __entry->index, __entry->ctx)

);



TRACE_EVENT(coda_enc_pic_done,

DEFINE_EVENT(coda_buf_class, coda_enc_pic_run,

	TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf),

	TP_ARGS(ctx, buf)

);



	TP_ARGS(ctx, buf),



	TP_STRUCT__entry(

		__field(int, minor)

		__field(int, index)

		__field(int, ctx)

	),



	TP_fast_assign(

		__entry->minor = ctx->fh.vdev->minor;

		__entry->index = buf->v4l2_buf.index;

		__entry->ctx = ctx->idx;

	),



	TP_printk("minor = %d, index = %d, ctx = %d",

		  __entry->minor, __entry->index, __entry->ctx)

DEFINE_EVENT(coda_buf_class, coda_enc_pic_done,

	TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf),

	TP_ARGS(ctx, buf)

);



TRACE_EVENT(coda_bit_queue,

DECLARE_EVENT_CLASS(coda_buf_meta_class,

	TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf,

		 struct coda_buffer_meta *meta),
@@ -117,7 +106,13 @@ TRACE_EVENT(coda_bit_queue, 
		  __entry->ctx)

);



TRACE_EVENT(coda_dec_pic_run,

DEFINE_EVENT(coda_buf_meta_class, coda_bit_queue,

	TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf,

		 struct coda_buffer_meta *meta),

	TP_ARGS(ctx, buf, meta)

);



DECLARE_EVENT_CLASS(coda_meta_class,

	TP_PROTO(struct coda_ctx *ctx, struct coda_buffer_meta *meta),



	TP_ARGS(ctx, meta),
@@ -140,54 +135,20 @@ TRACE_EVENT(coda_dec_pic_run, 
		  __entry->minor, __entry->start, __entry->end, __entry->ctx)

);



TRACE_EVENT(coda_dec_pic_done,

DEFINE_EVENT(coda_meta_class, coda_dec_pic_run,

	TP_PROTO(struct coda_ctx *ctx, struct coda_buffer_meta *meta),



	TP_ARGS(ctx, meta),



	TP_STRUCT__entry(

		__field(int, minor)

		__field(int, start)

		__field(int, end)

		__field(int, ctx)

	),



	TP_fast_assign(

		__entry->minor = ctx->fh.vdev->minor;

		__entry->start = meta->start;

		__entry->end = meta->end;

		__entry->ctx = ctx->idx;

	),



	TP_printk("minor = %d, start = 0x%x, end = 0x%x, ctx = %d",

		  __entry->minor, __entry->start, __entry->end, __entry->ctx)

	TP_ARGS(ctx, meta)

);



TRACE_EVENT(coda_dec_rot_done,

	TP_PROTO(struct coda_ctx *ctx, struct coda_buffer_meta *meta,

		 struct vb2_buffer *buf),



	TP_ARGS(ctx, meta, buf),



	TP_STRUCT__entry(

		__field(int, minor)

		__field(int, start)

		__field(int, end)

		__field(int, index)

		__field(int, ctx)

	),



	TP_fast_assign(

		__entry->minor = ctx->fh.vdev->minor;

		__entry->start = meta->start;

		__entry->end = meta->end;

		__entry->index = buf->v4l2_buf.index;

		__entry->ctx = ctx->idx;

	),

DEFINE_EVENT(coda_meta_class, coda_dec_pic_done,

	TP_PROTO(struct coda_ctx *ctx, struct coda_buffer_meta *meta),

	TP_ARGS(ctx, meta)

);



	TP_printk("minor = %d, start = 0x%x, end = 0x%x, index = %d, ctx = %d",

		  __entry->minor, __entry->start, __entry->end, __entry->index,

		  __entry->ctx)

DEFINE_EVENT(coda_buf_meta_class, coda_dec_rot_done,

	TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf,

		 struct coda_buffer_meta *meta),

	TP_ARGS(ctx, buf, meta)

);



#endif /* __CODA_TRACE_H__ */