Enlarge tracepoints in the display component
Subsystems (3)
cover Enlarge tracepoints in the display component
Debug issues related to display can be a challenge due to the complexity around this topic and different source of information might help in this process. We already have support for tracepoints inside the display component, i.e., we have the basic functionalities available and we just need to expand it in order to make it more valuable for debugging. For this reason, this patchset reworks part of the current tracepoint options and add different sets of tracing inside amdgpu_dm, display core, and DCN10. The first patch of this series just rework part of the current tracepoints and the last set of patches introduces new tracepoints.
This first patchset version is functional. Please, let me know what I can improve in the current version but also let me know what kind of tracepoint I can add for the next version.
Finally, I want to highlight that this work is based on a set of patches originally made by Nicholas Kazlauskas.
Rodrigo Siqueira (3):
drm/amd/display: Rework registers tracepoint
drm/amd/display: Add tracepoint for amdgpu_dm
drm/amd/display: Add pipe_state tracepoint
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 17 + .../amd/display/amdgpu_dm/amdgpu_dm_trace.h | 514 ++++++++++++++++-- drivers/gpu/drm/amd/display/dc/core/dc.c | 11 + .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 17 +- 4 files changed, 523 insertions(+), 36 deletions(-)
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 1/3 drm/amd/display: Rework registers tracepoint
amdgpu_dc_rreg and amdgpu_dc_wreg are very similar, for this reason, this commits abstract these two events by using DECLARE_EVENT_CLASS and create an instance of it for each one of these events.
--- .../amd/display/amdgpu_dm/amdgpu_dm_trace.h | 55 ++++++++----------- 1 file changed, 24 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h +24 -31
@@ -31,40 +31,33 @@#include <linux/tracepoint.h> -TRACE_EVENT (amdgpu_dc_rreg, - TP_PROTO(unsigned long *read_count, uint32_t reg, uint32_t value), -TP_ARGS (read_count, reg, value), -TP_STRUCT__entry ( - __field(uint32_t, reg) -__field (uint32_t, value) - ), -TP_fast_assign ( - __entry->reg = reg; - __entry->value = value; - *read_count = *read_count + 1; - ), -TP_printk ("reg=0x%08lx, value=0x%08lx" , - (unsigned long )__entry->reg, - (unsigned long )__entry->value) -); +DECLARE_EVENT_CLASS (amdgpu_dc_reg_template, + TP_PROTO(unsigned long *count, uint32_t reg, uint32_t value), +TP_ARGS (count, reg, value), -TRACE_EVENT (amdgpu_dc_wreg, - TP_PROTO(unsigned long *write_count, uint32_t reg, uint32_t value), -TP_ARGS (write_count, reg, value), -TP_STRUCT__entry ( - __field(uint32_t, reg) -__field (uint32_t, value) - ), -TP_fast_assign ( - __entry->reg = reg; - __entry->value = value; - *write_count = *write_count + 1; - ), -TP_printk ("reg=0x%08lx, value=0x%08lx" , - (unsigned long )__entry->reg, - (unsigned long )__entry->value) +TP_STRUCT__entry ( + __field(uint32_t, reg) +__field (uint32_t, value) + ), + +TP_fast_assign ( + __entry->reg = reg; + __entry->value = value; + *count = *count + 1; + ), + +TP_printk ("reg=0x%08lx, value=0x%08lx" , + (unsigned long )__entry->reg, + (unsigned long )__entry->value) ); +DEFINE_EVENT (amdgpu_dc_reg_template, amdgpu_dc_rreg, + TP_PROTO(unsigned long *count, uint32_t reg, uint32_t value), +TP_ARGS (count, reg, value)); + +DEFINE_EVENT (amdgpu_dc_reg_template, amdgpu_dc_wreg, + TP_PROTO(unsigned long *count, uint32_t reg, uint32_t value), +TP_ARGS (count, reg, value)); TRACE_EVENT(amdgpu_dc_performance, TP_PROTO(unsigned long read_count, unsigned long write_count,
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/amd/display: Add tracepoint for amdgpu_dm
In reply to Rodrigo SiqueiraDebug amdgpu_dm could be a complicated task, therefore, this commit adds tracepoints in some convenient functions such as plane and connector check inside amdgpu_dm.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 17 ++ .../amd/display/amdgpu_dm/amdgpu_dm_trace.h | 287 ++++++++++++++++++ 2 files changed, 304 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +17 -0
@@ -5424,6 +5424,8 @@ amdgpu_dm_connector_atomic_check(struct drm_connector *conn,struct drm_crtc_state *new_crtc_state;int ret; +trace_amdgpu_dm_connector_atomic_check (new_con_state); +if (!crtc)return 0 ;
@@ -5542,6 +5544,8 @@ static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,struct dm_crtc_state *dm_crtc_state =to_dm_crtc_state (state);int ret = -EINVAL ; +trace_amdgpu_dm_crtc_atomic_check (state); +dm_update_crtc_active_planes (crtc, state); if (unlikely(!dm_crtc_state->stream &&
@@ -5916,6 +5920,8 @@ static int dm_plane_atomic_check(struct drm_plane *plane,struct drm_crtc_state *new_crtc_state;int ret; +trace_amdgpu_dm_plane_atomic_check (state); + dm_plane_state =to_dm_plane_state (state);if (!dm_plane_state->dc_state)
@@ -5956,6 +5962,8 @@ static void dm_plane_atomic_async_update(struct drm_plane *plane,struct drm_plane_state *old_state =drm_atomic_get_old_plane_state (new_state->state, plane); +trace_amdgpu_dm_atomic_update_cursor (new_state); +swap (plane->state->fb, new_state->fb); plane->state->src_x = new_state->src_x;
@@ -7546,6 +7554,8 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)int crtc_disable_count =0 ;bool mode_set_reset_required = false; +trace_amdgpu_dm_atomic_commit_tail_begin (state); +drm_atomic_helper_update_legacy_modeset_state (dev, state); dm_state =dm_atomic_get_new_state (state);
@@ -8616,6 +8626,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,int ret, i;bool lock_and_validation_needed = false; +trace_amdgpu_dm_atomic_check_begin (state); + ret =drm_atomic_helper_check_modeset (dev, state);if (ret) goto fail;
@@ -8912,6 +8924,9 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,/* Must be success */ WARN_ON (ret); + +trace_amdgpu_dm_atomic_check_finish (state, ret); +return ret; fail:
@@ -8922,6 +8937,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,else DRM_DEBUG_DRIVER ("Atomic check failed with err: %d \n" , ret); +trace_amdgpu_dm_atomic_check_finish (state, ret); +return ret; }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h +287 -0
299 lines not on this page · raw message
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amd/display: Add pipe_state tracepoint
In reply to Rodrigo SiqueiraThis commit introduces a trace mechanism for struct pipe_ctx by adding a middle layer struct in the amdgpu_dm_trace.h for capturing the most important data from struct pipe_ctx and showing its data via tracepoint. This tracepoint was added to dc.c and dcn10_hw_sequencer, however, it can be added to other DCN architecture.
--- .../amd/display/amdgpu_dm/amdgpu_dm_trace.h | 172 ++++++++++++++++++ drivers/gpu/drm/amd/display/dc/core/dc.c | 11 ++ .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 17 +- 3 files changed, 195 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h +172 -0
@@ -376,6 +376,178 @@ TRACE_EVENT(amdgpu_dm_atomic_check_finish, __entry->async_update, __entry->allow_modeset) ); +#ifndef _AMDGPU_DM_TRACE_STRUCTS_DEFINED_ +#define _AMDGPU_DM_TRACE_STRUCTS_DEFINED_ + +struct amdgpu_dm_trace_pipe_state { +int pipe_idx; +const void *stream; +int stream_w; +int stream_h; +int dst_x; +int dst_y; +int dst_w; +int dst_h; +int src_x; +int src_y; +int src_w; +int src_h; +int clip_x; +int clip_y; +int clip_w; +int clip_h; +int recout_x; +int recout_y; +int recout_w; +int recout_h; +int viewport_x; +int viewport_y; +int viewport_w; +int viewport_h; +int flip_immediate; +int surface_pitch; +int format; +int swizzle; +unsigned int update_flags; +}; + +#define fill_out_trace_pipe_state (trace_pipe_state, pipe_ctx) \ + do { \ + trace_pipe_state.pipe_idx = (pipe_ctx)->pipe_idx; \ + trace_pipe_state.stream = (pipe_ctx)->stream; \ + trace_pipe_state.stream_w = (pipe_ctx)->stream->timing.h_addressable; \ + trace_pipe_state.stream_h = (pipe_ctx)->stream->timing.v_addressable; \ + trace_pipe_state.dst_x = (pipe_ctx)->plane_state->dst_rect.x; \ + trace_pipe_state.dst_y = (pipe_ctx)->plane_state->dst_rect.y; \ + trace_pipe_state.dst_w = (pipe_ctx)->plane_state->dst_rect.width; \ + trace_pipe_state.dst_h = (pipe_ctx)->plane_state->dst_rect.height; \ + trace_pipe_state.src_x = (pipe_ctx)->plane_state->src_rect.x; \ + trace_pipe_state.src_y = (pipe_ctx)->plane_state->src_rect.y; \ + trace_pipe_state.src_w = (pipe_ctx)->plane_state->src_rect.width; \ + trace_pipe_state.src_h = (pipe_ctx)->plane_state->src_rect.height; \ + trace_pipe_state.clip_x = (pipe_ctx)->plane_state->clip_rect.x; \ + trace_pipe_state.clip_y = (pipe_ctx)->plane_state->clip_rect.y; \ + trace_pipe_state.clip_w = (pipe_ctx)->plane_state->clip_rect.width; \ + trace_pipe_state.clip_h = (pipe_ctx)->plane_state->clip_rect.height; \ + trace_pipe_state.recout_x = (pipe_ctx)->plane_res.scl_data.recout.x; \ + trace_pipe_state.recout_y = (pipe_ctx)->plane_res.scl_data.recout.y; \ + trace_pipe_state.recout_w = (pipe_ctx)->plane_res.scl_data.recout.width; \ + trace_pipe_state.recout_h = (pipe_ctx)->plane_res.scl_data.recout.height; \ + trace_pipe_state.viewport_x = (pipe_ctx)->plane_res.scl_data.viewport.x; \ + trace_pipe_state.viewport_y = (pipe_ctx)->plane_res.scl_data.viewport.y; \ + trace_pipe_state.viewport_w = (pipe_ctx)->plane_res.scl_data.viewport.width; \ + trace_pipe_state.viewport_h = (pipe_ctx)->plane_res.scl_data.viewport.height; \ + trace_pipe_state.flip_immediate = (pipe_ctx)->plane_state->flip_immediate; \ + trace_pipe_state.surface_pitch = (pipe_ctx)->plane_state->plane_size.surface_pitch; \ + trace_pipe_state.format = (pipe_ctx)->plane_state->format; \ + trace_pipe_state.swizzle = (pipe_ctx)->plane_state->tiling_info.gfx9.swizzle; \ + trace_pipe_state.update_flags = (pipe_ctx)->update_flags.raw; \ + } while (0) + +#endif /* _AMDGPU_DM_TRACE_STRUCTS_DEFINED_ */ + +TRACE_EVENT (amdgpu_dm_dc_pipe_state, + TP_PROTO(const struct amdgpu_dm_trace_pipe_state *pipe_state), +TP_ARGS (pipe_state), +TP_STRUCT__entry ( + __field(int, pipe_idx) + __field(const void *, stream) + __field(int, stream_w) + __field(int, stream_h) + __field(int, dst_x) + __field(int, dst_y) + __field(int, dst_w) + __field(int, dst_h) + __field(int, src_x) + __field(int, src_y) + __field(int, src_w) + __field(int, src_h) + __field(int, clip_x) + __field(int, clip_y) + __field(int, clip_w) + __field(int, clip_h) + __field(int, recout_x) + __field(int, recout_y) + __field(int, recout_w) + __field(int, recout_h) + __field(int, viewport_x) + __field(int, viewport_y) + __field(int, viewport_w) + __field(int, viewport_h) + __field(int, flip_immediate) + __field(int, surface_pitch) + __field(int, format) + __field(int, swizzle) + __field(unsigned int, update_flags) + ), + +TP_fast_assign ( + __entry->pipe_idx = pipe_state->pipe_idx; + __entry->stream = pipe_state->stream; + __entry->stream_w = pipe_state->stream_w; + __entry->stream_h = pipe_state->stream_h; + __entry->dst_x = pipe_state->dst_x; + __entry->dst_y = pipe_state->dst_y; + __entry->dst_w = pipe_state->dst_w; + __entry->dst_h = pipe_state->dst_h; + __entry->src_x = pipe_state->src_x; + __entry->src_y = pipe_state->src_y; + __entry->src_w = pipe_state->src_w; + __entry->src_h = pipe_state->src_h; + __entry->clip_x = pipe_state->clip_x; + __entry->clip_y = pipe_state->clip_y; + __entry->clip_w = pipe_state->clip_w; + __entry->clip_h = pipe_state->clip_h; + __entry->recout_x = pipe_state->recout_x; + __entry->recout_y = pipe_state->recout_y; + __entry->recout_w = pipe_state->recout_w; + __entry->recout_h = pipe_state->recout_h; + __entry->viewport_x = pipe_state->viewport_x; + __entry->viewport_y = pipe_state->viewport_y; + __entry->viewport_w = pipe_state->viewport_w; + __entry->viewport_h = pipe_state->viewport_h; + __entry->flip_immediate = pipe_state->flip_immediate; + __entry->surface_pitch = pipe_state->surface_pitch; + __entry->format = pipe_state->format; + __entry->swizzle = pipe_state->swizzle; + __entry->update_flags = pipe_state->update_flags; + ), +TP_printk ("pipe_idx=%d stream=%p rct(%d,%d) dst=(%d,%d,%d,%d) " +"src=(%d,%d,%d,%d) clip=(%d,%d,%d,%d) recout=(%d,%d,%d,%d) " +"viewport=(%d,%d,%d,%d) flip_immediate=%d pitch=%d " +"format=%d swizzle=%d update_flags=%x" , + __entry->pipe_idx, + __entry->stream, + __entry->stream_w, + __entry->stream_h, + __entry->dst_x, + __entry->dst_y, + __entry->dst_w, + __entry->dst_h, + __entry->src_x, + __entry->src_y, + __entry->src_w, + __entry->src_h, + __entry->clip_x, + __entry->clip_y, + __entry->clip_w, + __entry->clip_h, + __entry->recout_x, + __entry->recout_y, + __entry->recout_w, + __entry->recout_h, + __entry->viewport_x, + __entry->viewport_y, + __entry->viewport_w, + __entry->viewport_h, + __entry->flip_immediate, + __entry->surface_pitch, + __entry->format, + __entry->swizzle, + __entry->update_flags + ) +); +#endif /* _AMDGPU_DM_TRACE_H_ */ #undef TRACE_INCLUDE_PATH
drivers/gpu/drm/amd/display/dc/core/dc.c +11 -0
@@ -2644,6 +2644,17 @@ void dc_commit_updates_for_stream(struct dc *dc, } } +for (i =0 ; i <MAX_PIPES ; ++i) { +struct pipe_ctx *pipe_ctx = &dc->current_state->res_ctx.pipe_ctx[i]; + +if (pipe_ctx->plane_state) { +struct amdgpu_dm_trace_pipe_state pipe_state_trace; + +fill_out_trace_pipe_state (pipe_state_trace, pipe_ctx); +trace_amdgpu_dm_dc_pipe_state (&pipe_state_trace); + } + } + commit_planes_for_stream( dc, srf_updates,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +12 -5
@@ -1020,15 +1020,22 @@ static bool dcn10_hw_wa_force_recovery(struct dc *dc) } -void dcn10_verify_allow_pstate_change_high (struct dc *dc) { -static bool should_log_hw_state;/* prevent hw state log by default */ -if (!hubbub1_verify_allow_pstate_change_high (dc->res_pool->hubbub)) { -if (should_log_hw_state) { -dcn10_log_hw_state (dc,NULL ); +int i; + +for (i =0 ; i <MAX_PIPES ; ++i) { +struct pipe_ctx *pipe_ctx = &dc->current_state->res_ctx.pipe_ctx[i]; + +if (pipe_ctx->plane_state) { +struct amdgpu_dm_trace_pipe_state pipe_state_trace; + +fill_out_trace_pipe_state (pipe_state_trace, pipe_ctx); +trace_amdgpu_dm_dc_pipe_state (&pipe_state_trace); + } } +BREAK_TO_DEBUGGER ();if (dcn10_hw_wa_force_recovery (dc)) {/*check again*/
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx