Re: [PATCH 10/10] drm/msm: add atomic traces

On Thu, Aug 29, 2019 at 09:45:18AM -0700, Rob Clark wrote:

From: Rob Clark robdclark@chromium.org

This was useful for debugging fps drops. I suspect it will be useful again.

Signed-off-by: Rob Clark robdclark@chromium.org

I'm a simple man, I see tracepoints patches and R-b tracepoints patches :)

Reviewed-by: Sean Paul sean@poorly.run

---

drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/msm_atomic.c | 24 +++- drivers/gpu/drm/msm/msm_atomic_trace.h | 110 +++++++++++++++++++ drivers/gpu/drm/msm/msm_atomic_tracepoints.c | 3 + drivers/gpu/drm/msm/msm_gpu_trace.h | 2 +- 5 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/drm/msm/msm_atomic_trace.h create mode 100644 drivers/gpu/drm/msm/msm_atomic_tracepoints.c

diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 7a05cbf2f820..1579cf0d828f 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -75,6 +75,7 @@ msm-y := \ disp/dpu1/dpu_rm.o \ disp/dpu1/dpu_vbif.o \ msm_atomic.o \

• msm_atomic_tracepoints.o \ msm_debugfs.o \ msm_drv.o \ msm_fb.o \

diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index 80536538967b..fb247aa1081e 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -6,6 +6,7 @@

#include <drm/drm_atomic_uapi.h>

+#include "msm_atomic_trace.h" #include "msm_drv.h" #include "msm_gem.h" #include "msm_kms.h" @@ -33,11 +34,13 @@ static void msm_atomic_async_commit(struct msm_kms *kms, int crtc_idx) { unsigned crtc_mask = BIT(crtc_idx);

• trace_msm_atomic_async_commit_start(crtc_mask);

• mutex_lock(&kms->commit_lock);

  if (!(kms->pending_crtc_mask & crtc_mask)) { mutex_unlock(&kms->commit_lock);

• return;
  

• goto out;
  

  }

  kms->pending_crtc_mask &= ~crtc_mask;

@@ -47,19 +50,24 @@ static void msm_atomic_async_commit(struct msm_kms *kms, int crtc_idx) /* * Flush hardware updates: */

• DRM_DEBUG_ATOMIC("triggering async commit\n");

• trace_msm_atomic_flush_commit(crtc_mask); kms->funcs->flush_commit(kms, crtc_mask); mutex_unlock(&kms->commit_lock);

  /*

  • Wait for flush to complete:

  */

• trace_msm_atomic_wait_flush_start(crtc_mask); kms->funcs->wait_flush(kms, crtc_mask);

• trace_msm_atomic_wait_flush_finish(crtc_mask);

  mutex_lock(&kms->commit_lock); kms->funcs->complete_commit(kms, crtc_mask); mutex_unlock(&kms->commit_lock); kms->funcs->disable_commit(kms);

+out:

• trace_msm_atomic_async_commit_finish(crtc_mask);

}

static enum hrtimer_restart msm_atomic_pending_timer(struct hrtimer *t) @@ -144,13 +152,17 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state) bool async = kms->funcs->vsync_time && can_do_async(state, &async_crtc);

• trace_msm_atomic_commit_tail_start(async, crtc_mask);

• kms->funcs->enable_commit(kms);

  /*

  • Ensure any previous (potentially async) commit has
  • completed:

  */

• trace_msm_atomic_wait_flush_start(crtc_mask); kms->funcs->wait_flush(kms, crtc_mask);

• trace_msm_atomic_wait_flush_finish(crtc_mask);

  mutex_lock(&kms->commit_lock);

@@ -201,6 +213,8 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state) drm_atomic_helper_commit_hw_done(state); drm_atomic_helper_cleanup_planes(dev, state);

• trace_msm_atomic_commit_tail_finish(async, crtc_mask);
  

• return; }

@@ -213,14 +227,16 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state) /* * Flush hardware updates: */

• DRM_DEBUG_ATOMIC("triggering commit\n");

• trace_msm_atomic_flush_commit(crtc_mask); kms->funcs->flush_commit(kms, crtc_mask); mutex_unlock(&kms->commit_lock);

  /*

  • Wait for flush to complete:

  */

• trace_msm_atomic_wait_flush_start(crtc_mask); kms->funcs->wait_flush(kms, crtc_mask);

• trace_msm_atomic_wait_flush_finish(crtc_mask);

  mutex_lock(&kms->commit_lock); kms->funcs->complete_commit(kms, crtc_mask);

@@ -229,4 +245,6 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state)

drm_atomic_helper_commit_hw_done(state); drm_atomic_helper_cleanup_planes(dev, state);

• trace_msm_atomic_commit_tail_finish(async, crtc_mask);

} diff --git a/drivers/gpu/drm/msm/msm_atomic_trace.h b/drivers/gpu/drm/msm/msm_atomic_trace.h new file mode 100644 index 000000000000..b4ca0ed3b4a3 --- /dev/null +++ b/drivers/gpu/drm/msm/msm_atomic_trace.h @@ -0,0 +1,110 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#if !defined(_MSM_GPU_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ) +#define _MSM_GPU_TRACE_H_

+#include <linux/tracepoint.h>

+#undef TRACE_SYSTEM +#define TRACE_SYSTEM drm_msm_atomic +#define TRACE_INCLUDE_FILE msm_atomic_trace

+TRACE_EVENT(msm_atomic_commit_tail_start,

•    TP_PROTO(bool async, unsigned crtc_mask),
  

•    TP_ARGS(async, crtc_mask),
  

•    TP_STRUCT__entry(
  

•     __field(bool, async)
  

•     __field(u32, crtc_mask)
  

•     ),
  

•    TP_fast_assign(
  

•     __entry->async = async;
  

•     __entry->crtc_mask = crtc_mask;
  

•     ),
  

•    TP_printk("async=%d crtc_mask=%x",
  

•     __entry->async, __entry->crtc_mask)
  

+);

+TRACE_EVENT(msm_atomic_commit_tail_finish,

•    TP_PROTO(bool async, unsigned crtc_mask),
  

•    TP_ARGS(async, crtc_mask),
  

•    TP_STRUCT__entry(
  

•     __field(bool, async)
  

•     __field(u32, crtc_mask)
  

•     ),
  

•    TP_fast_assign(
  

•     __entry->async = async;
  

•     __entry->crtc_mask = crtc_mask;
  

•     ),
  

•    TP_printk("async=%d crtc_mask=%x",
  

•     __entry->async, __entry->crtc_mask)
  

+);

+TRACE_EVENT(msm_atomic_async_commit_start,

•    TP_PROTO(unsigned crtc_mask),
  

•    TP_ARGS(crtc_mask),
  

•    TP_STRUCT__entry(
  

•     __field(u32, crtc_mask)
  

•     ),
  

•    TP_fast_assign(
  

•     __entry->crtc_mask = crtc_mask;
  

•     ),
  

•    TP_printk("crtc_mask=%x",
  

•     __entry->crtc_mask)
  

+);

+TRACE_EVENT(msm_atomic_async_commit_finish,

•    TP_PROTO(unsigned crtc_mask),
  

•    TP_ARGS(crtc_mask),
  

•    TP_STRUCT__entry(
  

•     __field(u32, crtc_mask)
  

•     ),
  

•    TP_fast_assign(
  

•     __entry->crtc_mask = crtc_mask;
  

•     ),
  

•    TP_printk("crtc_mask=%x",
  

•     __entry->crtc_mask)
  

+);

+TRACE_EVENT(msm_atomic_wait_flush_start,

•    TP_PROTO(unsigned crtc_mask),
  

•    TP_ARGS(crtc_mask),
  

•    TP_STRUCT__entry(
  

•     __field(u32, crtc_mask)
  

•     ),
  

•    TP_fast_assign(
  

•     __entry->crtc_mask = crtc_mask;
  

•     ),
  

•    TP_printk("crtc_mask=%x",
  

•     __entry->crtc_mask)
  

+);

+TRACE_EVENT(msm_atomic_wait_flush_finish,

•    TP_PROTO(unsigned crtc_mask),
  

•    TP_ARGS(crtc_mask),
  

•    TP_STRUCT__entry(
  

•     __field(u32, crtc_mask)
  

•     ),
  

•    TP_fast_assign(
  

•     __entry->crtc_mask = crtc_mask;
  

•     ),
  

•    TP_printk("crtc_mask=%x",
  

•     __entry->crtc_mask)
  

+);

+TRACE_EVENT(msm_atomic_flush_commit,

•    TP_PROTO(unsigned crtc_mask),
  

•    TP_ARGS(crtc_mask),
  

•    TP_STRUCT__entry(
  

•     __field(u32, crtc_mask)
  

•     ),
  

•    TP_fast_assign(
  

•     __entry->crtc_mask = crtc_mask;
  

•     ),
  

•    TP_printk("crtc_mask=%x",
  

•     __entry->crtc_mask)
  

+);

+#endif

+#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/msm +#include <trace/define_trace.h> diff --git a/drivers/gpu/drm/msm/msm_atomic_tracepoints.c b/drivers/gpu/drm/msm/msm_atomic_tracepoints.c new file mode 100644 index 000000000000..011dc881f391 --- /dev/null +++ b/drivers/gpu/drm/msm/msm_atomic_tracepoints.c @@ -0,0 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0 +#define CREATE_TRACE_POINTS +#include "msm_atomic_trace.h" diff --git a/drivers/gpu/drm/msm/msm_gpu_trace.h b/drivers/gpu/drm/msm/msm_gpu_trace.h index 1155118a27a1..122b84789238 100644 --- a/drivers/gpu/drm/msm/msm_gpu_trace.h +++ b/drivers/gpu/drm/msm/msm_gpu_trace.h @@ -5,7 +5,7 @@ #include <linux/tracepoint.h>

#undef TRACE_SYSTEM -#define TRACE_SYSTEM drm_msm +#define TRACE_SYSTEM drm_msm_gpu #define TRACE_INCLUDE_FILE msm_gpu_trace

TRACE_EVENT(msm_gpu_submit,

2.21.0