diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-04-09 13:28:23 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-13 14:13:18 +0200 |
| commit | 7895a81dcfc23b9fa89a0f4f75af7abf7c6c71ed (patch) | |
| tree | 9efb3b13fc7db01a283484dbbcb25fda6bbcce87 | |
| parent | 70b23a980ea0e4048a6377eae50ebd0fd6f50922 (diff) | |
| download | op-kernel-dev-7895a81dcfc23b9fa89a0f4f75af7abf7c6c71ed.zip op-kernel-dev-7895a81dcfc23b9fa89a0f4f75af7abf7c6c71ed.tar.gz | |
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>
| -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 478656d..5b586e9 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)) { |
