From: Daniel Vetter Subject: Re: [PATCH v2] drm/i915: ignore pipe select bit when checking for LVDS register initialization Date: Wed, 13 Jun 2012 21:46:15 +0200 Message-ID: <20120613194614.GP4829@phenom.ffwll.local> References: <20120613162544.GJ4829@phenom.ffwll.local> <1339613218-4699-1-git-send-email-seth.forshee@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id E0C589E776 for ; Wed, 13 Jun 2012 12:44:44 -0700 (PDT) Received: by wibhm14 with SMTP id hm14so4180530wib.12 for ; Wed, 13 Jun 2012 12:44:43 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1339613218-4699-1-git-send-email-seth.forshee@canonical.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Seth Forshee Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org On Wed, Jun 13, 2012 at 01:46:58PM -0500, Seth Forshee wrote: > The Lenovo Thinkpad T410 has the LVDS_PIPEB_SELECT bit set in the LVDS > register when booted with the lid closed, even though the LVDS hasn't > really been initialized. Ignore this bit so that the VBT value will be > used instead. > > Signed-off-by: Seth Forshee Queued for -next, thanks for the patch. Chris had some reservations about the sanity of this patch, but given that it works around bios-insanity I'm gonna just take this chance to stab myself with lvds-machines blowing up left and right ;-) -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index e0aa064..ae17526 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -434,7 +434,7 @@ static bool is_dual_link_lvds(struct drm_i915_private *dev_priv, > * register is uninitialized. > */ > val = I915_READ(reg); > - if (!(val & ~LVDS_DETECTED)) > + if (!(val & ~(LVDS_PIPE_MASK | LVDS_DETECTED))) > val = dev_priv->bios_lvds_val; > dev_priv->lvds_val = val; > } > -- > 1.7.9.5 > -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48