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

disp: msm: sde: fix vblank wait after cache read mode update

Browse Source 
This change fixes the vblank wait after system cache read mode
update. Without this change the wait does not happen since there is
no pending kickoff. This change uses encoder api to flush the
configuration and explicitly waits for vblank.

Change-Id: I8942f9b638e784c8fd9b5df33a9ccc7087a5eaef
Signed-off-by: Abhijit Kulkarni <kabhijit@codeaurora.org>
This commit is contained in:
Abhijit Kulkarni
2020-09-01 11:02:29 -07:00
parent 45d0998b96
commit 3db847b7bf
3 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
msm/sde/sde_crtc.c
View File

@@ -3654,7 +3654,7 @@ int sde_crtc_reset_hw(struct drm_crtc *crtc, struct drm_crtc_state *old_state,
continue;
if (sde_encoder_get_intf_mode(encoder) == INTF_MODE_VIDEO)
sde_encoder_kickoff(encoder, false);
sde_encoder_kickoff(encoder, false, true);
}
/* panic the device if VBIF is not in good state */
@@ -3760,7 +3760,7 @@ void sde_crtc_commit_kickoff(struct drm_crtc *crtc,
if (encoder->crtc != crtc)
continue;
sde_encoder_kickoff(encoder, false);
sde_encoder_kickoff(encoder, false, true);
}
/* store the event after frame trigger */
@@ -6397,35 +6397,34 @@ void __sde_crtc_static_cache_read_work(struct kthread_work *work)
struct sde_crtc *sde_crtc = container_of(work, struct sde_crtc,
static_cache_read_work.work);
struct drm_crtc *crtc;
struct msm_kms *kms;
struct msm_drm_private *priv = NULL;
struct sde_crtc_mixer *mixer;
struct sde_hw_ctl *ctl;
struct drm_encoder *enc, *drm_enc = NULL;
if (!sde_crtc)
return;
crtc = &sde_crtc->base;
priv = crtc->dev->dev_private;
kms = priv->kms;
mixer = sde_crtc->mixers;
if (!mixer)
if (sde_crtc->cache_state != CACHE_STATE_FRAME_WRITE)
return;
ctl = mixer->hw_ctl;
drm_for_each_encoder_mask(enc, crtc->dev, crtc->state->encoder_mask) {
drm_enc = enc;
if (sde_encoder_in_clone_mode(drm_enc))
return;
}
if (!drm_enc) {
SDE_ERROR("invalid encoder\n");
return;
}
SDE_EVT32(DRMID(crtc), SDE_EVTLOG_FUNC_ENTRY);
if (sde_crtc->cache_state != CACHE_STATE_FRAME_WRITE ||
!ctl->ops.trigger_flush)
return;
sde_crtc_static_img_control(crtc, CACHE_STATE_FRAME_READ, false);
/* flush with previous commit flush bits & wait till frame done */
ctl->ops.trigger_flush(ctl);
if (kms->funcs->wait_for_crtc_commit_done)
kms->funcs->wait_for_crtc_commit_done(kms, crtc);
/* kickoff encoder with previous configuration and wait for VBLANK */
sde_encoder_kickoff(drm_enc, false, false);
sde_encoder_wait_for_event(drm_enc, MSM_ENC_VBLANK);
SDE_EVT32(DRMID(crtc), SDE_EVTLOG_FUNC_EXIT);
}