From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f67.google.com ([74.125.82.67]:34288 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751684AbcCMSok (ORCPT ); Sun, 13 Mar 2016 14:44:40 -0400 Received: by mail-wm0-f67.google.com with SMTP id p65so11472567wmp.1 for ; Sun, 13 Mar 2016 11:44:39 -0700 (PDT) Date: Sun, 13 Mar 2016 19:45:26 +0100 From: Daniel Vetter To: Lyude Cc: intel-gfx@lists.freedesktop.org, David Airlie , stable@vger.kernel.org, "open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list" , Daniel Vetter Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915: Call intel_dp_mst_resume() before resuming displays Message-ID: <20160313184526.GL14170@phenom.ffwll.local> References: <1457711822-20335-1-git-send-email-cpaul@redhat.com> <1457711822-20335-2-git-send-email-cpaul@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1457711822-20335-2-git-send-email-cpaul@redhat.com> Sender: stable-owner@vger.kernel.org List-ID: On Fri, Mar 11, 2016 at 10:57:01AM -0500, Lyude wrote: > 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. > > This order was originally changed in > > commit e7d6f7d70829 ("drm/i915: resume MST after reading back hw state") > > In order to fix some unclaimed register errors, however the actual cause > of those has since been fixed. > > 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 > --- > drivers/gpu/drm/i915/i915_drv.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > 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) > dev_priv->display.hpd_irq_setup(dev); > spin_unlock_irq(&dev_priv->irq_lock); > > + intel_dp_mst_resume(dev); > + > drm_modeset_lock_all(dev); > intel_display_resume(dev); > drm_modeset_unlock_all(dev); > > - intel_dp_mst_resume(dev); > - > /* > * ... but also need to make sure that hotplug processing > * doesn't cause havoc. Like in the driver load code we don't > -- > 2.5.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch