Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c40c0f5b authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

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: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6af79ae2

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {