Re: [fixup PATCH] drm/i915: Only commit active planes when updating planes during reset.

Daniel Vetter
2015-09-14T13:10:14Z

On Mon, Sep 14, 2015 at 11:41:51AM +0200, Maarten Lankhorst wrote:
> In a future commit commit_plane will no longer check if the crtc is active.
> To prevent issues with legacy page flips the check should be performed inside
> update_primary_planes.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ----
>
> Hey,
>
> Op 14-09-15 om 11:02 schreef Daniel Vetter:
> > On Thu, Sep 10, 2015 at 07:34:05PM +0300, Ville Syrjälä wrote:
> >> On Thu, Sep 10, 2015 at 06:31:02PM +0200, Daniel Vetter wrote:
> >>> On Thu, Sep 10, 2015 at 06:43:26PM +0300, Ville Syrjälä wrote:
> >>>> On Thu, Sep 10, 2015 at 04:07:58PM +0200, Maarten Lankhorst wrote:
> >>>>> This function was still using the legacy state, convert it to atomic.
> >>>>> While we're at it, fix the FIXME too and disable the primary plane.
> >>>>>
> >>>>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> >>>>> ---
> >>>>> drivers/gpu/drm/i915/intel_display.c | 26 ++++++++++++--------------
> >>>>> 1 file changed, 12 insertions(+), 14 deletions(-)
> >>>>>
> >>>>> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> >>>>> index 33200403a5db..b68aa95c5460 100644
> >>>>> --- a/drivers/gpu/drm/i915/intel_display.c
> >>>>> +++ b/drivers/gpu/drm/i915/intel_display.c
> >>>>> @@ -3138,24 +3138,22 @@ static void intel_complete_page_flips(struct drm_device *dev)
> >>>>>
> >>>>> static void intel_update_primary_planes(struct drm_device *dev)
> >>>>> {
> >>>>> - struct drm_i915_private *dev_priv = dev->dev_private;
> >>>>> struct drm_crtc *crtc;
> >>>>>
> >>>>> for_each_crtc(dev, crtc) {
> >>>>> - struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> >>>>> + struct intel_plane *plane = to_intel_plane(crtc->primary);
> >>>>> + struct intel_plane_state *plane_state;
> >>>>>
> >>>>> - drm_modeset_lock(&crtc->mutex, NULL);
> >>>>> - /*
> >>>>> - * FIXME: Once we have proper support for primary planes (and
> >>>>> - * disabling them without disabling the entire crtc) allow again
> >>>>> - * a NULL crtc->primary->fb.
> >>>>> - */
> >>>>> - if (intel_crtc->active && crtc->primary->fb)
> >>>>> - dev_priv->display.update_primary_plane(crtc,
> >>>>> - crtc->primary->fb,
> >>>>> - crtc->x,
> >>>>> - crtc->y);
> >>>>> - drm_modeset_unlock(&crtc->mutex);
> >>>>> + drm_modeset_lock_crtc(crtc, &plane->base);
> >>>>> +
> >>>>> + plane_state = to_intel_plane_state(plane->base.state);
> >>>>> +
> >>>>> + if (plane_state->base.fb)
> >>>>> + plane->commit_plane(&plane->base, plane_state);
> >>>>> + else if (crtc->state->active)
> >>>>> + plane->disable_plane(&plane->base, crtc);
> >>>> That doesn't make sense. There's no way to disable a plane with a page
> >>>> flip, so there's simply nothing to do here if the fb is NULL. If we can
> >>>> trust the plane state to be sane we should just check 'visible' here and
> >>>> commit the plane in that case.
> >>> Right missed that and squash up a fixup that Ville acked on irc. Also
> >>> added the FIXME comment too.
> >> Actually I take it back. We just lost the ->active check entirely so now
> >> we're commiting a plane on a disabled pipe potentially.
> > Blergh and I tagged the pile already :( Maarten, can you pls send out the
> > fixup as a separate patch asap?
> >
> This is not currently an issue because "drm/i915: Only run commit when crtc is active.' is not applied.
>
> Thanks for catching though!

I Meant a full patch (including commit citation and sob and all taht)
since I already tagged it and can't squash in any more.
-Daniel

> ---
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 452e8f77151d..47d9c0f8b2fb 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3145,10 +3145,9 @@ static void intel_update_primary_planes(struct drm_device *dev)
> struct intel_plane_state *plane_state;
>
> drm_modeset_lock_crtc(crtc, &plane->base);
> -
> plane_state = to_intel_plane_state(plane->base.state);
>
> - if (plane_state->base.fb)
> + if (crtc->state->active && plane_state->base.fb)
> plane->commit_plane(&plane->base, plane_state);
>
> drm_modeset_unlock_crtc(crtc);
>

--
Daniel Vetter
Software Engineer, Intel Corporation