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

Commit e3ef4479 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Fix DP enhanced framing for CPT 



Currently we're always enabling enhanced framing on CPT even if the sink
doesn't support it. Fix this up by actaully looking at what the sink
tells us.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent adc289d7

drivers/gpu/drm/i915/intel_display.c

+1 −2
Original line number Diff line number Diff line
@@ -4168,8 +4168,7 @@ static void ironlake_pch_enable(struct drm_crtc *crtc) 
		temp &= ~(TRANS_DP_PORT_SEL_MASK |

			  TRANS_DP_SYNC_MASK |

			  TRANS_DP_BPC_MASK);

		temp |= (TRANS_DP_OUTPUT_ENABLE |

			 TRANS_DP_ENH_FRAMING);

		temp |= TRANS_DP_OUTPUT_ENABLE;

		temp |= bpc << 9; /* same format but at 11:9 */



		if (crtc->mode.flags & DRM_MODE_FLAG_PHSYNC)

drivers/gpu/drm/i915/intel_dp.c

+9 −0
Original line number Diff line number Diff line
@@ -1582,7 +1582,16 @@ static void intel_dp_prepare(struct intel_encoder *encoder) 


		intel_dp->DP |= crtc->pipe << 29;

	} else if (HAS_PCH_CPT(dev) && port != PORT_A) {

		u32 trans_dp;



		intel_dp->DP |= DP_LINK_TRAIN_OFF_CPT;



		trans_dp = I915_READ(TRANS_DP_CTL(crtc->pipe));

		if (drm_dp_enhanced_frame_cap(intel_dp->dpcd))

			trans_dp |= TRANS_DP_ENH_FRAMING;

		else

			trans_dp &= ~TRANS_DP_ENH_FRAMING;

		I915_WRITE(TRANS_DP_CTL(crtc->pipe), trans_dp);

	} else {

		if (!HAS_PCH_SPLIT(dev) && !IS_VALLEYVIEW(dev))

			intel_dp->DP |= intel_dp->color_range;