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

Commit 61e499bf authored by Keith Packard's avatar Keith Packard
Browse files

drm/i915: FDI link training broken on Ironlake by Ivybridge integration 



Commit 357555c0 split out IVB-specific
register definitions for FDI link training, but a piece of that commit
stopped executing some critical code on Ironlake systems while leaving
it running on Sandybridge.

Turn that code back on both Ironlake and Sandybridge

Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent a51f7a66

drivers/gpu/drm/i915/intel_display.c

+4 −4
Original line number Diff line number Diff line
@@ -2056,12 +2056,12 @@ static void intel_fdi_normal_train(struct drm_crtc *crtc) 
	/* enable normal train */

	reg = FDI_TX_CTL(pipe);

	temp = I915_READ(reg);

	if (IS_GEN6(dev)) {

		temp &= ~FDI_LINK_TRAIN_NONE;

		temp |= FDI_LINK_TRAIN_NONE | FDI_TX_ENHANCE_FRAME_ENABLE;

	} else if (IS_IVYBRIDGE(dev)) {

	if (IS_IVYBRIDGE(dev)) {

		temp &= ~FDI_LINK_TRAIN_NONE_IVB;

		temp |= FDI_LINK_TRAIN_NONE_IVB | FDI_TX_ENHANCE_FRAME_ENABLE;

	} else {

		temp &= ~FDI_LINK_TRAIN_NONE;

		temp |= FDI_LINK_TRAIN_NONE | FDI_TX_ENHANCE_FRAME_ENABLE;

	}

	I915_WRITE(reg, temp);