From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri, 4 Apr 2014 23:12:07 +0000 (-0700)
Subject: drm/i915: use VBT to determine whether to enumerate the VGA port
X-Git-Tag: next-20140604~53^2~17
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9c2a03c2a194c086949f25d332937ac8dc4d9f7e;p=karo-tx-linux.git

drm/i915: use VBT to determine whether to enumerate the VGA port

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 <jbarnes@virtuousgeek.org>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0875992c65ed..30898ad45b9d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -11090,7 +11090,7 @@ static void intel_setup_outputs(struct drm_device *dev)
 
 	intel_lvds_init(dev);
 
-	if (!IS_ULT(dev) && !IS_CHERRYVIEW(dev))
+	if (!IS_ULT(dev) && !IS_CHERRYVIEW(dev) && dev_priv->vbt.int_crt_support)
 		intel_crt_init(dev);
 
 	if (HAS_DDI(dev)) {