@@ -126,6 +126,8 @@ enum dpu_enc_rc_states {
126
126
* @base: drm_encoder base class for registration with DRM
127
127
* @enc_spinlock: Virtual-Encoder-Wide Spin Lock for IRQ purposes
128
128
* @enabled: True if the encoder is active, protected by enc_lock
129
+ * @commit_done_timedout: True if there has been a timeout on commit after
130
+ * enabling the encoder.
129
131
* @num_phys_encs: Actual number of physical encoders contained.
130
132
* @phys_encs: Container of physical encoders managed.
131
133
* @cur_master: Pointer to the current master in this mode. Optimization
@@ -172,6 +174,7 @@ struct dpu_encoder_virt {
172
174
spinlock_t enc_spinlock ;
173
175
174
176
bool enabled ;
177
+ bool commit_done_timedout ;
175
178
176
179
unsigned int num_phys_encs ;
177
180
struct dpu_encoder_phys * phys_encs [MAX_PHYS_ENCODERS_PER_VIRTUAL ];
@@ -1269,6 +1272,9 @@ static void dpu_encoder_virt_atomic_enable(struct drm_encoder *drm_enc,
1269
1272
atomic_set (& dpu_enc -> frame_done_timeout_cnt , 0 );
1270
1273
1271
1274
mutex_lock (& dpu_enc -> enc_lock );
1275
+
1276
+ dpu_enc -> commit_done_timedout = false;
1277
+
1272
1278
cur_mode = & dpu_enc -> base .crtc -> state -> adjusted_mode ;
1273
1279
1274
1280
dpu_enc -> wide_bus_en = dpu_encoder_is_widebus_enabled (drm_enc );
@@ -2553,6 +2559,10 @@ int dpu_encoder_wait_for_commit_done(struct drm_encoder *drm_enc)
2553
2559
DPU_ATRACE_BEGIN ("wait_for_commit_done" );
2554
2560
ret = phys -> ops .wait_for_commit_done (phys );
2555
2561
DPU_ATRACE_END ("wait_for_commit_done" );
2562
+ if (ret == - ETIMEDOUT && !dpu_enc -> commit_done_timedout ) {
2563
+ dpu_enc -> commit_done_timedout = true;
2564
+ msm_disp_snapshot_state (drm_enc -> dev );
2565
+ }
2556
2566
if (ret )
2557
2567
return ret ;
2558
2568
}
0 commit comments