anierin/display-drivers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: update back to back atomic check polling"

Browse Source
This commit is contained in:
qctecmdr
2021-05-12 01:16:59 -07:00
committed by Gerrit - the friendly Code Review server
parent 086efaa2a9 7c5fde4c27
commit e12be40f65
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
msm/sde/sde_encoder.c
View File

@@ -959,9 +959,9 @@ static int _sde_encoder_atomic_check_reserve(struct drm_encoder *drm_enc,
ret = sde_rm_reserve(&sde_kms->rm, drm_enc, crtc_state,
conn_state, true);
if (ret) {
SDE_ERROR_ENC(sde_enc,
"RM failed to reserve resources, rc = %d\n",
ret);
if (ret != -EAGAIN)
SDE_ERROR_ENC(sde_enc,
"RM failed to reserve resources, rc = %d\n", ret);
return ret;
}

9
msm/sde/sde_rm.c
View File

@@ -37,7 +37,7 @@
#define IS_COMPATIBLE_PP_DSC(p, d) (p % 2 == d % 2)
/* ~one vsync poll time for rsvp_nxt to cleared by modeset from commit thread */
#define RM_NXT_CLEAR_POLL_TIMEOUT_US 16600
#define RM_NXT_CLEAR_POLL_TIMEOUT_US 33000
/**
* toplogy information to be used when ctl path version does not
@@ -2570,7 +2570,7 @@ int sde_rm_reserve(
SDE_DEBUG("reserving hw for conn %d enc %d crtc %d test_only %d\n",
conn_state->connector->base.id, enc->base.id,
crtc_state->crtc->base.id, test_only);
SDE_EVT32(enc->base.id, conn_state->connector->base.id);
SDE_EVT32(enc->base.id, conn_state->connector->base.id, test_only);
mutex_lock(&rm->rm_lock);
@@ -2590,9 +2590,10 @@ int sde_rm_reserve(
if (test_only && rsvp_cur && rsvp_nxt) {
rsvp_nxt = _sde_rm_poll_get_rsvp_nxt_locked(rm, enc);
if (rsvp_nxt) {
SDE_ERROR("poll timeout cur %d nxt %d enc %d\n",
pr_err("poll timeout cur %d nxt %d enc %d\n",
rsvp_cur->seq, rsvp_nxt->seq, enc->base.id);
ret = -EINVAL;
SDE_EVT32(enc->base.id, rsvp_cur->seq, rsvp_nxt->seq, SDE_EVTLOG_ERROR);
ret = -EAGAIN;
goto end;
}
}