diff options
| author |   Archit Taneja <architt@codeaurora.org> | 2017-07-28 16:17:05 +0530 |
|---|---|---|
| committer |   Rob Clark <robdclark@gmail.com> | 2017-08-02 07:53:46 -0400 |
| commit | 710e7a4487839692cb35f5ba1c9371af0fb067b2 (patch) | |
| tree | bf657baf537ab8f819b473581db01405b529f126 /drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | |
| parent | drm/msm/dsi: Implement RPM suspend/resume callbacks (diff) | |
| download | linux-dev-710e7a4487839692cb35f5ba1c9371af0fb067b2.tar.xz linux-dev-710e7a4487839692cb35f5ba1c9371af0fb067b2.zip | |
drm/msm/mdp5: Don't use mode_set helper funcs for encoders and CRTCs
We shouldn't use use mode_set/mode_set_nofb helpers when we use runtime
PM. The registers configured in these funcs lose their state when we
eventually enable the display pipeline.
Do not implement these vfuncs in the helpers, and call them in the
crtc_enable/encoder_enable paths instead.
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c index aa9d56972e3d..674553b21126 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c @@ -443,6 +443,9 @@ static void mdp5_crtc_enable(struct drm_crtc *crtc) return; pm_runtime_get_sync(dev); + + mdp5_crtc_mode_set_nofb(crtc); + mdp_irq_register(&mdp5_kms->base, &mdp5_crtc->err); if (mdp5_cstate->cmd_mode) @@ -951,7 +954,6 @@ static const struct drm_crtc_funcs mdp5_crtc_no_lm_cursor_funcs = { }; static const struct drm_crtc_helper_funcs mdp5_crtc_helper_funcs = { - .mode_set_nofb = mdp5_crtc_mode_set_nofb, .disable = mdp5_crtc_disable, .enable = mdp5_crtc_enable, .atomic_check = mdp5_crtc_atomic_check, |