From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Wed, 9 Apr 2014 10:28:23 +0000 (+0300)
Subject: drm/i915/chv: CHV doesn't have CRT output
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7895a81dcfc23b9fa89a0f4f75af7abf7c6c71ed;p=deliverable%2Flinux.git

drm/i915/chv: CHV doesn't have CRT output

No CRT output on CHV, so don't call intel_crt_init().

v2: Don't disable CRT on HAS.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> (v1)
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
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 478656d8f5ea..5b586e9cb8de 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -10963,7 +10963,7 @@ static void intel_setup_outputs(struct drm_device *dev)
 
 	intel_lvds_init(dev);
 
-	if (!IS_ULT(dev))
+	if (!IS_ULT(dev) && !IS_CHERRYVIEW(dev))
 		intel_crt_init(dev);
 
 	if (HAS_DDI(dev)) {