drm/dp: add drm_dp_tps3_supported helper
Subsystems (3)
PATCH 1/3 drm/dp: add drm_dp_tps3_supported helper
Cc Thierry Reding <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
--- include/drm/drm_dp_helper.h | 7 +++++++ 1 file changed, 7 insertions(+)
include/drm/drm_dp_helper.h +7 -0
@@ -634,6 +634,13 @@ drm_dp_enhanced_frame_cap(const u8 dpcd[DP_RECEIVER_CAP_SIZE]) (dpcd[DP_MAX_LANE_COUNT ] &DP_ENHANCED_FRAME_CAP ); } +static inline bool +drm_dp_tps3_supported (const u8 dpcd[DP_RECEIVER_CAP_SIZE ]) +{ +return dpcd[DP_DPCD_REV ] >=0x12 && + dpcd[DP_MAX_LANE_COUNT ] &DP_TPS3_SUPPORTED ; +} +/* * DisplayPort AUX channel */
Signature · 6 lines
2.1.4 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/3 drm/i915/dp: use the drm dp helper for determining sink tps3 support
No functional changes.
Signed-off-by Jani Nikula <[email protected]>
--- drivers/gpu/drm/i915/intel_dp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +1 -2
@@ -3940,8 +3940,7 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)* SKL < B0: due it's WaDisableHBR2 is the only exception where TP3 is * supported but still not enabled. */ -if (intel_dp->dpcd[DP_DPCD_REV ] >=0x12 && - intel_dp->dpcd[DP_MAX_LANE_COUNT ] &DP_TPS3_SUPPORTED && +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" );
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/dp: move TPS3 logic to where it's used
In reply to Jani NikulaThere 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.
Signed-off-by Jani Nikula <[email protected]>
--- 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
@@ -3746,13 +3746,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 */
@@ -3934,18 +3946,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
@@ -743,7 +743,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 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 2 lines · Jani Nikula
Cc Thierry Reding <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Quoted 25 lines
--- include/drm/drm_dp_helper.h | 7 +++++++ 1 file changed, 7 insertions(+)include/drm/drm_dp_helper.h +7
-1@@ -634,6 +634,13 @@ drm_dp_enhanced_frame_cap(const u8 dpcd[DP_RECEIVER_CAP_SIZE]) (dpcd[DP_MAX_LANE_COUNT ] &DP_ENHANCED_FRAME_CAP ); } +static inline bool +drm_dp_tps3_supported (const u8 dpcd[DP_RECEIVER_CAP_SIZE ]) +{ +return dpcd[DP_DPCD_REV ] >=0x12 && + dpcd[DP_MAX_LANE_COUNT ] &DP_TPS3_SUPPORTED ; +} +/* * DisplayPort AUX channel */ --2.1.4
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel