samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: request hard reset on vsync timeout" into display-kernel.lnx.5.4

Browse Source
This commit is contained in:
Linux Build Service Account
2020-11-20 17:16:31 -08:00
committed by Gerrit - the friendly Code Review server
parent f80e5bce2b 91a070feb3
commit 36453ed93f
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
msm/sde/sde_encoder_phys_vid.c
View File

@@ -877,12 +877,15 @@ static int _sde_encoder_phys_vid_wait_for_vblank(
u32 event = SDE_ENCODER_FRAME_EVENT_ERROR |
SDE_ENCODER_FRAME_EVENT_SIGNAL_RELEASE_FENCE |
SDE_ENCODER_FRAME_EVENT_SIGNAL_RETIRE_FENCE;
struct drm_connector *conn;
if (!phys_enc) {
pr_err("invalid encoder\n");
return -EINVAL;
}
conn = phys_enc->connector;
wait_info.wq = &phys_enc->pending_kickoff_wq;
wait_info.atomic_cnt = &phys_enc->pending_kickoff_cnt;
wait_info.timeout_ms = KICKOFF_TIMEOUT_MS;
@@ -893,10 +896,16 @@ static int _sde_encoder_phys_vid_wait_for_vblank(
if (notify && (ret == -ETIMEDOUT) &&
atomic_add_unless(&phys_enc->pending_retire_fence_cnt, -1, 0) &&
phys_enc->parent_ops.handle_frame_done)
phys_enc->parent_ops.handle_frame_done) {
phys_enc->parent_ops.handle_frame_done(
phys_enc->parent, phys_enc, event);
if (sde_encoder_recovery_events_enabled(phys_enc->parent))
sde_connector_event_notify(conn,
DRM_EVENT_SDE_HW_RECOVERY,
sizeof(uint8_t), SDE_RECOVERY_HARD_RESET);
}
SDE_EVT32(DRMID(phys_enc->parent), event, notify, ret,
ret ? SDE_EVTLOG_FATAL : 0);
return ret;