From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 09/15] drm/i915: Ignore VBT int_crt_support on 830M Date: Fri, 6 Jun 2014 19:00:00 +0200 Message-ID: <20140606170000.GL7416@phenom.ffwll.local> References: <1401984964-25441-1-git-send-email-ville.syrjala@linux.intel.com> <1401984964-25441-10-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by gabe.freedesktop.org (Postfix) with ESMTP id ABE5E6EA92 for ; Fri, 6 Jun 2014 10:00:04 -0700 (PDT) Received: by mail-wi0-f170.google.com with SMTP id bs8so1347990wib.3 for ; Fri, 06 Jun 2014 10:00:03 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1401984964-25441-10-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: ville.syrjala@linux.intel.com Cc: Thomas Richter , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, Jun 05, 2014 at 07:15:58PM +0300, ville.syrjala@linux.intel.com wro= te: > From: Ville Syrj=E4l=E4 > = > My Fujitsu-Siemens Lifebook S6010 definitely has a VGA connector, but > the VBT says different. Ignore the VBT for 830M since it seems such > old machines would generally have a VGA connector. > = > This is a regression caused by: > commit 9c2a03c2a194c086949f25d332937ac8dc4d9f7e > Author: Jesse Barnes > Date: Fri Apr 4 16:12:07 2014 -0700 > = > drm/i915: use VBT to determine whether to enumerate the VGA port > = > While at it refactor the code a bit to be more pleasing to the eye. > = > Signed-off-by: Ville Syrj=E4l=E4 Well I think now's the time to move those checks into intel_crt_init. We don't care at all whether we have a vga port, and imo that way it's cleaner. eDP/mipi dsi and similar checks are also done in the _init functions. -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > = > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index b5cbb28..3d51ceb 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -11368,6 +11368,21 @@ const char *intel_output_name(int output) > return names[output]; > } > = > +static bool intel_crt_support(struct drm_device *dev) > +{ > + struct drm_i915_private *dev_priv =3D dev->dev_private; > + > + /* no hardware support whatsoever */ > + if (IS_ULT(dev) || IS_CHERRYVIEW(dev)) > + return false; > + > + /* Fujitsu-Siemens Lifebook S6010 VBT lies */ > + if (IS_I830(dev)) > + return true; > + > + return dev_priv->vbt.int_crt_support; > +} > + > static void intel_setup_outputs(struct drm_device *dev) > { > struct drm_i915_private *dev_priv =3D dev->dev_private; > @@ -11376,7 +11391,7 @@ static void intel_setup_outputs(struct drm_device= *dev) > = > intel_lvds_init(dev); > = > - if (!IS_ULT(dev) && !IS_CHERRYVIEW(dev) && dev_priv->vbt.int_crt_suppor= t) > + if (intel_crt_support(dev)) > intel_crt_init(dev); > = > if (HAS_DDI(dev)) { > -- = > 1.8.5.5 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch