From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915: Call intel_dp_mst_resume() before resuming displays Date: Wed, 30 Mar 2016 08:23:27 +0200 Message-ID: <20160330062327.GA2510@phenom.ffwll.local> References: <1457711822-20335-1-git-send-email-cpaul@redhat.com> <1457711822-20335-2-git-send-email-cpaul@redhat.com> <20160313184526.GL14170@phenom.ffwll.local> <1458164993.5551.1.camel@redhat.com> <1459260714.15060.2.camel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1459260714.15060.2.camel@redhat.com> Sender: stable-owner@vger.kernel.org To: Lyude Paul Cc: Daniel Vetter , David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list" , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Mar 29, 2016 at 10:11:54AM -0400, Lyude Paul wrote: > bump >=20 > Could we get a reviewed-by for this patch? It's needed in addition to= the patch > series I sent for removing intel_dp_dpcd_read_wake() for the T560 to = have it's > monitors work properly on resume. Applied, thanks. -Daniel >=20 > On Wed, 2016-03-16 at 17:49 -0400, Lyude Paul wrote: > > On Sun, 2016-03-13 at 19:45 +0100, Daniel Vetter wrote: > > >=20 > > > On Fri, Mar 11, 2016 at 10:57:01AM -0500, Lyude wrote: > > > >=20 > > > >=20 > > > > Since we need MST devices ready before we try to resume display= s, > > > > calling this after intel_display_resume() can result in some is= sues with > > > > various laptop docks where the monitor won't turn back on after > > > > suspending the system. > > > >=20 > > > > This order was originally changed in > > > >=20 > > > > commit e7d6f7d70829 ("drm/i915: resume MST after reading back = hw state") > > > >=20 > > > > In order to fix some unclaimed register errors, however the act= ual cause > > > > of those has since been fixed. > > > >=20 > > > > CC: stable@vger.kernel.org > > > > Signed-off-by: Lyude > > > Don't we need to first apply patch 2/2 to avoid breaking systems > > > in-between? > > > -Daniel > > AFAICT the warns don't appear even with this patch, so no. > > >=20 > > >=20 > > > >=20 > > > >=20 > > > > --- > > > > =A0drivers/gpu/drm/i915/i915_drv.c | 4 ++-- > > > > =A01 file changed, 2 insertions(+), 2 deletions(-) > > > >=20 > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.c > > > > b/drivers/gpu/drm/i915/i915_drv.c > > > > index f357058..08854ae 100644 > > > > --- a/drivers/gpu/drm/i915/i915_drv.c > > > > +++ b/drivers/gpu/drm/i915/i915_drv.c > > > > @@ -761,12 +761,12 @@ static int i915_drm_resume(struct drm_dev= ice *dev) > > > > =A0 dev_priv->display.hpd_irq_setup(dev); > > > > =A0 spin_unlock_irq(&dev_priv->irq_lock); > > > > =A0 > > > > + intel_dp_mst_resume(dev); > > > > + > > > > =A0 drm_modeset_lock_all(dev); > > > > =A0 intel_display_resume(dev); > > > > =A0 drm_modeset_unlock_all(dev); > > > > =A0 > > > > - intel_dp_mst_resume(dev); > > > > - > > > > =A0 /* > > > > =A0 =A0* ... but also need to make sure that hotplug processing > > > > =A0 =A0* doesn't cause havoc. Like in the driver load code we d= on't > > > > --=A0 > > > > 2.5.0 > > > >=20 > > > > _______________________________________________ > > > > Intel-gfx mailing list > > > > Intel-gfx@lists.freedesktop.org > > > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx > --=20 > Cheers, > Lyude >=20 --=20 Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch