From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: Re: [PATCH 1/6] drm/i915: use VBT to determine whether to enumerate the VGA port Date: Thu, 29 May 2014 14:47:56 -0700 Message-ID: <20140529214755.GA32386@bwidawsk.net> References: <1396653132-908-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112]) by gabe.freedesktop.org (Postfix) with ESMTP id C50896E07C for ; Thu, 29 May 2014 14:48:05 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1396653132-908-1-git-send-email-jbarnes@virtuousgeek.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Apr 04, 2014 at 04:12:07PM -0700, Jesse Barnes wrote: > Some platforms may not have it, and enumerating it is both confusing and > time consuming due to the hotplug and DDC probing. > > Signed-off-by: Jesse Barnes > --- > 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 3697433..6a6406f 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -10678,7 +10678,7 @@ static void intel_setup_outputs(struct drm_device *dev) > > intel_lvds_init(dev); > > - if (!IS_ULT(dev)) > + if (!IS_ULT(dev) && dev_priv->vbt.int_crt_support) > intel_crt_init(dev); > > if (HAS_DDI(dev)) { For the love of god, can we please rename "bits X" in the struct bdb_general_features? That caused me endless pain. It should be "byte 0" Also, I guess there is a problem when the VBT is missing, and we have a dont have a CRT on non-ULT (since the default seems to be true). This however is no worse than the current situation AFAICT. Reviewed-by: Ben Widawsky -- Ben Widawsky, Intel Open Source Technology Center