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

Commit eceb784c authored by Zhenyu Wang's avatar Zhenyu Wang Committed by Eric Anholt
Browse files

drm/i915: disable hotplug detect before Ironlake CRT detect 



This tries to fix CRT detect loop hang seen on some Ironlake form
factor, to clear up hotplug detect state before taking CRT detect
to make sure next hotplug detect cycle is consistent.

Cc: Stable Team <stable@kernel.org>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 92dcffb9

drivers/gpu/drm/i915/intel_crt.c

+3 −0
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector) 
	adpa = I915_READ(PCH_ADPA);



	adpa &= ~ADPA_CRT_HOTPLUG_MASK;

	/* disable HPD first */

	I915_WRITE(PCH_ADPA, adpa);

	(void)I915_READ(PCH_ADPA);



	adpa |= (ADPA_CRT_HOTPLUG_PERIOD_128 |

			ADPA_CRT_HOTPLUG_WARMUP_10MS |