From mboxrd@z Thu Jan  1 00:00:00 1970
From: Lyude Paul <cpaul@redhat.com>
Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915: Call intel_dp_mst_resume()
 before resuming displays
Date: Wed, 16 Mar 2016 17:49:53 -0400
Message-ID: <1458164993.5551.1.camel@redhat.com>
References: <1457711822-20335-1-git-send-email-cpaul@redhat.com>
	 <1457711822-20335-2-git-send-email-cpaul@redhat.com>
	 <20160313184526.GL14170@phenom.ffwll.local>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <stable-owner@vger.kernel.org>
In-Reply-To: <20160313184526.GL14170@phenom.ffwll.local>
Sender: stable-owner@vger.kernel.org
To: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org, David Airlie <airlied@linux.ie>, stable@vger.kernel.org, "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow...,  linux-kernel@vger.kernel.org open list" <dri-devel@lists.freedesktop.org>, Daniel Vetter <daniel.vetter@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

On Sun, 2016-03-13 at 19:45 +0100, Daniel Vetter wrote:
> On Fri, Mar 11, 2016 at 10:57:01AM -0500, Lyude wrote:
> >=20
> > Since we need MST devices ready before we try to resume displays,
> > calling this after intel_display_resume() can result in some issues=
 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 s=
tate")
> >=20
> > In order to fix some unclaimed register errors, however the actual =
cause
> > of those has since been fixed.
> >=20
> > CC: stable@vger.kernel.org
> > Signed-off-by: Lyude <cpaul@redhat.com>
> 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
> > ---
> > =C2=A0drivers/gpu/drm/i915/i915_drv.c | 4 ++--
> > =C2=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_device =
*dev)
> > =C2=A0		dev_priv->display.hpd_irq_setup(dev);
> > =C2=A0	spin_unlock_irq(&dev_priv->irq_lock);
> > =C2=A0
> > +	intel_dp_mst_resume(dev);
> > +
> > =C2=A0	drm_modeset_lock_all(dev);
> > =C2=A0	intel_display_resume(dev);
> > =C2=A0	drm_modeset_unlock_all(dev);
> > =C2=A0
> > -	intel_dp_mst_resume(dev);
> > -
> > =C2=A0	/*
> > =C2=A0	=C2=A0* ... but also need to make sure that hotplug processi=
ng
> > =C2=A0	=C2=A0* doesn't cause havoc. Like in the driver load code we=
 don't
> > --=C2=A0
> > 2.5.0
> >=20
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx