diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2013-04-12 17:16:53 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-18 03:43:27 -0400 |
| commit | c40c0f5bd5b0f09e4386d2cf26c96c89c45ee539 (patch) | |
| tree | 66372204a185df29c1b9d50e0a01f2c0cb00fb5c | |
| parent | 6af79ae2ae81efb2abd42d908041aa6ac0db9d43 (diff) | |
drm/i915: don't intel_crt_init on any ULT machines
We may have DDI_BUF_CTL(PORT_A) configured with 2 lanes and still not
have CRT, so just check for !IS_ULT. This problem happened on a real
machine and resulted in a very ugly dmesg.
Cc: stable@vger.kernel.org
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@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 1bbf7071e0c4..6a8262867b0b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -8495,7 +8495,7 @@ static void intel_setup_outputs(struct drm_device *dev) | |||
| 8495 | I915_WRITE(PFIT_CONTROL, 0); | 8495 | I915_WRITE(PFIT_CONTROL, 0); |
| 8496 | } | 8496 | } |
| 8497 | 8497 | ||
| 8498 | if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES))) | 8498 | if (!IS_ULT(dev)) |
| 8499 | intel_crt_init(dev); | 8499 | intel_crt_init(dev); |
| 8500 | 8500 | ||
| 8501 | if (HAS_DDI(dev)) { | 8501 | if (HAS_DDI(dev)) { |