On Wed, 12 Nov 2014, Dave Airlie <airlied@xxxxxxxxx> wrote: > From: Jani Nikula <jani.nikula@xxxxxxxxx> > > original upstream commit: 7809a61176b385ebb3299ea43c58b1bb31ffb8c0 > > Ivybridge + 30" monitor prints a drm error on every modeset, since IVB > doesn't support DP3 we should even bother trying to use it. > > This regression has been introduced in > > commit 06ea66b6bb445043dc25a9626254d5c130093199 > Author: Todd Previte <tprevite@xxxxxxxxx> > Date: Mon Jan 20 10:19:39 2014 -0700 > > drm/i915: Enable 5.4Ghz (HBR2) link rate for Displayport 1.2-capable > devices > > Reported-by: Dave Airlie <airlied@xxxxxxxxxx> > Reference: http://mid.gmane.org/1414566170-9868-1-git-send-email-airlied@xxxxxxxxx > Cc: Todd Previte <tprevite@xxxxxxxxx> > Cc: stable@xxxxxxxxxxxxxxx (3.15+) > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_dp.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index fdff1d4..59787f7 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -3347,9 +3347,10 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) > } > } > > - /* Training Pattern 3 support */ > + /* Training Pattern 3 support, both source and sink */ > if (intel_dp->dpcd[DP_DPCD_REV] >= 0x12 && > - intel_dp->dpcd[DP_MAX_LANE_COUNT] & DP_TPS3_SUPPORTED) { > + intel_dp->dpcd[DP_MAX_LANE_COUNT] & DP_TPS3_SUPPORTED && > + (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8)) { I think you'll have to use IS_HASWELL(dev) and INTEL_INFO(dev) here for stable kernels. BR, Jani. > intel_dp->use_tps3 = true; > DRM_DEBUG_KMS("Displayport TPS3 supported"); > } else > -- > 1.9.3 > -- Jani Nikula, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html