drm/msm: dpu: Add tracing around CTL_FLUSH
PATCH 1/1 drm/msm: dpu: Add tracing around CTL_FLUSH
From: Sean Paul <[email protected]>
I found these tracepoints useful for debugging cursor/ctl, someone else might find them useful too
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 26 ++++++++---- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 47 ++++++++++++++++++++++ 2 files changed, 65 insertions(+), 8 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +18 -8
@@ -15,6 +15,7 @@#include "dpu_hw_ctl.h" #include "dpu_dbg.h" #include "dpu_kms.h" +#include "dpu_trace.h" #define CTL_LAYER (lm) \ (((lm) == LM_5) ? (0x024) : (((lm) - LM_0) * 0x004))
@@ -72,24 +73,39 @@ static int _mixer_stages(const struct dpu_lm_cfg *mixer, int count,return stages; } +static inline u32 dpu_hw_ctl_get_flush_register (struct dpu_hw_ctl *ctx) +{ +struct dpu_hw_blk_reg_map *c = &ctx->hw; + +return DPU_REG_READ (c,CTL_FLUSH ); +} +static inline void dpu_hw_ctl_trigger_start (struct dpu_hw_ctl *ctx) { +trace_dpu_hw_ctl_trigger_start (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx));DPU_REG_WRITE (&ctx->hw,CTL_START ,0x1 ); }static inline void dpu_hw_ctl_trigger_pending (struct dpu_hw_ctl *ctx) { +trace_dpu_hw_ctl_trigger_prepare (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx));DPU_REG_WRITE (&ctx->hw,CTL_PREPARE ,0x1 ); }static inline void dpu_hw_ctl_clear_pending_flush (struct dpu_hw_ctl *ctx) { +trace_dpu_hw_ctl_clear_pending_flush (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx)); ctx->pending_flush_mask =0x0 ; }static inline void dpu_hw_ctl_update_pending_flush (struct dpu_hw_ctl *ctx,u32 flushbits) { +trace_dpu_hw_ctl_update_pending_flush (flushbits, + ctx->pending_flush_mask); ctx->pending_flush_mask |= flushbits; }
@@ -103,17 +119,11 @@ static u32 dpu_hw_ctl_get_pending_flush(struct dpu_hw_ctl *ctx)static inline void dpu_hw_ctl_trigger_flush (struct dpu_hw_ctl *ctx) { - +trace_dpu_hw_ctl_trigger_pending_flush (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx));DPU_REG_WRITE (&ctx->hw,CTL_FLUSH , ctx->pending_flush_mask); } -static inline u32 dpu_hw_ctl_get_flush_register (struct dpu_hw_ctl *ctx) -{ -struct dpu_hw_blk_reg_map *c = &ctx->hw; - -return DPU_REG_READ (c,CTL_FLUSH ); -} -static inline uint32_t dpu_hw_ctl_get_bitmask_sspp (struct dpu_hw_ctl *ctx,enum dpu_sspp sspp) {
drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +47 -0
53 lines not on this page · raw message
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20181003183644.231054-1-sean-p7yTbzM4H96eqtR555YLDQ@public.gmane.org
Abhinav Kumar
Reviewed-byQuoted 6 lines · Sean Paul
From: Sean Paul <[email protected]>
I found these tracepoints useful for debugging cursor/ctl, someone else might find them useful too
Signed-off-by Sean Paul <[email protected]>
Quoted 144 lines
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 26 ++++++++---- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 47 ++++++++++++++++++++++ 2 files changed, 65 insertions(+), 8 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +18
-8@@ -15,6 +15,7 @@#include "dpu_hw_ctl.h" #include "dpu_dbg.h" #include "dpu_kms.h" +#include "dpu_trace.h" #define CTL_LAYER (lm) \ (((lm) == LM_5) ? (0x024) : (((lm) - LM_0) * 0x004))@@ -72,24 +73,39 @@ static int _mixer_stages(const struct dpu_lm_cfg *mixer, int count, return stages; } +static inline u32 dpu_hw_ctl_get_flush_register (struct dpu_hw_ctl *ctx) +{ +struct dpu_hw_blk_reg_map *c = &ctx->hw; + +return DPU_REG_READ (c,CTL_FLUSH ); +} +static inline void dpu_hw_ctl_trigger_start (struct dpu_hw_ctl *ctx) { +trace_dpu_hw_ctl_trigger_start (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx));DPU_REG_WRITE (&ctx->hw,CTL_START ,0x1 ); }static inline void dpu_hw_ctl_trigger_pending (struct dpu_hw_ctl *ctx) { +trace_dpu_hw_ctl_trigger_prepare (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx));DPU_REG_WRITE (&ctx->hw,CTL_PREPARE ,0x1 ); }static inline void dpu_hw_ctl_clear_pending_flush (struct dpu_hw_ctl *ctx) { +trace_dpu_hw_ctl_clear_pending_flush (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx)); ctx->pending_flush_mask =0x0 ; }static inline void dpu_hw_ctl_update_pending_flush (struct dpu_hw_ctl *ctx,u32 flushbits) { +trace_dpu_hw_ctl_update_pending_flush (flushbits, + ctx->pending_flush_mask); ctx->pending_flush_mask |= flushbits; }@@ -103,17 +119,11 @@ static u32 dpu_hw_ctl_get_pending_flush(struct dpu_hw_ctl *ctx)static inline void dpu_hw_ctl_trigger_flush (struct dpu_hw_ctl *ctx) { - +trace_dpu_hw_ctl_trigger_pending_flush (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx));DPU_REG_WRITE (&ctx->hw,CTL_FLUSH , ctx->pending_flush_mask); } -static inline u32 dpu_hw_ctl_get_flush_register (struct dpu_hw_ctl *ctx) -{ -struct dpu_hw_blk_reg_map *c = &ctx->hw; - -return DPU_REG_READ (c,CTL_FLUSH ); -} - static inline uint32_t dpu_hw_ctl_get_bitmask_sspp(struct dpu_hw_ctl*ctx,
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +0
-0enum dpu_sspp sspp) {drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +47
-0@@ -1004,6 +1004,53 @@ TRACE_EVENT(dpu_core_perf_update_clk, __entry->stop_req ? "true" : "false", __entry->clk_rate) ); +TRACE_EVENT (dpu_hw_ctl_update_pending_flush, + TP_PROTO(u32 new_bits, u32 pending_mask), +TP_ARGS (new_bits, pending_mask), +TP_STRUCT__entry ( + __field( u32, new_bits ) +__field ( u32, pending_mask ) + ), +TP_fast_assign ( + __entry->new_bits = new_bits; + __entry->pending_mask = pending_mask; + ), +TP_printk ("new=%x existing=%x" , __entry->new_bits, + __entry->pending_mask) +); + +DECLARE_EVENT_CLASS (dpu_hw_ctl_pending_flush_template, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush), +TP_STRUCT__entry ( + __field( u32, pending_mask ) +__field ( u32, ctl_flush ) + ), +TP_fast_assign ( + __entry->pending_mask = pending_mask; + __entry->ctl_flush = ctl_flush; + ), +TP_printk ("pending_mask=%x CTL_FLUSH=%x" , __entry->pending_mask, + __entry->ctl_flush) +); +DEFINE_EVENT (dpu_hw_ctl_pending_flush_template, dpu_hw_ctl_clear_pending_flush, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush) +); +DEFINE_EVENT (dpu_hw_ctl_pending_flush_template, + dpu_hw_ctl_trigger_pending_flush, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush) +); +DEFINE_EVENT (dpu_hw_ctl_pending_flush_template, dpu_hw_ctl_trigger_prepare, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush) +); +DEFINE_EVENT (dpu_hw_ctl_pending_flush_template, dpu_hw_ctl_trigger_start, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush) +); +
Quoted 5 lines
#define
DPU_ATRACE_END(name)trace_tracing_mark_write(current->tgid,
name, 0)
#defineDPU_ATRACE_BEGIN(name)trace_tracing_mark_write(current->tgid,
name, 1)
#defineDPU_ATRACE_FUNC()DPU_ATRACE_BEGIN(__func__)
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 92fbd23ce5ab4ba77d0a6221f18287b0-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
Sean Paul
AppliedQuoted 8 lines · Abhinav Kumar
Quoted 6 lines · Sean Paul
From: Sean Paul <[email protected]>
I found these tracepoints useful for debugging cursor/ctl, someone else might find them useful too
Signed-off-by Sean Paul <[email protected]>Reviewed-by Abhinav Kumar <[email protected]>
Pushed to dpu-staging, thanks for the reviews
Quoted 147 lines
Quoted 147 lines
--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 26 ++++++++---- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 47 ++++++++++++++++++++++ 2 files changed, 65 insertions(+), 8 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +16
-0@@ -15,6 +15,7 @@#include "dpu_hw_ctl.h" #include "dpu_dbg.h" #include "dpu_kms.h" +#include "dpu_trace.h" #define CTL_LAYER (lm) \ (((lm) == LM_5) ? (0x024) : (((lm) - LM_0) * 0x004))@@ -72,24 +73,39 @@ static int _mixer_stages(const struct dpu_lm_cfg *mixer, int count, return stages; } +static inline u32 dpu_hw_ctl_get_flush_register (struct dpu_hw_ctl *ctx) +{ +struct dpu_hw_blk_reg_map *c = &ctx->hw; + +return DPU_REG_READ (c,CTL_FLUSH ); +} +static inline void dpu_hw_ctl_trigger_start (struct dpu_hw_ctl *ctx) { +trace_dpu_hw_ctl_trigger_start (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx));DPU_REG_WRITE (&ctx->hw,CTL_START ,0x1 ); }static inline void dpu_hw_ctl_trigger_pending (struct dpu_hw_ctl *ctx) { +trace_dpu_hw_ctl_trigger_prepare (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx));DPU_REG_WRITE (&ctx->hw,CTL_PREPARE ,0x1 ); }static inline void dpu_hw_ctl_clear_pending_flush (struct dpu_hw_ctl *ctx) { +trace_dpu_hw_ctl_clear_pending_flush (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx)); ctx->pending_flush_mask =0x0 ; }static inline void dpu_hw_ctl_update_pending_flush (struct dpu_hw_ctl *ctx,u32 flushbits) { +trace_dpu_hw_ctl_update_pending_flush (flushbits, + ctx->pending_flush_mask);drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +2
-8ctx->pending_flush_mask |= flushbits; }@@ -103,17 +119,11 @@ static u32 dpu_hw_ctl_get_pending_flush(struct dpu_hw_ctl *ctx)static inline void dpu_hw_ctl_trigger_flush (struct dpu_hw_ctl *ctx) { - +trace_dpu_hw_ctl_trigger_pending_flush (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx));DPU_REG_WRITE (&ctx->hw,CTL_FLUSH , ctx->pending_flush_mask); } -static inline u32 dpu_hw_ctl_get_flush_register (struct dpu_hw_ctl *ctx) -{ -struct dpu_hw_blk_reg_map *c = &ctx->hw; - -return DPU_REG_READ (c,CTL_FLUSH ); -} - static inline uint32_t dpu_hw_ctl_get_bitmask_sspp(struct dpu_hw_ctl *ctx,drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +0
-0enum dpu_sspp sspp) {drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +47
-0@@ -1004,6 +1004,53 @@ TRACE_EVENT(dpu_core_perf_update_clk, __entry->stop_req ? "true" : "false", __entry->clk_rate) ); +TRACE_EVENT (dpu_hw_ctl_update_pending_flush, + TP_PROTO(u32 new_bits, u32 pending_mask), +TP_ARGS (new_bits, pending_mask), +TP_STRUCT__entry ( + __field( u32, new_bits ) +__field ( u32, pending_mask ) + ), +TP_fast_assign ( + __entry->new_bits = new_bits; + __entry->pending_mask = pending_mask; + ), +TP_printk ("new=%x existing=%x" , __entry->new_bits, + __entry->pending_mask) +); + +DECLARE_EVENT_CLASS (dpu_hw_ctl_pending_flush_template, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush), +TP_STRUCT__entry ( + __field( u32, pending_mask ) +__field ( u32, ctl_flush ) + ), +TP_fast_assign ( + __entry->pending_mask = pending_mask; + __entry->ctl_flush = ctl_flush; + ), +TP_printk ("pending_mask=%x CTL_FLUSH=%x" , __entry->pending_mask, + __entry->ctl_flush) +); +DEFINE_EVENT (dpu_hw_ctl_pending_flush_template, dpu_hw_ctl_clear_pending_flush, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush) +); +DEFINE_EVENT (dpu_hw_ctl_pending_flush_template, + dpu_hw_ctl_trigger_pending_flush, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush) +); +DEFINE_EVENT (dpu_hw_ctl_pending_flush_template, dpu_hw_ctl_trigger_prepare, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush) +); +DEFINE_EVENT (dpu_hw_ctl_pending_flush_template, dpu_hw_ctl_trigger_start, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush) +); +#define
DPU_ATRACE_END(name)trace_tracing_mark_write(current->tgid,
name, 0)
#defineDPU_ATRACE_BEGIN(name)trace_tracing_mark_write(current->tgid,
name, 1)
#defineDPU_ATRACE_FUNC()DPU_ATRACE_BEGIN(__func__)
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
Jeykumar Sankaran
Reviewed-byQuoted 7 lines · Sean Paul
From: Sean Paul <[email protected]>
I found these tracepoints useful for debugging cursor/ctl, someone else might find them useful too
Signed-off-by Sean Paul <[email protected]>---
Thanks for the patch!
Quoted 150 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 26 ++++++++---- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 47 ++++++++++++++++++++++ 2 files changed, 65 insertions(+), 8 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +14
-0@@ -15,6 +15,7 @@#include "dpu_hw_ctl.h" #include "dpu_dbg.h" #include "dpu_kms.h" +#include "dpu_trace.h" #define CTL_LAYER (lm) \ (((lm) == LM_5) ? (0x024) : (((lm) - LM_0) * 0x004))@@ -72,24 +73,39 @@ static int _mixer_stages(const struct dpu_lm_cfg *mixer, int count, return stages; } +static inline u32 dpu_hw_ctl_get_flush_register (struct dpu_hw_ctl *ctx) +{ +struct dpu_hw_blk_reg_map *c = &ctx->hw; + +return DPU_REG_READ (c,CTL_FLUSH ); +} +static inline void dpu_hw_ctl_trigger_start (struct dpu_hw_ctl *ctx) { +trace_dpu_hw_ctl_trigger_start (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx));DPU_REG_WRITE (&ctx->hw,CTL_START ,0x1 ); }static inline void dpu_hw_ctl_trigger_pending (struct dpu_hw_ctl *ctx) { +trace_dpu_hw_ctl_trigger_prepare (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx));DPU_REG_WRITE (&ctx->hw,CTL_PREPARE ,0x1 ); }static inline void dpu_hw_ctl_clear_pending_flush (struct dpu_hw_ctl *ctx) { +trace_dpu_hw_ctl_clear_pending_flush (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx)); ctx->pending_flush_mask =0x0 ; } static inline void dpu_hw_ctl_update_pending_flush(struct dpu_hw_ctl*ctx,
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +4
-8u32 flushbits) { +trace_dpu_hw_ctl_update_pending_flush (flushbits, + ctx->pending_flush_mask); ctx->pending_flush_mask |= flushbits; }@@ -103,17 +119,11 @@ static u32 dpu_hw_ctl_get_pending_flush(struct dpu_hw_ctl *ctx)static inline void dpu_hw_ctl_trigger_flush (struct dpu_hw_ctl *ctx) { - +trace_dpu_hw_ctl_trigger_pending_flush (ctx->pending_flush_mask, +dpu_hw_ctl_get_flush_register (ctx));DPU_REG_WRITE (&ctx->hw,CTL_FLUSH , ctx->pending_flush_mask); } -static inline u32 dpu_hw_ctl_get_flush_register (struct dpu_hw_ctl *ctx) -{ -struct dpu_hw_blk_reg_map *c = &ctx->hw; - -return DPU_REG_READ (c,CTL_FLUSH ); -} - static inline uint32_t dpu_hw_ctl_get_bitmask_sspp(struct dpu_hw_ctl*ctx,
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +0
-0enum dpu_sspp sspp) {drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +47
-0@@ -1004,6 +1004,53 @@ TRACE_EVENT(dpu_core_perf_update_clk, __entry->stop_req ? "true" : "false", __entry->clk_rate) ); +TRACE_EVENT (dpu_hw_ctl_update_pending_flush, + TP_PROTO(u32 new_bits, u32 pending_mask), +TP_ARGS (new_bits, pending_mask), +TP_STRUCT__entry ( + __field( u32, new_bits ) +__field ( u32, pending_mask ) + ), +TP_fast_assign ( + __entry->new_bits = new_bits; + __entry->pending_mask = pending_mask; + ), +TP_printk ("new=%x existing=%x" , __entry->new_bits, + __entry->pending_mask) +); + +DECLARE_EVENT_CLASS (dpu_hw_ctl_pending_flush_template, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush), +TP_STRUCT__entry ( + __field( u32, pending_mask ) +__field ( u32, ctl_flush ) + ), +TP_fast_assign ( + __entry->pending_mask = pending_mask; + __entry->ctl_flush = ctl_flush; + ), +TP_printk ("pending_mask=%x CTL_FLUSH=%x" , __entry->pending_mask, + __entry->ctl_flush) +); +DEFINE_EVENT (dpu_hw_ctl_pending_flush_template, dpu_hw_ctl_clear_pending_flush, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush) +); +DEFINE_EVENT (dpu_hw_ctl_pending_flush_template, + dpu_hw_ctl_trigger_pending_flush, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush) +); +DEFINE_EVENT (dpu_hw_ctl_pending_flush_template, dpu_hw_ctl_trigger_prepare, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush) +); +DEFINE_EVENT (dpu_hw_ctl_pending_flush_template, dpu_hw_ctl_trigger_start, + TP_PROTO(u32 pending_mask, u32 ctl_flush), +TP_ARGS (pending_mask, ctl_flush) +); +#define
DPU_ATRACE_END(name)trace_tracing_mark_write(current->tgid,
name, 0)
#defineDPU_ATRACE_BEGIN(name)trace_tracing_mark_write(current->tgid,
name, 1)
#defineDPU_ATRACE_FUNC()DPU_ATRACE_BEGIN(__func__)
Signature · 5 lines
Jeykumar S _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno