drm/msm/dpu: debug commit_done timeouts
v4 cover drm/msm/dpu: debug commit_done timeouts
In order to debug commit_done timeouts ([1]) display the sticky bits of the CTL_FLUSH register and capture the devcore dump when the first such timeout occurs.
[1] https://gitlab.freedesktop.org/drm/msm/-/issues/33
---
Changes in v4:
- Reworded documentation for new funcsions (Abhinav)
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Capture the snapshot only on the first comit_done timeout (Abhinav)
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Added a call to msm_disp_snapshot_state() to trigger devcore dump
(Abhinav)
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Dmitry Baryshkov (3):
drm/msm/dpu: make "vblank timeout" more useful drm/msm/dpu: split dpu_encoder_wait_for_event into two functions drm/msm/dpu: capture snapshot on the first commit_done timeout
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 79 ++++++++++++++++------ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 22 +----- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- drivers/gpu/drm/msm/msm_drv.h | 10 --- 5 files changed, 65 insertions(+), 50 deletions(-)
---
base-commit: 33e1d31873f87d119e5120b88cd350efa68ef276
change-id: 20240106-fd-dpu-debug-timeout-e917f0bc8063
Best regards,
Signature · 1 line
Dmitry Baryshkov <[email protected]>
PATCH v4 1/3 drm/msm/dpu: make "vblank timeout" more useful
We have several reports of vblank timeout messages. However after some debugging it was found that there might be different causes to that. To allow us to identify the DPU block that gets stuck, include the actual CTL_FLUSH value into the timeout message.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +1 -1
@@ -480,7 +480,7 @@ static int dpu_encoder_phys_vid_wait_for_commit_done( (hw_ctl->ops.get_flush_register (hw_ctl) ==0 ), msecs_to_jiffies(50));if (ret <=0 ) { -DPU_ERROR ("vblank timeout\n" ); +DPU_ERROR ("vblank timeout: %x\n" , hw_ctl->ops.get_flush_register (hw_ctl));return -ETIMEDOUT ; }
Signature · 1 line
2.39.2
PATCH v4 2/3 drm/msm/dpu: split dpu_encoder_wait_for_event into two functions
In reply to Dmitry BaryshkovStop multiplexing several events via the dpu_encoder_wait_for_event() function. Split it into two distinct functions two allow separate handling of those events.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 70 +++++++++++++++++++++-------- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 22 ++------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- drivers/gpu/drm/msm/msm_drv.h | 10 ----- 4 files changed, 55 insertions(+), 49 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +51 -19
@@ -1282,7 +1282,7 @@ static void dpu_encoder_virt_atomic_disable(struct drm_encoder *drm_enc,trace_dpu_enc_disable (DRMID (drm_enc));/* wait for idle */ -dpu_encoder_wait_for_event (drm_enc,MSM_ENC_TX_COMPLETE ); +dpu_encoder_wait_for_tx_complete (drm_enc);dpu_encoder_resource_control (drm_enc,DPU_ENC_RC_EVENT_PRE_STOP );
@@ -2402,10 +2402,18 @@ struct drm_encoder *dpu_encoder_init(struct drm_device *dev,return &dpu_enc->base; } -int dpu_encoder_wait_for_event (struct drm_encoder *drm_enc, -enum msm_event_wait event) +/** +* dpu_encoder_wait_for_commit_done() - Wait for encoder to flush pending state +* @drm_enc: encoder pointer +* +* Wait for hardware to have flushed the current pending changes to hardware at +* a vblank or CTL_START. Physical encoders will map this differently depending +* on the type: vid mode -> vsync_irq, cmd mode -> CTL_START. +* +* Return: 0 on success, -EWOULDBLOCK if already signaled, error otherwise +*/ +int dpu_encoder_wait_for_commit_done (struct drm_encoder *drm_enc) { -int (*fn_wait)(struct dpu_encoder_phys *phys_enc) =NULL ;struct dpu_encoder_virt *dpu_enc =NULL ;int i, ret =0 ;
@@ -2419,23 +2427,47 @@ int dpu_encoder_wait_for_event(struct drm_encoder *drm_enc,for (i =0 ; i < dpu_enc->num_phys_encs; i++) {struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i]; -switch (event) { -case MSM_ENC_COMMIT_DONE : - fn_wait = phys->ops.wait_for_commit_done; -break ; -case MSM_ENC_TX_COMPLETE : - fn_wait = phys->ops.wait_for_tx_complete; -break ; -default : -DPU_ERROR_ENC (dpu_enc,"unknown wait event %d\n" , - event); -return -EINVAL ; +if (phys->ops.wait_for_commit_done) { +DPU_ATRACE_BEGIN ("wait_for_commit_done" ); + ret = phys->ops.wait_for_commit_done (phys); +DPU_ATRACE_END ("wait_for_commit_done" ); +if (ret) +return ret; } + } + +return ret; +} + +/** +* dpu_encoder_wait_for_tx_complete() - Wait for encoder to transfer pixels to panel +* @drm_enc: encoder pointer +* +* Wait for the hardware to transfer all the pixels to the panel. Physical +* encoders will map this differently depending on the type: vid mode -> vsync_irq, +* cmd mode -> pp_done. +* +* Return: 0 on success, -EWOULDBLOCK if already signaled, error otherwise +*/ +int dpu_encoder_wait_for_tx_complete (struct drm_encoder *drm_enc) +{ +struct dpu_encoder_virt *dpu_enc =NULL ; +int i, ret =0 ; + +if (!drm_enc) { +DPU_ERROR ("invalid encoder\n" ); +return -EINVAL ; + } + dpu_enc =to_dpu_encoder_virt (drm_enc); +DPU_DEBUG_ENC (dpu_enc,"\n" ); + +for (i =0 ; i < dpu_enc->num_phys_encs; i++) { +struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i]; -if (fn_wait) { -DPU_ATRACE_BEGIN ("wait_for_completion_event" ); - ret =fn_wait (phys); -DPU_ATRACE_END ("wait_for_completion_event" ); +if (phys->ops.wait_for_tx_complete) { +DPU_ATRACE_BEGIN ("wait_for_tx_complete" ); + ret = phys->ops.wait_for_tx_complete (phys); +DPU_ATRACE_END ("wait_for_tx_complete" );if (ret)return ret; }
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +3 -19
@@ -93,25 +93,9 @@ void dpu_encoder_kickoff(struct drm_encoder *encoder);*/ int dpu_encoder_vsync_time (struct drm_encoder *drm_enc,ktime_t *wakeup_time); -/** -* dpu_encoder_wait_for_event - Waits for encoder events -* @encoder: encoder pointer -* @event: event to wait for -* MSM_ENC_COMMIT_DONE - Wait for hardware to have flushed the current pending -* frames to hardware at a vblank or ctl_start -* Encoders will map this differently depending on the -* panel type. -* vid mode -> vsync_irq -* cmd mode -> ctl_start -* MSM_ENC_TX_COMPLETE - Wait for the hardware to transfer all the pixels to -* the panel. Encoders will map this differently -* depending on the panel type. -* vid mode -> vsync_irq -* cmd mode -> pp_done -* Returns: 0 on success, -EWOULDBLOCK if already signaled, error otherwise -*/ -int dpu_encoder_wait_for_event (struct drm_encoder *drm_encoder, -enum msm_event_wait event); +int dpu_encoder_wait_for_commit_done (struct drm_encoder *drm_encoder); + +int dpu_encoder_wait_for_tx_complete (struct drm_encoder *drm_encoder);/* * dpu_encoder_get_intf_mode - get interface mode of the given encoder
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1 -1
@@ -476,7 +476,7 @@ static void dpu_kms_wait_for_commit_done(struct msm_kms *kms,* mode panels. This may be a no-op for command mode panels. */ trace_dpu_kms_wait_for_commit_done (DRMID (crtc)); - ret =dpu_encoder_wait_for_event (encoder,MSM_ENC_COMMIT_DONE ); + ret =dpu_encoder_wait_for_commit_done (encoder);if (ret && ret != -EWOULDBLOCK ) {DPU_ERROR ("wait for commit done returned %d\n" , ret);break ;
drivers/gpu/drm/msm/msm_drv.h +0 -10
@@ -74,16 +74,6 @@ enum msm_dsi_controller {#define MSM_GPU_MAX_RINGS 4#define MAX_H_TILES_PER_DISPLAY 2 -/** -* enum msm_event_wait - type of HW events to wait for -* @MSM_ENC_COMMIT_DONE - wait for the driver to flush the registers to HW -* @MSM_ENC_TX_COMPLETE - wait for the HW to transfer the frame to panel -*/ -enum msm_event_wait { -MSM_ENC_COMMIT_DONE =0 , -MSM_ENC_TX_COMPLETE , -}; -/** * struct msm_display_topology - defines a display topology pipeline * @num_lm: number of layer mixers used
Signature · 1 line
2.39.2
PATCH v4 3/3 drm/msm/dpu: capture snapshot on the first commit_done timeout
In reply to Dmitry BaryshkovIn order to debug commit_done timeouts, capture the devcoredump state when the first timeout occurs after the encoder has been enabled.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +9 -0
@@ -126,6 +126,8 @@ enum dpu_enc_rc_states {* @base: drm_encoder base class for registration with DRM * @enc_spinlock: Virtual-Encoder-Wide Spin Lock for IRQ purposes * @enabled: True if the encoder is active, protected by enc_lock +* @commit_done_timedout: True if there has been a timeout on commit after +* enabling the encoder. * @num_phys_encs: Actual number of physical encoders contained. * @phys_encs: Container of physical encoders managed. * @cur_master: Pointer to the current master in this mode. Optimization
@@ -172,6 +174,7 @@ struct dpu_encoder_virt {spinlock_t enc_spinlock;bool enabled; +bool commit_done_timedout;unsigned int num_phys_encs;struct dpu_encoder_phys *phys_encs[MAX_PHYS_ENCODERS_PER_VIRTUAL ];
@@ -1226,6 +1229,8 @@ static void dpu_encoder_virt_atomic_enable(struct drm_encoder *drm_enc,else if (disp_info->intf_type ==INTF_DSI ) dpu_enc->wide_bus_en =msm_dsi_wide_bus_enabled (priv->dsi[index]); + dpu_enc->commit_done_timedout = false; +mutex_lock (&dpu_enc->enc_lock); cur_mode = &dpu_enc->base.crtc->state->adjusted_mode;
@@ -2431,6 +2436,10 @@ int dpu_encoder_wait_for_commit_done(struct drm_encoder *drm_enc)DPU_ATRACE_BEGIN ("wait_for_commit_done" ); ret = phys->ops.wait_for_commit_done (phys);DPU_ATRACE_END ("wait_for_commit_done" ); +if (ret == -ETIMEDOUT && !dpu_enc->commit_done_timedout) { + dpu_enc->commit_done_timedout = true; +msm_disp_snapshot_state (drm_enc->dev); + }if (ret)return ret; }
Signature · 1 line
2.39.2
Dmitry Baryshkov
AppliedQuoted 8 lines · Dmitry Baryshkov
In order to debug
commit_donetimeouts ([1]) display the sticky bits of theCTL_FLUSHregister and capture the devcore dump when the first such timeout occurs.[1] https://gitlab.freedesktop.org/drm/msm/-/issues/33
[...]
Applied, thanks!
[1/3] drm/msm/dpu: make "vblank timeout" more useful
https://gitlab.freedesktop.org/lumag/msm/-/commit/f1d0b196ff2e [2/3] drm/msm/dpu: split dpu_encoder_wait_for_event into two functions https://gitlab.freedesktop.org/lumag/msm/-/commit/d72a3d35b7ef [3/3] drm/msm/dpu: capture snapshot on the first commit_done timeout https://gitlab.freedesktop.org/lumag/msm/-/commit/4be445f5b6b6
Best regards,
Signature · 1 line
Dmitry Baryshkov <[email protected]>