From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915/lvds: don't restore hw state in the lid notifier for pch platforms Date: Mon, 2 Dec 2013 15:10:59 +0100 Message-ID: <20131202141059.GC27344@phenom.ffwll.local> References: <1381308432-25628-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com [209.85.215.182]) by gabe.freedesktop.org (Postfix) with ESMTP id 8EFDCFACD2 for ; Mon, 2 Dec 2013 06:10:15 -0800 (PST) Received: by mail-ea0-f182.google.com with SMTP id o10so12657333eaj.27 for ; Mon, 02 Dec 2013 06:10:14 -0800 (PST) Content-Disposition: inline In-Reply-To: <1381308432-25628-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Intel Graphics Development Cc: Roland Dreier , Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org On Wed, Oct 09, 2013 at 10:47:12AM +0200, Daniel Vetter wrote: > It's a pain for two reasons: > - The vga plane redisablign requires actual legacy vgao i/o to pull > of. The hw engineers really botched this one here :( > - There seem to be some BIOS out there which send out lid events when > unplugging. Together with our broken DP code, which disables the > port when the cable is lost, this results in an immediate modeset > call, which can hang on the wait for outstanding flips. > > Cc: Roland Dreier > Signed-off-by: Daniel Vetter I've pimped the commit message a bit (added another bz reference) and merged this one with Chris' irc-ack to dinq. -Daniel > --- > drivers/gpu/drm/i915/intel_lvds.c | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c > index ae0c843..19d055d 100644 > --- a/drivers/gpu/drm/i915/intel_lvds.c > +++ b/drivers/gpu/drm/i915/intel_lvds.c > @@ -443,9 +443,19 @@ static int intel_lid_notify(struct notifier_block *nb, unsigned long val, > if (dev_priv->modeset_restore == MODESET_DONE) > goto exit; > > - drm_modeset_lock_all(dev); > - intel_modeset_setup_hw_state(dev, true); > - drm_modeset_unlock_all(dev); > + /* > + * Some old platform's BIOS love to wreak havoc while the lid is closed. > + * We try to detect this here and undo any damage. The split for PCH > + * platforms is rather conservative and a bit arbitrary expect that on > + * those platforms VGA disabling requires actual legacy VGA I/O access, > + * and as part of the cleanup in the hw state restore we also redisable > + * the vga plane. > + */ > + if (!HAS_PCH_SPLIT(dev)) { > + drm_modeset_lock_all(dev); > + intel_modeset_setup_hw_state(dev, true); > + drm_modeset_unlock_all(dev); > + } > > dev_priv->modeset_restore = MODESET_DONE; > > -- > 1.8.4.rc3 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch