From: "Vivi, Rodrigo" <rodrigo.vivi@intel.com>
To: "daniel@fooishbar.org" <daniel@fooishbar.org>
Cc: "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 06/31] drm/i915: Fix IPS disable sequence.
Date: Wed, 11 Nov 2015 23:31:56 +0000 [thread overview]
Message-ID: <1447284734.1865.11.camel@intel.com> (raw)
In-Reply-To: <CAPj87rNDbRbkHfF=wzsBOb7gwm2dSb8jO1AqVY_xar5fP6BDQw@mail.gmail.com>
On Tue, 2015-11-10 at 16:34 +0000, Daniel Stone wrote:
> Hi,
>
> On 5 November 2015 at 18:49, Rodrigo Vivi <rodrigo.vivi@intel.com>
> wrote:
> > /**
> > + * intel_ips_disable_if_alone - Disable IPS if alone in the pipe.
> > + * @crtc: intel crtc
> > + *
> > + * This function should be called when primary plane is being
> > disabled.
> > + * It checks if there is any other plane enabled on the pipe when
> > primary is
> > + * going to be disabled. In this case IPS can continue enabled,
> > but it needs
> > + * to be disabled otherwise.
> > + */
>
> As an example of what I meant before, I would reword this to reflect
> its actual functionality, which doesn't necessarily have anything to
> do specifically with disabling the primary plane:
> 'This function examines the CRTC state to determine if IPS should
> be disabled. Currently, IPS is disabled if no planes are active on
> the
> CRTC.'
>
> Discussing its use in the context of disabling the primary plane I
> think obscures its intent, and also introduces a bug. :)
>
> > +void intel_ips_disable_if_alone(struct intel_crtc *crtc)
> > +{
> > + struct drm_device *dev = crtc->base.dev;
> > + struct drm_i915_private *dev_priv = dev->dev_private;
> > + bool ips_enabled;
> > + struct intel_plane *intel_plane;
> > +
> > + mutex_lock(&dev_priv->display_ips.lock);
> > + ips_enabled = dev_priv->display_ips.enabled;
> > + mutex_unlock(&dev_priv->display_ips.lock);
> > +
> > + if (!ips_enabled)
> > + return;
> > +
> > + for_each_intel_plane_on_crtc(dev, crtc, intel_plane) {
> > + enum plane plane = intel_plane->plane;
> > +
> > + if (plane != PLANE_A &&
> > + !!(I915_READ(DSPCNTR(plane)) &
> > DISPLAY_PLANE_ENABLE))
> > + return;
> > + intel_ips_disable(crtc);
> > + }
> > +}
>
> Rather than reading the registers, this should just inspect
> plane_state->visible. Reading the registers introduces the same bug
> as
> I mentioned the last mail, but in a different way:
> - IPS is enabled
> - primary and overlay planes are both enabled
> - user commits an atomic state which disables both primary and
> overlay planes, so IPS must be disabled
> - disabling the primary plane calls this function, which sees that
> the overlay plane is still active, so IPS can remain enabled
> - the overlay plane gets disabled, with IPS still active
> - :(
You are absolutely right on this case... :/ Thanks for spotting this
case.
So I was considering your idea for the unified place but I ended up in
some concerns questions here.
First is the disable must occur on pre-update and enable on post
-update, so I would prefer to still let them spread and reactive.
But now I believe that we need to detach the atomic
->ips_{enable,disable} from primary and do for every plane on/off. So
if we are enabling any plane we just call ips_enable().
And if plane is being disabled and there is no other plane->visible in
this crtc we call intel_disable().
But I wonder how to skip the plane itself on for_each_plane_in_state...
Or should I just counter the number of state->visible and disable if <=
1 and let enable if we count more than 1 visible plane. Any better
idea?
>
> Making this work on states would eliminate this entire class of bugs,
> and also make it much easier to handle async modesets.
>
> Cheers,
> Daniel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-11-11 23:31 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-05 18:49 [PATCH 00/31] IPS/DRRS/PSR rework with PSR enabled by default Rodrigo Vivi
2015-11-05 18:49 ` [PATCH 01/31] drm/i915: Rename IPS ready variable at pipe config Rodrigo Vivi
2015-11-05 18:49 ` [PATCH 02/31] drm/i915: Move IPS related stuff to intel_ips.c Rodrigo Vivi
2015-11-05 18:49 ` [PATCH 03/31] drm/i915: Add IPS DockBook Rodrigo Vivi
2015-11-05 18:49 ` [PATCH 04/31] drm/i915: Handle actual IPS enabled state Rodrigo Vivi
2015-11-07 19:19 ` Daniel Stone
2015-11-13 18:20 ` Daniel Stone
2015-11-13 18:38 ` Ville Syrjälä
2015-11-13 18:55 ` Daniel Stone
2015-11-13 20:28 ` Ville Syrjälä
2015-11-13 21:42 ` Daniel Stone
2015-11-05 18:49 ` [PATCH 05/31] drm/i915: Fix IPS initialization Rodrigo Vivi
2015-11-05 18:49 ` [PATCH 06/31] drm/i915: Fix IPS disable sequence Rodrigo Vivi
2015-11-10 16:34 ` Daniel Stone
2015-11-11 23:31 ` Vivi, Rodrigo [this message]
2015-11-12 11:24 ` Daniel Stone
2015-11-05 18:49 ` [PATCH 07/31] drm/i915: IPS Sysfs interface Rodrigo Vivi
2015-11-05 21:04 ` Chris Wilson
2015-11-18 10:04 ` Daniel Vetter
2015-11-18 18:32 ` Vivi, Rodrigo
2015-11-09 11:37 ` Daniel Stone
2015-11-05 18:50 ` [PATCH 08/31] drm/i915: Add psr_ready on pipe_config Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 09/31] drm/i915: Only enable DRRS if PSR won't be enabled on this pipe Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 10/31] drm/i915: Detatch i915.enable_psr from psr_ready Rodrigo Vivi
2015-11-18 10:07 ` Daniel Vetter
2015-11-18 18:35 ` Vivi, Rodrigo
2015-11-19 9:19 ` Daniel Vetter
2015-11-05 18:50 ` [PATCH 11/31] drm/i915: Use intel_crtc instead of intel_dp on PSR enable/disable functions Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 12/31] drm/i915: Fix PSR initialization Rodrigo Vivi
2015-11-18 10:12 ` Daniel Vetter
2015-11-18 18:39 ` Vivi, Rodrigo
2015-11-19 9:34 ` Daniel Vetter
2015-11-05 18:50 ` [PATCH 13/31] drm/i915: Organize Makefile new display pm group Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 14/31] drm/i915: Create intel_drrs.c Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 15/31] drm/i915: Use intel_crtc instead of intel_dp on DRRS enable/disable functions Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 16/31] drm/i915: Fix DRRS initialization Rodrigo Vivi
2015-11-18 10:13 ` Daniel Vetter
2015-11-05 18:50 ` [PATCH 17/31] drm/i915: Add sys PSR toggle interface Rodrigo Vivi
2015-11-05 21:03 ` Chris Wilson
2015-11-05 18:50 ` [PATCH 18/31] drm/i915: Force PSR exit when IRQ_HPD is detected on eDP Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 19/31] drm/i915: Remove duplicated dpcd write on hsw_psr_enable_sink Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 20/31] drm/i915: PSR: Let's rely more on frontbuffer tracking Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 21/31] drm/i915: PSR: Mask LPSP hw tracking back again Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 22/31] drm/i915: Delay first PSR activation Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 23/31] drm/i915: Reduce PSR re-activation time for VLV/CHV Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 24/31] drm/i915: PSR: Don't Skip aux handshake on DP_PSR_NO_TRAIN_ON_EXIT Rodrigo Vivi
2015-11-09 10:38 ` Jani Nikula
2015-11-10 15:41 ` Vivi, Rodrigo
2015-11-05 18:50 ` [PATCH 25/31] drm/i915: Send TP1 TP2/3 even when panel claims no NO_TRAIN_ON_EXIT Rodrigo Vivi
2015-11-09 10:39 ` Jani Nikula
2015-11-10 15:42 ` Vivi, Rodrigo
2015-11-05 18:50 ` [PATCH 26/31] drm/i915: Fix idle_frames counter Rodrigo Vivi
2015-11-05 18:50 ` [PATCH 27/31] drm/i915: Allow 1 vblank to let Sink CRC calculation to start or stop Rodrigo Vivi
2015-11-10 20:12 ` Paulo Zanoni
2015-11-05 18:50 ` [PATCH 28/31] drm/i915: Make Sink crc calculation waiting for counter to reset Rodrigo Vivi
2015-11-10 20:31 ` Paulo Zanoni
2015-11-10 21:49 ` Paulo Zanoni
2015-11-18 10:25 ` Daniel Vetter
2015-11-18 18:42 ` Vivi, Rodrigo
2015-11-05 18:50 ` [PATCH 29/31] drm/i915: Stop tracking last calculated Sink CRC Rodrigo Vivi
2015-11-10 21:36 ` Paulo Zanoni
2015-11-05 18:50 ` [PATCH 30/31] drm/i915: Rely on TEST_SINK_START instead of tracking Sink CRC state on dev_priv Rodrigo Vivi
2015-11-10 21:44 ` Paulo Zanoni
2015-11-05 18:50 ` [PATCH 31/31] drm/i915: Enable PSR by default Rodrigo Vivi
2015-11-05 21:07 ` Chris Wilson
2015-11-05 21:30 ` Vivi, Rodrigo
2015-11-09 11:47 ` [PATCH 00/31] IPS/DRRS/PSR rework with PSR enabled " Daniel Stone
2015-11-10 15:57 ` Vivi, Rodrigo
2015-11-10 16:26 ` Daniel Stone
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447284734.1865.11.camel@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=daniel@fooishbar.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox