On Wed, 13 Oct 2021, Imre Deak <imre.deak@xxxxxxxxx> wrote:
> On Thu, Oct 07, 2021 at 01:19:25PM +0530, Nautiyal, Ankit K wrote:
>>
>> On 10/5/2021 9:01 PM, Imre Deak wrote:
>> > On Tue, Oct 05, 2021 at 01:34:21PM +0300, Jani Nikula wrote:
>> > > Cc: Imre, I think you were involved in adding the checks.
>> > About ADL-S the spec says:
>> >
>> > Bspec 53597:
>> > Combo Port Maximum Speed:
>> > OEM must use VBT to specify a maximum that is tolerated by the board design.
>> >
>> > Combo Port HBR3 support:
>> > May require retimer on motherboard. The OEM must use VBT to limit the link rate to HBR2 if HBR3 not supported by motherboard.
>> >
>> > Bspec/49201:
>> > Combo Port HBR3/6.48GHz support:
>> > Only supported on SKUs with higher I/O voltage
>> >
>> > I take the above meaning that only high voltage SKUs support HBR3 and
>> > on those SKUs the OEM must limit this to HBR2 if HBR3 would require a
>> > retimer on the board, but the board doesn't have this.
>> >
>> > If the above isn't correct and low voltage SKUs also in fact support
>> > HBR3 (with retimers if necessary) then this should imo clarified at
>> > Bspec/49201. The VBT limit could be used then if present, ignoring the
>> > low voltage SKU readout.
>>
>> Thanks Imre for the inputs.
>>
>> As you have mentioned note : rate >5.4 G supported only on High voltage I/O,
>> is mentioned for platforms like ICL, JSL and Display 12 platforms.
>>
>> I had again asked the HW team and VBT/GOP team whether we can safely rely on
>> VBT for the max rate for these platforms, without worrying about the SKU's
>> IO Voltage, and also requested them to update the Bspec page for the same.
>>
>> In response the Bspec pages 49201, 20598 are now updated with the note "OEM
>> must use VBT to specify a maximum that is tolerated by the board design" for
>> the rates above 5.4G.
>
> Ok, thanks for this, now the spec is closer to the proposed changes. On
> some platforms it's still unclear if the default max rate in the lack of
> a VBT limit is HBR2 or HBR3. The ADL-S overview at Bspec/53597 is clear
> now wrt. this:
>
> (*) "May require retimer on motherboard. The OEM must use VBT to limit the link rate
> to HBR2 if HBR3 not supported by motherboard."
>
> ideally it should still clarify if the potential retimer requirement applies to
> both eDP and DP or only to DP.
>
> I still see the followings to adjust in the spec so that it reflects
> the patch:
>
> - ICL
> - bspec/20584:
> "Increased IO voltage may be required to support HBR3 for the highest DisplayPort
> and eDP resolutions."
>
> should be changed to (*) above mentioning that HBR3 is only supported on
> eDP.
>
> - bspec/20598:
> "Combo HBR3: OEM must use VBT to specify a miximum that is tolerated by the
> board design."
>
> The DP/HBR3 support on ICL should be removed.
>
> For eDP/HBR3 on ICL the above comment should be changed to (*).
>
> - JSL
> - bspec/32247:
> "Increased IO voltage may be required to support HBR3 for the highest DisplayPort
> resolutions."
>
> should be removed/changed to (*).
>
> - bspec/20598:
> "OEM must use VBT to specify a miximum that is tolerated by the
> board design."
>
> should be changed to (*).
>
> - TGL:
> - bspec/49201:
> "Combo HBR3: OEM must use VBT to specify a miximum that is tolerated
> by the board design."
>
> The DP/HBR3 support should be removed, for eDP/HBR3 the above should
> be changed to (*).
>
> - RKL:
> - bspec/49201, 49204:
> Remove the RKL tag, since there is a separate page for RKL.
>
> - bspec/49202:
> "Combo HBR3: Only supported on SKUs with higher I/O voltage"
>
> should be changed to (*).
>
> - ADLS:
> - bspec/49201, 49204:
> The ADLS tag should be removed, since there is a separate page for ADLS.
>
> - bspec/53720:
> "Combo HBR3: OEM must use VBT to specify a miximum that is tolerated by the
> board design."
>
> should be changed to (*).
>
> - DG1:
> - bspec/49205:
> "Combo HBR3: Only supported on SKUs with higher I/O voltage"
>
> should be changed to (*) above.
>
> - DG2:
> - bspec/53657:
> For Combo HBR3 (*) should be added.
>
> - bspec/54034:
> For Combo HBR3 (*) should be added.
>
> - ADLP:
> - bspec/49185:
> "Combo DP/HBR3: OEM must use VBT to specify a miximum that is tolerated by
> the board design. An external re-timer may be needed."
>
> should be changed to (*).
>
>
> Also could you add a debug print with the voltage configuration of combo
> PHYs somewhere in intel_combo_phy.c?
>
>> From what I understand, we can depend upon the VBT's rate, and if there are
>> some low voltage I/O SKUs that do not support HBR3 rate, it should be
>> limited by the VBT.
>>
>> Thanks & Regards,
>>
>> Ankit
>>
>> > > BR,
>> > > Jani.
>> > >
>> > > On Tue, 05 Oct 2021, "Nautiyal, Ankit K" <ankit.k.nautiyal@xxxxxxxxx> wrote:
>> > > > On 10/5/2021 1:34 PM, Jani Nikula wrote:
>> > > > > On Tue, 05 Oct 2021, Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx> wrote:
>> > > > > > 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.
>> > > > > "can" or "must"?
>> > > > >
>> > > > > VBT has been notoriously buggy over the years, and we need to safeguard
>> > > > > against that. Are there any cases where having these checks are wrong?
>> > > > Hi Jani,
>> > > >
>> > > > Bspec page for Combo PHY PLL frequencies now says "OEM must use VBT to
>> > > > specify a maximum that is tolerated by the board design" for the rates
>> > > > above 5.4G.
>> > > >
>> > > > Earlier it was mentioned that rates > 5.4G were supported on SKUs with
>> > > > Higher I/O Voltage.
>> > > >
>> > > > There was an instance where on an ADL-S board, where VBT was showing as
>> > > > HBR3 supporting for a combo phy port, but we were reading the IO
>> > > > voltage as 0.85V in is_low_voltage_sku()
>> > > >
>> > > > (Specifically, we were reading Register_PORT_COMP_DW3 bits 24-25 as 0)
>> > > > for a combo PHY port, and therefore we were limiting the BW to 5.4Gbps
Btw why was this? Is it the wrong register, wrong thing to do, what?
BR,
Jani.
>> > > >
>> > > > Due to this, 8k@60 mode was getting pruned on the board for that combo
>> > > > phy port. On removing the low_voltage_sku( ) the mode was able to be set
>> > > > properly.
>> > > >
>> > > > Incidentally, with Windows 8k@60 was also coming up on the same board on
>> > > > same port.
>> > > >
>> > > > So I had checked with HW team and GOP/VBT team if driver should consider
>> > > > the low voltage sku check. As per their response we 'can' ignore the
>> > > > check and rely on the VBT, as OEM should limit the rate as per board
>> > > > design. The Bspec was also updated to reflect the same.
>> > > >
>> > > > So IMHO we need not limit the rate as per is_low_voltage_sku check, as
>> > > > this limiting of the rate through VBT is a must for the OEMs.
>> > > >
>> > > > I should perhaps change the wording of the commit message to convey the
>> > > > same.
>> > > >
>> > > >
>> > > > Thanks & Regards,
>> > > >
>> > > > Ankit
>> > > >
>> > > >
>> > > > > BR,
>> > > > > Jani.
>> > > > >
>> > > > > > Same is now changed in Bspec (53720).
>> > > > > >
>> > > > > > Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx>
>> > > > > > ---
>> > > > > > 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 74a657ae131a..75c364c3c88e 100644
>> > > > > > --- a/drivers/gpu/drm/i915/display/intel_dp.c
>> > > > > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c
>> > > > > > @@ -297,23 +297,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;
>> > > > > > @@ -321,23 +311,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;
>> > > > > > @@ -380,7 +354,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
>> > > --
>> > > Jani Nikula, Intel Open Source Graphics Center
--
Jani Nikula, Intel Open Source Graphics Center
