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

Commit 1bb4e701 authored by Sean Paul's avatar Sean Paul Committed by Rob Clark
Browse files

drm/msm: dpu: Add extra_flush_bits to trigger_flush trace 



It's useful to know which bits of the flush come from extra_flush_bits

Reviewed-by: default avatarAbhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent b65bd045

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1444,7 +1444,8 @@ static inline void _dpu_encoder_trigger_flush(struct drm_encoder *drm_enc, 
		ret = ctl->ops.get_pending_flush(ctl);

		ret = ctl->ops.get_pending_flush(ctl);





	trace_dpu_enc_trigger_flush(DRMID(drm_enc), phys->intf_idx,

	trace_dpu_enc_trigger_flush(DRMID(drm_enc), phys->intf_idx,

				    pending_kickoff_cnt, ctl->idx, ret);

				    pending_kickoff_cnt, ctl->idx,

				    extra_flush_bits, ret);

}

}





/**

/**

drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h

+9 −5
Original line number Original line Diff line number Diff line
@@ -468,14 +468,16 @@ TRACE_EVENT(dpu_enc_frame_done_cb, 




TRACE_EVENT(dpu_enc_trigger_flush,

TRACE_EVENT(dpu_enc_trigger_flush,

	TP_PROTO(uint32_t drm_id, enum dpu_intf intf_idx,

	TP_PROTO(uint32_t drm_id, enum dpu_intf intf_idx,

		 int pending_kickoff_cnt, int ctl_idx, u32 pending_flush_ret),

		 int pending_kickoff_cnt, int ctl_idx, u32 extra_flush_bits,

		 u32 pending_flush_ret),

	TP_ARGS(drm_id, intf_idx, pending_kickoff_cnt, ctl_idx,

	TP_ARGS(drm_id, intf_idx, pending_kickoff_cnt, ctl_idx,

		pending_flush_ret),

		extra_flush_bits, pending_flush_ret),

	TP_STRUCT__entry(

	TP_STRUCT__entry(

		__field(	uint32_t,	drm_id			)

		__field(	uint32_t,	drm_id			)

		__field(	enum dpu_intf,	intf_idx		)

		__field(	enum dpu_intf,	intf_idx		)

		__field(	int,		pending_kickoff_cnt	)

		__field(	int,		pending_kickoff_cnt	)

		__field(	int,		ctl_idx			)

		__field(	int,		ctl_idx			)

		__field(	u32,		extra_flush_bits	)

		__field(	u32,		pending_flush_ret	)

		__field(	u32,		pending_flush_ret	)

	),

	),

	TP_fast_assign(

	TP_fast_assign(
@@ -483,12 +485,14 @@ TRACE_EVENT(dpu_enc_trigger_flush, 
		__entry->intf_idx = intf_idx;

		__entry->intf_idx = intf_idx;

		__entry->pending_kickoff_cnt = pending_kickoff_cnt;

		__entry->pending_kickoff_cnt = pending_kickoff_cnt;

		__entry->ctl_idx = ctl_idx;

		__entry->ctl_idx = ctl_idx;

		__entry->extra_flush_bits = extra_flush_bits;

		__entry->pending_flush_ret = pending_flush_ret;

		__entry->pending_flush_ret = pending_flush_ret;

	),

	),

	TP_printk("id=%u, intf_idx=%d, pending_kickoff_cnt=%d ctl_idx=%d "

	TP_printk("id=%u, intf_idx=%d, pending_kickoff_cnt=%d ctl_idx=%d "

		  "pending_flush_ret=%u", __entry->drm_id,

		  "extra_flush_bits=0x%x pending_flush_ret=0x%x",

		  __entry->intf_idx, __entry->pending_kickoff_cnt,

		  __entry->drm_id, __entry->intf_idx,

		  __entry->ctl_idx, __entry->pending_flush_ret)

		  __entry->pending_kickoff_cnt, __entry->ctl_idx,

		  __entry->extra_flush_bits, __entry->pending_flush_ret)

);

);





DECLARE_EVENT_CLASS(dpu_enc_ktime_template,

DECLARE_EVENT_CLASS(dpu_enc_ktime_template,