drm/i915: Simplify intel_dp_voltage_max()
Subsystems (2)
PATCH 1/2 drm/i915: Simplify intel_dp_voltage_max()
The function intel_dp_voltage_max() returns either voltage swing level 2 or level 3 for a few special cases. Simplify the if ladder by grouping the few special cases that cause it return level 3. Make it clearer that level 2 is the default by putting it out of the else condition.
--- drivers/gpu/drm/i915/intel_dp.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +8 -11
@@ -3066,20 +3066,17 @@ intel_dp_voltage_max(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv = dev->dev_private;enum port port =dp_to_dig_port (intel_dp)->port; -if (IS_BROXTON (dev)) +if (IS_BROXTON (dev) ||IS_VALLEYVIEW (dev))return DP_TRAIN_VOLTAGE_SWING_LEVEL_3 ; -else if (INTEL_INFO (dev)->gen >=9 ) { -if (dev_priv->edp_low_vswing && port ==PORT_A ) -return DP_TRAIN_VOLTAGE_SWING_LEVEL_3 ; -return DP_TRAIN_VOLTAGE_SWING_LEVEL_2 ; - }else if (IS_VALLEYVIEW (dev)) + +if (INTEL_INFO (dev)->gen >=9 && + dev_priv->edp_low_vswing && port ==PORT_A )return DP_TRAIN_VOLTAGE_SWING_LEVEL_3 ; -else if (IS_GEN7 (dev) && port ==PORT_A ) -return DP_TRAIN_VOLTAGE_SWING_LEVEL_2 ; -else if (HAS_PCH_CPT (dev) && port !=PORT_A ) + +if (HAS_PCH_CPT (dev) && port !=PORT_A )return DP_TRAIN_VOLTAGE_SWING_LEVEL_3 ; -else -return DP_TRAIN_VOLTAGE_SWING_LEVEL_2 ; + +return DP_TRAIN_VOLTAGE_SWING_LEVEL_2 ; }uint8_t
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Simplify intel_dp_pre_emphasis_max()
Simplify intel_dp_pre_emphasis_max() by grouping the conditions for VLV, HSW, BDW and gen 9 together, since they all use the same values.
--- drivers/gpu/drm/i915/intel_dp.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +2 -27
@@ -3085,7 +3085,7 @@ intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing)struct drm_device *dev =intel_dp_to_dev (intel_dp);enum port port =dp_to_dig_port (intel_dp)->port; -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_INFO (dev)->gen >=7 || !IS_IVYBRIDGE (dev)) {switch (voltage_swing &DP_TRAIN_VOLTAGE_SWING_MASK ) {case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 :return DP_TRAIN_PRE_EMPH_LEVEL_3 ;
@@ -3094,35 +3094,10 @@ intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing)case DP_TRAIN_VOLTAGE_SWING_LEVEL_2 :return DP_TRAIN_PRE_EMPH_LEVEL_1 ;case DP_TRAIN_VOLTAGE_SWING_LEVEL_3 : -return DP_TRAIN_PRE_EMPH_LEVEL_0 ;default :return DP_TRAIN_PRE_EMPH_LEVEL_0 ; } - }else if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) { -switch (voltage_swing &DP_TRAIN_VOLTAGE_SWING_MASK ) { -case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 : -return DP_TRAIN_PRE_EMPH_LEVEL_3 ; -case DP_TRAIN_VOLTAGE_SWING_LEVEL_1 : -return DP_TRAIN_PRE_EMPH_LEVEL_2 ; -case DP_TRAIN_VOLTAGE_SWING_LEVEL_2 : -return DP_TRAIN_PRE_EMPH_LEVEL_1 ; -case DP_TRAIN_VOLTAGE_SWING_LEVEL_3 : -default : -return DP_TRAIN_PRE_EMPH_LEVEL_0 ; - } - }else if (IS_VALLEYVIEW (dev)) { -switch (voltage_swing &DP_TRAIN_VOLTAGE_SWING_MASK ) { -case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 : -return DP_TRAIN_PRE_EMPH_LEVEL_3 ; -case DP_TRAIN_VOLTAGE_SWING_LEVEL_1 : -return DP_TRAIN_PRE_EMPH_LEVEL_2 ; -case DP_TRAIN_VOLTAGE_SWING_LEVEL_2 : -return DP_TRAIN_PRE_EMPH_LEVEL_1 ; -case DP_TRAIN_VOLTAGE_SWING_LEVEL_3 : -default : -return DP_TRAIN_PRE_EMPH_LEVEL_0 ; - } - }else if (IS_GEN7 (dev) && port ==PORT_A ) { + }else if (IS_IVYBRIDGE (dev) && port ==PORT_A ) {switch (voltage_swing &DP_TRAIN_VOLTAGE_SWING_MASK ) {case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 :return DP_TRAIN_PRE_EMPH_LEVEL_2 ;
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Simplify intel_dp_pre_emphasis_max()
Please ignore these two patches. They contain errors and are superseded by a new patch series I just sent.
Ander
Quoted 58 lines · Ander Conselvan de Oliveira
Simplify
intel_dp_pre_emphasis_max()by grouping the conditions for VLV, HSW, BDW and gen 9 together, since they all use the same values.Signed-off-by Ander Conselvan de Oliveira <[email protected]>--- drivers/gpu/drm/i915/intel_dp.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)drivers/gpu/drm/i915/intel_dp.c +2
-27@@ -3085,7 +3085,7 @@ intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing)struct drm_device *dev =intel_dp_to_dev (intel_dp);enum port port =dp_to_dig_port (intel_dp)->port; -if (INTEL_INFO (dev)->gen >=9 ) { +if (INTEL_INFO (dev)->gen >=7 || !IS_IVYBRIDGE (dev)) {switch (voltage_swing &DP_TRAIN_VOLTAGE_SWING_MASK ) {case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 :return DP_TRAIN_PRE_EMPH_LEVEL_3 ;@@ -3094,35 +3094,10 @@ intel_dp_pre_emphasis_max(struct intel_dp *intel_dp, uint8_t voltage_swing)case DP_TRAIN_VOLTAGE_SWING_LEVEL_2 :return DP_TRAIN_PRE_EMPH_LEVEL_1 ;case DP_TRAIN_VOLTAGE_SWING_LEVEL_3 : -return DP_TRAIN_PRE_EMPH_LEVEL_0 ;default :return DP_TRAIN_PRE_EMPH_LEVEL_0 ; } - }else if (IS_HASWELL (dev) ||IS_BROADWELL (dev)) { -switch (voltage_swing &DP_TRAIN_VOLTAGE_SWING_MASK ) { -case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 : -return DP_TRAIN_PRE_EMPH_LEVEL_3 ; -case DP_TRAIN_VOLTAGE_SWING_LEVEL_1 : -return DP_TRAIN_PRE_EMPH_LEVEL_2 ; -case DP_TRAIN_VOLTAGE_SWING_LEVEL_2 : -return DP_TRAIN_PRE_EMPH_LEVEL_1 ; -case DP_TRAIN_VOLTAGE_SWING_LEVEL_3 : -default : -return DP_TRAIN_PRE_EMPH_LEVEL_0 ; - } - }else if (IS_VALLEYVIEW (dev)) { -switch (voltage_swing &DP_TRAIN_VOLTAGE_SWING_MASK ) { -case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 : -return DP_TRAIN_PRE_EMPH_LEVEL_3 ; -case DP_TRAIN_VOLTAGE_SWING_LEVEL_1 : -return DP_TRAIN_PRE_EMPH_LEVEL_2 ; -case DP_TRAIN_VOLTAGE_SWING_LEVEL_2 : -return DP_TRAIN_PRE_EMPH_LEVEL_1 ; -case DP_TRAIN_VOLTAGE_SWING_LEVEL_3 : -default : -return DP_TRAIN_PRE_EMPH_LEVEL_0 ; - } - }else if (IS_GEN7 (dev) && port ==PORT_A ) { + }else if (IS_IVYBRIDGE (dev) && port ==PORT_A ) {switch (voltage_swing &DP_TRAIN_VOLTAGE_SWING_MASK ) {case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 :
Quoted 1 line
return
DP_TRAIN_PRE_EMPH_LEVEL_2;
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx