drm/i915: consider the source max DP lane count too
Subsystems (2)
PATCH 1/3 drm/i915: consider the source max DP lane count too
From: Paulo Zanoni <[email protected]>
Even if the panel claims it can support 4 lanes, there's the possibility that the HW can't, so consider this while selecting the max lane count.
--- drivers/gpu/drm/i915/intel_dp.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +18 -2
@@ -121,6 +121,22 @@ intel_dp_max_link_bw(struct intel_dp *intel_dp)return max_link_bw; } +static u8 intel_dp_max_lane_count (struct intel_dp *intel_dp) +{ +struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = intel_dig_port->base.base.dev; +u8 source_max, sink_max; + + source_max =4 ; +if (HAS_DDI (dev) && intel_dig_port->port ==PORT_A && + (intel_dig_port->saved_port_bits &DDI_A_4_LANES ) ==0 ) + source_max =2 ; + + sink_max =drm_dp_max_lane_count (intel_dp->dpcd); + +return min (source_max, sink_max); +} +/* * The units on the numbers in the next two are... bizarre. Examples will * make it clearer; this one parallels an example in the eDP spec.
@@ -171,7 +187,7 @@ intel_dp_mode_valid(struct drm_connector *connector, } max_link_clock =drm_dp_bw_code_to_link_rate (intel_dp_max_link_bw (intel_dp)); - max_lanes =drm_dp_max_lane_count (intel_dp->dpcd); + max_lanes =intel_dp_max_lane_count (intel_dp); max_rate =intel_dp_max_data_rate (max_link_clock, max_lanes); mode_rate =intel_dp_link_required (target_clock,18 );
@@ -769,7 +785,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,struct intel_crtc *intel_crtc = encoder->new_crtc;struct intel_connector *intel_connector = intel_dp->attached_connector;int lane_count, clock; -int max_lane_count =drm_dp_max_lane_count (intel_dp->dpcd); +int max_lane_count =intel_dp_max_lane_count (intel_dp);/* Conveniently, the link BW constants become indices with a shift...*/ int max_clock =intel_dp_max_link_bw (intel_dp) >>3 ;int bpp, mode_rate;
Signature · 1 line
1.9.1
PATCH 2/3 drm/i915: clean up VBT eDP link param decoding
Use defines, do not set anything if VBT has values unknown to us.
--- drivers/gpu/drm/i915/intel_bios.c | 52 ++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/intel_bios.c +38 -14
@@ -598,47 +598,71 @@ parse_edp(struct drm_i915_private *dev_priv, struct bdb_header *bdb) dev_priv->vbt.edp_pps = *edp_pps; - dev_priv->vbt.edp_rate = edp_link_params->rate ?DP_LINK_BW_2_7 : -DP_LINK_BW_1_62 ; +switch (edp_link_params->rate) { +case EDP_RATE_1_62 : + dev_priv->vbt.edp_rate =DP_LINK_BW_1_62 ; +break ; +case EDP_RATE_2_7 : + dev_priv->vbt.edp_rate =DP_LINK_BW_2_7 ; +break ; +default : +DRM_DEBUG_KMS ("VBT has unknown eDP link rate value %u\n" , + edp_link_params->rate); +break ; + } +switch (edp_link_params->lanes) { -case 0 : +case EDP_LANE_1 : dev_priv->vbt.edp_lanes =1 ;break ; -case 1 : +case EDP_LANE_2 : dev_priv->vbt.edp_lanes =2 ;break ; -case 3 : -default : +case EDP_LANE_4 : dev_priv->vbt.edp_lanes =4 ;break ; +default : +DRM_DEBUG_KMS ("VBT has unknown eDP lane count value %u\n" , + edp_link_params->lanes); +break ; } +switch (edp_link_params->preemphasis) { -case 0 : +case EDP_PREEMPHASIS_NONE : dev_priv->vbt.edp_preemphasis =DP_TRAIN_PRE_EMPHASIS_0 ;break ; -case 1 : +case EDP_PREEMPHASIS_3_5dB: dev_priv->vbt.edp_preemphasis =DP_TRAIN_PRE_EMPHASIS_3_5 ;break ; -case 2 : +case EDP_PREEMPHASIS_6dB: dev_priv->vbt.edp_preemphasis =DP_TRAIN_PRE_EMPHASIS_6 ;break ; -case 3 : +case EDP_PREEMPHASIS_9_5dB: dev_priv->vbt.edp_preemphasis =DP_TRAIN_PRE_EMPHASIS_9_5 ;break ; +default : +DRM_DEBUG_KMS ("VBT has unknown eDP pre-emphasis value %u\n" , + edp_link_params->preemphasis); +break ; } +switch (edp_link_params->vswing) { -case 0 : +case EDP_VSWING_0_4V : dev_priv->vbt.edp_vswing =DP_TRAIN_VOLTAGE_SWING_400 ;break ; -case 1 : +case EDP_VSWING_0_6V : dev_priv->vbt.edp_vswing =DP_TRAIN_VOLTAGE_SWING_600 ;break ; -case 2 : +case EDP_VSWING_0_8V : dev_priv->vbt.edp_vswing =DP_TRAIN_VOLTAGE_SWING_800 ;break ; -case 3 : +case EDP_VSWING_1_2V : dev_priv->vbt.edp_vswing =DP_TRAIN_VOLTAGE_SWING_1200 ;break ; +default : +DRM_DEBUG_KMS ("VBT has unknown eDP voltage swing value %u\n" , + edp_link_params->vswing); +break ; } }
Signature · 1 line
1.9.1
Re: [PATCH 2/3] drm/i915: clean up VBT eDP link param decoding
Quoted 3 lines · Jani Nikula
Use defines, do not set anything if VBT has values unknown to us.
Signed-off-by Jani Nikula <[email protected]>
Signature · 1 line
Damien
PATCH 3/3 drm/i915: use lane count and link rate from VBT as minimums for eDP
In reply to Jani NikulaMost likely the minimums for both should be enough for enabling the native resolution on the eDP, and we'll end up using the predetermined optimal link config for the panel.
v2: Add debug prints.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73539
--- drivers/gpu/drm/i915/intel_dp.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +23 -7
@@ -785,8 +785,10 @@ intel_dp_compute_config(struct intel_encoder *encoder,struct intel_crtc *intel_crtc = encoder->new_crtc;struct intel_connector *intel_connector = intel_dp->attached_connector;int lane_count, clock; +int min_lane_count =1 ;int max_lane_count =intel_dp_max_lane_count (intel_dp);/* Conveniently, the link BW constants become indices with a shift...*/ +int min_clock =0 ;int max_clock =intel_dp_max_link_bw (intel_dp) >>3 ;int bpp, mode_rate;static int bws[] = {DP_LINK_BW_1_62 ,DP_LINK_BW_2_7 ,DP_LINK_BW_5_4 };
@@ -819,19 +821,33 @@ intel_dp_compute_config(struct intel_encoder *encoder,/* Walk through all bpp values. Luckily they're all nicely spaced with 2 * bpc in between. */ bpp = pipe_config->pipe_bpp; -if (is_edp (intel_dp) && dev_priv->vbt.edp_bpp && - dev_priv->vbt.edp_bpp < bpp) { -DRM_DEBUG_KMS ("clamping bpp for eDP panel to BIOS-provided %i\n" , - dev_priv->vbt.edp_bpp); - bpp = dev_priv->vbt.edp_bpp; +if (is_edp (intel_dp)) { +if (dev_priv->vbt.edp_bpp && dev_priv->vbt.edp_bpp < bpp) { +DRM_DEBUG_KMS ("clamping bpp for eDP panel to BIOS-provided %i\n" , + dev_priv->vbt.edp_bpp); + bpp = dev_priv->vbt.edp_bpp; + } + +if (dev_priv->vbt.edp_lanes) { + min_lane_count =min (dev_priv->vbt.edp_lanes, + max_lane_count); +DRM_DEBUG_KMS ("using min %u lanes per VBT\n" , + min_lane_count); + } + +if (dev_priv->vbt.edp_rate) { + min_clock =min (dev_priv->vbt.edp_rate >>3 , max_clock); +DRM_DEBUG_KMS ("using min %02x link bw per VBT\n" , + bws[min_clock]); + } }for (; bpp >=6 *3 ; bpp -=2 *3 ) { mode_rate =intel_dp_link_required (adjusted_mode->crtc_clock, bpp); -for (lane_count =1 ; lane_count <= max_lane_count; lane_count <<=1 ) { -for (clock =0 ; clock <= max_clock; clock++) { +for (lane_count = min_lane_count; lane_count <= max_lane_count; lane_count <<=1 ) { +for (clock = min_clock; clock <= max_clock; clock++) { link_clock =drm_dp_bw_code_to_link_rate (bws[clock]); link_avail =intel_dp_max_data_rate (link_clock, lane_count);
Signature · 1 line
1.9.1
Re: [PATCH 3/3] drm/i915: use lane count and link rate from VBT as minimums for eDP
Quoted 9 lines · Jani Nikula
Most likely the minimums for both should be enough for enabling the native resolution on the eDP, and we'll end up using the predetermined optimal link config for the panel.
v2: Add debug prints.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73539
Tested-by Markus Blank-Burian <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Signature · 1 line
Damien
Quoted 8 lines · Jani Nikula
From: Paulo Zanoni <[email protected]>
Even if the panel claims it can support 4 lanes, there's the possibility that the HW can't, so consider this while selecting the max lane count.
Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Signature · 1 line
Damien
Quoted 56 lines
--- drivers/gpu/drm/i915/intel_dp.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_dp.c +18
-2@@ -121,6 +121,22 @@ intel_dp_max_link_bw(struct intel_dp *intel_dp)return max_link_bw; } +static u8 intel_dp_max_lane_count (struct intel_dp *intel_dp) +{ +struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = intel_dig_port->base.base.dev; +u8 source_max, sink_max; + + source_max =4 ; +if (HAS_DDI (dev) && intel_dig_port->port ==PORT_A && + (intel_dig_port->saved_port_bits &DDI_A_4_LANES ) ==0 ) + source_max =2 ; + + sink_max =drm_dp_max_lane_count (intel_dp->dpcd); + +return min (source_max, sink_max); +} +/* * The units on the numbers in the next two are... bizarre. Examples will * make it clearer; this one parallels an example in the eDP spec. @@ -171,7 +187,7 @@ intel_dp_mode_valid(struct drm_connector *connector, } max_link_clock =drm_dp_bw_code_to_link_rate (intel_dp_max_link_bw (intel_dp)); - max_lanes =drm_dp_max_lane_count (intel_dp->dpcd); + max_lanes =intel_dp_max_lane_count (intel_dp); max_rate =intel_dp_max_data_rate (max_link_clock, max_lanes); mode_rate =intel_dp_link_required (target_clock,18 );@@ -769,7 +785,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,struct intel_crtc *intel_crtc = encoder->new_crtc;struct intel_connector *intel_connector = intel_dp->attached_connector;int lane_count, clock; -int max_lane_count =drm_dp_max_lane_count (intel_dp->dpcd); +int max_lane_count =intel_dp_max_lane_count (intel_dp);/* Conveniently, the link BW constants become indices with a shift...*/ int max_clock =intel_dp_max_link_bw (intel_dp) >>3 ;int bpp, mode_rate;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Damien Lespiau
Quoted 8 lines · Jani Nikula
From: Paulo Zanoni <[email protected]>
Even if the panel claims it can support 4 lanes, there's the possibility that the HW can't, so consider this while selecting the max lane count.
Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Jani Nikula <[email protected]>Reviewed-by Damien Lespiau <[email protected]>
Series pushed to -fixes, thanks for the swift review!
BR,
Jani.
Quoted 60 lines
Signature · 2 lines
-- DamienQuoted 56 lines
--- drivers/gpu/drm/i915/intel_dp.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_dp.c +18
-2@@ -121,6 +121,22 @@ intel_dp_max_link_bw(struct intel_dp *intel_dp)return max_link_bw; } +static u8 intel_dp_max_lane_count (struct intel_dp *intel_dp) +{ +struct intel_digital_port *intel_dig_port =dp_to_dig_port (intel_dp); +struct drm_device *dev = intel_dig_port->base.base.dev; +u8 source_max, sink_max; + + source_max =4 ; +if (HAS_DDI (dev) && intel_dig_port->port ==PORT_A && + (intel_dig_port->saved_port_bits &DDI_A_4_LANES ) ==0 ) + source_max =2 ; + + sink_max =drm_dp_max_lane_count (intel_dp->dpcd); + +return min (source_max, sink_max); +} +/* * The units on the numbers in the next two are... bizarre. Examples will * make it clearer; this one parallels an example in the eDP spec. @@ -171,7 +187,7 @@ intel_dp_mode_valid(struct drm_connector *connector, } max_link_clock =drm_dp_bw_code_to_link_rate (intel_dp_max_link_bw (intel_dp)); - max_lanes =drm_dp_max_lane_count (intel_dp->dpcd); + max_lanes =intel_dp_max_lane_count (intel_dp); max_rate =intel_dp_max_data_rate (max_link_clock, max_lanes); mode_rate =intel_dp_link_required (target_clock,18 );@@ -769,7 +785,7 @@ intel_dp_compute_config(struct intel_encoder *encoder,struct intel_crtc *intel_crtc = encoder->new_crtc;struct intel_connector *intel_connector = intel_dp->attached_connector;int lane_count, clock; -int max_lane_count =drm_dp_max_lane_count (intel_dp->dpcd); +int max_lane_count =intel_dp_max_lane_count (intel_dp);/* Conveniently, the link BW constants become indices with a shift...*/ int max_clock =intel_dp_max_link_bw (intel_dp) >>3 ;int bpp, mode_rate;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
Quoted 8 lines · Jani Nikula
From: Paulo Zanoni <[email protected]>
Even if the panel claims it can support 4 lanes, there's the possibility that the HW can't, so consider this while selecting the max lane count.
Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Note that we also have an eDP lane count in the VBT we may want to factor in here as well.
Signature · 1 line
Damien
Quoted 7 lines · Damien Lespiau
Quoted 6 lines · Jani Nikula
From: Paulo Zanoni <[email protected]>
Even if the panel claims it can support 4 lanes, there's the possibility that the HW can't, so consider this while selecting the max lane count.
Quoted 5 lines
Quoted 2 lines
Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Jani Nikula <[email protected]>Note that we also have an eDP lane count in the VBT we may want to factor in here as well.
Ah, that's what this series is all about, discard this comment then.
Signature · 1 line
Damien