APPLIED Re: [PATCH 1/2][SRU][OEM-5.17] drm/i915/display: Remove check for low voltage sku for max dp source rate

[Timo Aaltonen]

Koba Ko kirjoitti 20.5.2022 klo 13.26:
> From: Ankit Nautiyal <ankit.k.nautiyal at intel.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1967986
> 
> The low voltage sku check can be ignored as OEMs need to consider that
> when designing the board and then put any limits in VBT.
> 
> Same is now changed in Bspec pages.
> 
> Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5272
> 
> Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>
> Reviewed-by: Imre Deak <imre.deak at intel.com>
> Signed-off-by: Imre Deak <imre.deak at intel.com>
> Link: https://patchwork.freedesktop.org/patch/msgid/20220315080247.1161844-2-ankit.k.nautiyal@intel.com
> (cherry picked from commit 73867c8709b569cdd7fda67f01dfe02c8d055521
> drmtip)
> Signed-off-by: Koba Ko <koba.ko at canonical.com>
> ---
>   drivers/gpu/drm/i915/display/intel_dp.c | 32 +++----------------------
>   1 file changed, 3 insertions(+), 29 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index 62e763faf0aa5..a438e508a6910 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -387,23 +387,13 @@ static int dg2_max_source_rate(struct intel_dp *intel_dp)
>   	return intel_dp_is_edp(intel_dp) ? 810000 : 1350000;
>   }
>   
> -static bool is_low_voltage_sku(struct drm_i915_private *i915, enum phy phy)
> -{
> -	u32 voltage;
> -
> -	voltage = intel_de_read(i915, ICL_PORT_COMP_DW3(phy)) & VOLTAGE_INFO_MASK;
> -
> -	return voltage == VOLTAGE_INFO_0_85V;
> -}
> -
>   static int icl_max_source_rate(struct intel_dp *intel_dp)
>   {
>   	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
>   	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
>   	enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port);
>   
> -	if (intel_phy_is_combo(dev_priv, phy) &&
> -	    (is_low_voltage_sku(dev_priv, phy) || !intel_dp_is_edp(intel_dp)))
> +	if (intel_phy_is_combo(dev_priv, phy) && !intel_dp_is_edp(intel_dp))
>   		return 540000;
>   
>   	return 810000;
> @@ -411,23 +401,7 @@ static int icl_max_source_rate(struct intel_dp *intel_dp)
>   
>   static int ehl_max_source_rate(struct intel_dp *intel_dp)
>   {
> -	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
> -	struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
> -	enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port);
> -
> -	if (intel_dp_is_edp(intel_dp) || is_low_voltage_sku(dev_priv, phy))
> -		return 540000;
> -
> -	return 810000;
> -}
> -
> -static int dg1_max_source_rate(struct intel_dp *intel_dp)
> -{
> -	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
> -	struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
> -	enum phy phy = intel_port_to_phy(i915, dig_port->base.port);
> -
> -	if (intel_phy_is_combo(i915, phy) && is_low_voltage_sku(i915, phy))
> +	if (intel_dp_is_edp(intel_dp))
>   		return 540000;
>   
>   	return 810000;
> @@ -470,7 +444,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)
>   			max_rate = dg2_max_source_rate(intel_dp);
>   		else if (IS_ALDERLAKE_P(dev_priv) || IS_ALDERLAKE_S(dev_priv) ||
>   			 IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv))
> -			max_rate = dg1_max_source_rate(intel_dp);
> +			max_rate = 810000;
>   		else if (IS_JSL_EHL(dev_priv))
>   			max_rate = ehl_max_source_rate(intel_dp);
>   		else


-- 
t