drm/i915: tps3 updates, use yesno helper
Subsystems (2)
cover drm/i915: tps3 updates, use yesno helper
The remaining patches from [1] rebased on top of current nightly for convenience. Just s/intel_dp_tps3_supported/drm_dp_tps3_supported/g.
BR,
Jani.
[1] http://mid.gmane.org/[email protected]
Jani Nikula (3):
drm/i915/dp: move TPS3 logic to where it's used
drm/i915: ignore link rate in TPS3 selection
drm/i915: use the yesno helper for logging
drivers/gpu/drm/i915/i915_debugfs.c | 17 +++++++---------- drivers/gpu/drm/i915/intel_dp.c | 32 ++++++++++++++++++-------------- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_pm.c | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-)
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/3 drm/i915/dp: move TPS3 logic to where it's used
There is no need to have a separate flag for tps3 as the information is only used at one location. Move the logic there to make it easier to follow.
--- drivers/gpu/drm/i915/intel_dp.c | 31 +++++++++++++++++-------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 2 files changed, 17 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +17 -14
@@ -3812,13 +3812,25 @@ intel_dp_start_link_train(struct intel_dp *intel_dp)void intel_dp_complete_link_train (struct intel_dp *intel_dp) { +struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = dig_port->base.base.dev;bool channel_eq = false;int tries, cr_tries;uint32_t DP = intel_dp->DP;uint32_t training_pattern =DP_TRAINING_PATTERN_2 ; -/* Training Pattern 3 for HBR2 or 1.2 devices that support it*/ -if (intel_dp->link_rate ==540000 || intel_dp->use_tps3) +/* +* Training Pattern 3 for HBR2 or 1.2 devices that support it. +* +* Intel platforms that support HBR2 also support TPS3. TPS3 support is +* also mandatory for downstream devices that support HBR2. +* +* Due to WaDisableHBR2 SKL < B0 is the only exception where TPS3 is +* supported but still not enabled. +*/ +if (intel_dp->link_rate ==540000 || + (intel_dp_source_supports_hbr2 (dev) && +drm_dp_tps3_supported (intel_dp->dpcd))) training_pattern =DP_TRAINING_PATTERN_3 ;/* channel equalization */
@@ -4000,18 +4012,9 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) } } -/* Training Pattern 3 support, Intel platforms that support HBR2 alone -* have support for TP3 hence that check is used along with dpcd check -* to ensure TP3 can be enabled. -* SKL < B0: due it's WaDisableHBR2 is the only exception where TP3 is -* supported but still not enabled. -*/ -if (drm_dp_tps3_supported (intel_dp->dpcd) && -intel_dp_source_supports_hbr2 (dev)) { - intel_dp->use_tps3 = true; -DRM_DEBUG_KMS ("Displayport TPS3 supported\n" ); - }else - intel_dp->use_tps3 = false; +DRM_DEBUG_KMS ("Display Port TPS3 support: source %s, sink %s\n" , +intel_dp_source_supports_hbr2 (dev) ?"yes" :"no" , +drm_dp_tps3_supported (intel_dp->dpcd) ?"yes" :"no" );/* Intermediate frequency support */ if (is_edp(intel_dp) &&
drivers/gpu/drm/i915/intel_drv.h +0 -1
@@ -746,7 +746,6 @@ struct intel_dp {enum pipe pps_pipe;struct edp_power_seq pps_delays; -bool use_tps3;bool can_mst;/* this port supports mst */ bool is_mst;int active_mst_links;
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915: ignore link rate in TPS3 selection
In reply to Jani NikulaTPS3 is mandatory for downstream devices that support HBR2, and Intel platforms that support HBR2 also support TPS3. Whenever TPS3 is supported by both the source and sink, it should be used. In other words, whenever the source and sink are capable of 5.4 Gbps link, we should anyway go for TPS3, regardless of the link rate being selected.
Log an error if the sink has advertized HBR2 capability without TPS3 capability.
--- drivers/gpu/drm/i915/intel_dp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +4 -3
@@ -3828,10 +3828,11 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp)* Due to WaDisableHBR2 SKL < B0 is the only exception where TPS3 is * supported but still not enabled. */ -if (intel_dp->link_rate ==540000 || - (intel_dp_source_supports_hbr2 (dev) && -drm_dp_tps3_supported (intel_dp->dpcd))) +if (intel_dp_source_supports_hbr2 (dev) && +drm_dp_tps3_supported (intel_dp->dpcd)) training_pattern =DP_TRAINING_PATTERN_3 ; +else if (intel_dp->link_rate ==540000 ) +DRM_ERROR ("5.4 Gbps link rate without HBR2/TPS3 support\n" );/* channel equalization */ if (!intel_dp_set_link_train(intel_dp, &DP,
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915: use the yesno helper for logging
In reply to Jani Nikula--- drivers/gpu/drm/i915/i915_debugfs.c | 17 +++++++---------- drivers/gpu/drm/i915/intel_dp.c | 4 ++-- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- 3 files changed, 11 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -10
@@ -1382,17 +1382,16 @@ static int ironlake_drpc_info(struct seq_file *m)intel_runtime_pm_put (dev_priv);mutex_unlock (&dev->struct_mutex); -seq_printf (m,"HD boost: %s\n" , (rgvmodectl &MEMMODE_BOOST_EN ) ? -"yes" :"no" ); +seq_printf (m,"HD boost: %s\n" ,yesno (rgvmodectl &MEMMODE_BOOST_EN ));seq_printf (m,"Boost freq: %d\n" , (rgvmodectl &MEMMODE_BOOST_FREQ_MASK ) >>MEMMODE_BOOST_FREQ_SHIFT );seq_printf (m,"HW control enabled: %s\n" , - rgvmodectl &MEMMODE_HWIDLE_EN ?"yes" :"no" ); +yesno (rgvmodectl &MEMMODE_HWIDLE_EN ));seq_printf (m,"SW control enabled: %s\n" , - rgvmodectl &MEMMODE_SWMODE_EN ?"yes" :"no" ); +yesno (rgvmodectl &MEMMODE_SWMODE_EN ));seq_printf (m,"Gated voltage change: %s\n" , - rgvmodectl &MEMMODE_RCLK_GATE ?"yes" :"no" ); +yesno (rgvmodectl &MEMMODE_RCLK_GATE ));seq_printf (m,"Starting frequency: P%d\n" , (rgvmodectl &MEMMODE_FSTART_MASK ) >>MEMMODE_FSTART_SHIFT ); seq_printf(m, "Max P-state: P%d\n",
@@ -1401,7 +1400,7 @@ static int ironlake_drpc_info(struct seq_file *m)seq_printf (m,"RS1 VID: %d\n" , (crstandvid &0x3f ));seq_printf (m,"RS2 VID: %d\n" , ((crstandvid >>8 ) &0x3f ));seq_printf (m,"Render standby enabled: %s\n" , - (rstdbyctl &RCX_SW_EXIT ) ?"no" :"yes" ); +yesno (!(rstdbyctl &RCX_SW_EXIT )));seq_puts (m,"Current RS state: " );switch (rstdbyctl &RSX_STATUS_MASK ) {case RSX_STATUS_ON :
@@ -2844,8 +2843,7 @@ static void intel_dp_info(struct seq_file *m,struct intel_dp *intel_dp =enc_to_intel_dp (&intel_encoder->base);seq_printf (m,"\tDPCD rev: %x\n" , intel_dp->dpcd[DP_DPCD_REV ]); -seq_printf (m,"\taudio support: %s\n" , intel_dp->has_audio ?"yes" : -"no" ); +seq_printf (m,"\taudio support: %s\n" ,yesno (intel_dp->has_audio));if (intel_encoder->type ==INTEL_OUTPUT_EDP )intel_panel_info (m, &intel_connector->panel); }
@@ -2856,8 +2854,7 @@ static void intel_hdmi_info(struct seq_file *m,struct intel_encoder *intel_encoder = intel_connector->encoder;struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&intel_encoder->base); -seq_printf (m,"\taudio support: %s\n" , intel_hdmi->has_audio ?"yes" : -"no" ); +seq_printf (m,"\taudio support: %s\n" ,yesno (intel_hdmi->has_audio)); } static void intel_lvds_info(struct seq_file *m,
drivers/gpu/drm/i915/intel_dp.c +2 -2
@@ -4014,8 +4014,8 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) }DRM_DEBUG_KMS ("Display Port TPS3 support: source %s, sink %s\n" , -intel_dp_source_supports_hbr2 (dev) ?"yes" :"no" , -drm_dp_tps3_supported (intel_dp->dpcd) ?"yes" :"no" ); +yesno (intel_dp_source_supports_hbr2 (dev)), +yesno (drm_dp_tps3_supported (intel_dp->dpcd)));/* Intermediate frequency support */ if (is_edp(intel_dp) &&
drivers/gpu/drm/i915/intel_pm.c +2 -2
@@ -5549,7 +5549,7 @@ static void cherryview_enable_rps(struct drm_device *dev)/* RPS code assumes GPLL is used */ WARN_ONCE ((val &GPLLENABLE ) ==0 ,"GPLL not enabled\n" ); -DRM_DEBUG_DRIVER ("GPLL enabled? %s\n" , val &GPLLENABLE ?"yes" :"no" ); +DRM_DEBUG_DRIVER ("GPLL enabled? %s\n" ,yesno (val &GPLLENABLE ));DRM_DEBUG_DRIVER ("GPU status: 0x%08x\n" , val); dev_priv->rps.cur_freq = (val >>8 ) &0xff ;
@@ -5639,7 +5639,7 @@ static void valleyview_enable_rps(struct drm_device *dev)/* RPS code assumes GPLL is used */ WARN_ONCE ((val &GPLLENABLE ) ==0 ,"GPLL not enabled\n" ); -DRM_DEBUG_DRIVER ("GPLL enabled? %s\n" , val &GPLLENABLE ?"yes" :"no" ); +DRM_DEBUG_DRIVER ("GPLL enabled? %s\n" ,yesno (val &GPLLENABLE ));DRM_DEBUG_DRIVER ("GPU status: 0x%08x\n" , val); dev_priv->rps.cur_freq = (val >>8 ) &0xff ;
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 2 lines · Jani Nikula
The remaining patches from [1] rebased on top of current nightly for convenience. Just s/intel_dp_tps3_supported/drm_dp_tps3_supported/g.
Thanks for rebasing, all applied to dinq.
-Daniel
Quoted 20 lines
BR,
Jani.[1] http://mid.gmane.org/[email protected]
Jani Nikula (3):
drm/i915/dp: move TPS3 logic to where it's used
drm/i915: ignore link rate in TPS3 selection
drm/i915: use the yesno helper for loggingdrivers/gpu/drm/i915/i915_debugfs.c | 17 +++++++---------- drivers/gpu/drm/i915/intel_dp.c | 32 ++++++++++++++++++-------------- drivers/gpu/drm/i915/intel_drv.h | 1 - drivers/gpu/drm/i915/intel_pm.c | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-)Signature · 1 line
2.1.4
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx