diff options
| author |   Jesse Barnes <jbarnes@virtuousgeek.org> | 2014-04-04 16:12:07 -0700 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-05 08:52:42 +0200 |
| commit | 27da3bdfcf7f5233cdfe4563f53edf1ecab7cea0 (patch) | |
| tree | 40b01fe675a72e4e82e273a67f1da395809a9d30 | |
| parent | drm/i915: Don't WARN about ring idle bit on gen2 (diff) | |
| download | wireguard-linux-27da3bdfcf7f5233cdfe4563f53edf1ecab7cea0.tar.xz wireguard-linux-27da3bdfcf7f5233cdfe4563f53edf1ecab7cea0.zip | |
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>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index de5992b71ed9..ea0b5df226fb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11106,7 +11106,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)) { |