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-Tag: v3.9.2~34 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3d853eee7ad906d15f54bd0c4547346b7077bc7b;p=users%2Fdwmw2%2Flinux.git drm/i915: don't intel_crt_init on any ULT machines commit c40c0f5bd5b0f09e4386d2cf26c96c89c45ee539 upstream. 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. Signed-off-by: Paulo Zanoni Signed-off-by: Daniel Vetter Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index f9ac54a2dc1e2..c2bb2d9d9b3a7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8326,7 +8326,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)) {