From: Paulo Zanoni Date: Fri, 12 Apr 2013 21:16:53 +0000 (-0300) Subject: drm/i915: don't intel_crt_init on any ULT machines X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c40c0f5bd5b0f09e4386d2cf26c96c89c45ee539;p=linux-beck.git 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 Signed-off-by: Daniel Vetter --- 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) I915_WRITE(PFIT_CONTROL, 0); } - if (!(HAS_DDI(dev) && (I915_READ(DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES))) + if (!IS_ULT(dev)) intel_crt_init(dev); if (HAS_DDI(dev)) {