| Message ID | 20180620204841.56354-10-seanpaul@chromium.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 2018-06-21 02:18, Sean Paul wrote: > This patch converts all DPU_EVTs in dpu_pingpong with either a DRM_* > log > message or a linux tracepoint. > > Signed-off-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Rajesh Yadav <ryadav@codeaurora.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 ++- > drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 14 ++++++++++++++ > 2 files changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > index 84d2176ecafb..12e90b8e5466 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > @@ -18,6 +18,7 @@ > #include "dpu_hw_pingpong.h" > #include "dpu_dbg.h" > #include "dpu_kms.h" > +#include "dpu_trace.h" > > #define PP_TEAR_CHECK_EN 0x000 > #define PP_SYNC_CONFIG_VSYNC 0x004 > @@ -134,7 +135,7 @@ static int dpu_hw_pp_connect_external_te(struct > dpu_hw_pingpong *pp, > else > cfg &= ~BIT(20); > DPU_REG_WRITE(c, PP_SYNC_CONFIG_VSYNC, cfg); > - DPU_EVT32(pp->idx - PINGPONG_0, cfg); > + trace_dpu_pp_connect_ext_te(pp->idx - PINGPONG_0, cfg); > > return orig; > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h > b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h > index 73f76387803f..9d044f5ce26e 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h > @@ -952,6 +952,20 @@ TRACE_EVENT(dpu_vbif_wait_xin_halt_fail, > TP_printk("index:%d xin_id:%u", __entry->index, __entry->xin_id) > ); > > +TRACE_EVENT(dpu_pp_connect_ext_te, > + TP_PROTO(enum dpu_pingpong pp, u32 cfg), > + TP_ARGS(pp, cfg), > + TP_STRUCT__entry( > + __field( enum dpu_pingpong, pp ) > + __field( u32, cfg ) > + ), > + TP_fast_assign( > + __entry->pp = pp; > + __entry->cfg = cfg; > + ), > + TP_printk("pp:%d cfg:%u", __entry->pp, __entry->cfg) > +); > + > #define DPU_ATRACE_END(name) trace_tracing_mark_write(current->tgid, > name, 0) > #define DPU_ATRACE_BEGIN(name) trace_tracing_mark_write(current->tgid, > name, 1) > #define DPU_ATRACE_FUNC() DPU_ATRACE_BEGIN(__func__) -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c index 84d2176ecafb..12e90b8e5466 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c @@ -18,6 +18,7 @@ #include "dpu_hw_pingpong.h" #include "dpu_dbg.h" #include "dpu_kms.h" +#include "dpu_trace.h" #define PP_TEAR_CHECK_EN 0x000 #define PP_SYNC_CONFIG_VSYNC 0x004 @@ -134,7 +135,7 @@ static int dpu_hw_pp_connect_external_te(struct dpu_hw_pingpong *pp, else cfg &= ~BIT(20); DPU_REG_WRITE(c, PP_SYNC_CONFIG_VSYNC, cfg); - DPU_EVT32(pp->idx - PINGPONG_0, cfg); + trace_dpu_pp_connect_ext_te(pp->idx - PINGPONG_0, cfg); return orig; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h index 73f76387803f..9d044f5ce26e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h @@ -952,6 +952,20 @@ TRACE_EVENT(dpu_vbif_wait_xin_halt_fail, TP_printk("index:%d xin_id:%u", __entry->index, __entry->xin_id) ); +TRACE_EVENT(dpu_pp_connect_ext_te, + TP_PROTO(enum dpu_pingpong pp, u32 cfg), + TP_ARGS(pp, cfg), + TP_STRUCT__entry( + __field( enum dpu_pingpong, pp ) + __field( u32, cfg ) + ), + TP_fast_assign( + __entry->pp = pp; + __entry->cfg = cfg; + ), + TP_printk("pp:%d cfg:%u", __entry->pp, __entry->cfg) +); + #define DPU_ATRACE_END(name) trace_tracing_mark_write(current->tgid, name, 0) #define DPU_ATRACE_BEGIN(name) trace_tracing_mark_write(current->tgid, name, 1) #define DPU_ATRACE_FUNC() DPU_ATRACE_BEGIN(__func__)
This patch converts all DPU_EVTs in dpu_pingpong with either a DRM_* log message or a linux tracepoint. Signed-off-by: Sean Paul <seanpaul@chromium.org> --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-)