On 26/04/16 23:35, Laurent Pinchart wrote: > Instead of conditioning planes update based on the hardware device > state, use the CRTC state stored in the atomic state. This reduces the > dependency from the DRM layer to the DSS layer. > > Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com> > --- > drivers/gpu/drm/omapdrm/omap_crtc.c | 23 ++++++++++++++--------- > 1 file changed, 14 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c > b/drivers/gpu/drm/omapdrm/omap_crtc.c > index 6359d7933b93..4c56d6a68390 100644 > --- a/drivers/gpu/drm/omapdrm/omap_crtc.c > +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c > @@ -381,18 +381,23 @@ static void omap_crtc_atomic_flush(struct drm_crtc > *crtc, > > WARN_ON(omap_crtc->vblank_irq.registered); > > - if (dispc_mgr_is_enabled(omap_crtc->channel)) { > + /* > + * Only flush the CRTC if it is currently active. CRTCs that require a > + * mode set are disabled prior plane updates and enabled afterwards. > + * They are thus not active, regardless of what their state report. > + */ > + if (!crtc->state->active || drm_atomic_crtc_needs_modeset(crtc->state)) > + return;
If the DRM core doesn't track whether a CRTC HW is enabled at the moment, maybe omapdrm should? I guess the above works, but that if() makes me a bit uneasy, as it's not really obvious, and the logic behind it could possibly change later... A "if (crtc->is_hw_enabled)" would be much more readable. Tomi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: OpenPGP digital signature URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20160510/5712104b/attachment.sig>