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

Commit de31facd authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

drm/i915/skl: port A fuse straps don't work on early SKL steppings 



So try to enumerate eDP unconditionally in those cases.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
[danvet: Add wa tag Damien dug out.]
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1d2b9526

drivers/gpu/drm/i915/intel_display.c

+8 −3
Original line number Diff line number Diff line
@@ -12583,10 +12583,15 @@ static void intel_setup_outputs(struct drm_device *dev) 
	if (HAS_DDI(dev)) {

		int found;



		/* Haswell uses DDI functions to detect digital outputs */

		/*

		 * Haswell uses DDI functions to detect digital outputs.

		 * On SKL pre-D0 the strap isn't connected, so we assume

		 * it's there.

		 */

		found = I915_READ(DDI_BUF_CTL_A) & DDI_INIT_DISPLAY_DETECTED;

		/* DDI A only supports eDP */

		if (found)

		/* WaIgnoreDDIAStrap: skl */

		if (found ||

		    (IS_SKYLAKE(dev) && INTEL_REVID(dev) < SKL_REVID_D0))

			intel_ddi_init(dev, PORT_A);



		/* DDI B, C and D detection is indicated by the SFUSE_STRAP