| Message ID | 20230420124050.3617608-3-mika.kahola@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/mtl: Add support for C20 phy | expand |
On Thu, Apr 20, 2023 at 03:40:39PM +0300, Mika Kahola wrote: > Create a table for C20 DP1.4, DP2.0 and HDMI2.1 rates. > The PLL settings are based on table, not for algorithmic alternative. > For DP 1.4 only MPLLB is in use. > > Once register settings are done, we read back C20 HW state. > > BSpec: 64568 > > Signed-off-by: Mika Kahola <mika.kahola@intel.com> > Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com> > Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> > --- > drivers/gpu/drm/i915/display/intel_cx0_phy.c | 623 +++++++++++++++++- > drivers/gpu/drm/i915/display/intel_cx0_phy.h | 8 +- > drivers/gpu/drm/i915/display/intel_ddi.c | 9 +- > .../drm/i915/display/intel_display_types.h | 1 + > drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +- > drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + > 6 files changed, 628 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > index dd96bf5e179e..61428c5145e5 100644 > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > @@ -11,6 +11,7 @@ > #include "intel_de.h" > #include "intel_display_types.h" > #include "intel_dp.h" > +#include "intel_hdmi.h" > #include "intel_panel.h" > #include "intel_psr.h" > #include "intel_tc.h" > @@ -285,6 +286,23 @@ static void intel_c20_sram_write(struct drm_i915_private *i915, enum port port, > intel_cx0_write(i915, port, lane, PHY_C20_WR_DATA_L, data & 0xff, 1); > } > > +static u16 intel_c20_sram_read(struct drm_i915_private *i915, enum port port, > + int lane, u16 addr) > +{ > + u16 val; > + > + assert_dc_off(i915); > + > + intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_H, addr >> 8, 0); > + intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_L, addr & 0xff, 1); > + > + val = intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_H); > + val <<= 8; > + val |= intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_L); > + > + return val; > +} > + > static void __intel_cx0_rmw(struct drm_i915_private *i915, enum port port, > int lane, u16 addr, u8 clear, u8 set, bool committed) > { > @@ -659,6 +677,199 @@ static const struct intel_c10pll_state * const mtl_c10_edp_tables[] = { > NULL, > }; > > +/* C20 basic DP 1.4 tables */ > +static const struct intel_c20pll_state mtl_c20_dp_rbr = { > + .link_bit_rate = 162000, > + .clock = 162000, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x5800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x50a8, /* mpllb cfg0 */ > + 0x2120, /* mpllb cfg1 */ > + 0xcd9a, /* mpllb cfg2 */ > + 0xbfc1, /* mpllb cfg3 */ > + 0x5ab8, /* mpllb cfg4 */ > + 0x4c34, /* mpllb cfg5 */ > + 0x2000, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x6000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0000, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_dp_hbr1 = { > + .link_bit_rate = 270000, > + .clock = 270000, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x4800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x308c, /* mpllb cfg0 */ > + 0x2110, /* mpllb cfg1 */ > + 0xcc9c, /* mpllb cfg2 */ > + 0xbfc1, /* mpllb cfg3 */ > + 0x489a, /* mpllb cfg4 */ This should be 0x4b9a ^ for mpllb cfg4 according to the consolidated table. > + 0x3f81, /* mpllb cfg5 */ > + 0x2000, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x5000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0000, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_dp_hbr2 = { > + .link_bit_rate = 540000, > + .clock = 540000, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x4800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x108c, /* mpllb cfg0 */ > + 0x2108, /* mpllb cfg1 */ > + 0xcc9c, /* mpllb cfg2 */ > + 0xbfc1, /* mpllb cfg3 */ > + 0x489a, /* mpllb cfg4 */ This should be 0x4b9a ^ for mpllb cfg4 according to the consolidated table. > + 0x3f81, /* mpllb cfg5 */ > + 0x2000, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x5000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0000, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_dp_hbr3 = { > + .link_bit_rate = 810000, > + .clock = 810000, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x4800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x10d2, /* mpllb cfg0 */ > + 0x2108, /* mpllb cfg1 */ > + 0x8d98, /* mpllb cfg2 */ > + 0xbfc1, /* mpllb cfg3 */ > + 0x7166, /* mpllb cfg4 */ > + 0x5f42, /* mpllb cfg5 */ > + 0x2000, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x7800, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0000, /* mpllb cfg10 */ > + }, > +}; > + > +/* C20 basic DP 2.0 tables */ > +static const struct intel_c20pll_state mtl_c20_dp_uhbr10 = { > + .link_bit_rate = 1000000, /* 10 Gbps */ > + .clock = 312500, > + .tx = { 0xbe21, /* tx cfg0 */ > + 0x4800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mplla = { 0x3104, /* mplla cfg0 */ > + 0xd105, /* mplla cfg1 */ > + 0xc025, /* mplla cfg2 */ > + 0xc025, /* mplla cfg3 */ > + 0xa6ab, /* mplla cfg4 */ This should be 0x8c00 ^ for mplla cfg4 according to the consolidated table. > + 0x8c00, /* mplla cfg5 */ This should be 0x759a ^ for mplla cfg5 according to the consolidated table. > + 0x4000, /* mplla cfg6 */ > + 0x0003, /* mplla cfg7 */ > + 0x3555, /* mplla cfg8 */ > + 0x0000, /* mplla cfg9 */ This should be 0x0001 ^ for mplla cfg9 according to the consolidated table. > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_dp_uhbr13_5 = { > + .link_bit_rate = 1350000, /* 13.5 Gbps */ > + .clock = 421875, > + .tx = { 0xbea0, /* tx cfg0 */ > + 0x4800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x015f, /* mpllb cfg0 */ > + 0x2205, /* mpllb cfg1 */ > + 0x1b17, /* mpllb cfg2 */ > + 0xffc1, /* mpllb cfg3 */ > + 0xe100, /* mpllb cfg4 */ > + 0xbd00, /* mpllb cfg5 */ > + 0x2000, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x4800, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0000, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_dp_uhbr20 = { > + .link_bit_rate = 2000000, /* 20 Gbps */ > + .clock = 625000, > + .tx = { 0xbe20, /* tx cfg0 */ > + 0x4800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mplla = { 0x3104, /* mplla cfg0 */ > + 0xd105, /* mplla cfg1 */ > + 0xc025, /* mplla cfg2 */ > + 0xc025, /* mplla cfg3 */ > + 0xa6ab, /* mplla cfg4 */ > + 0x8c00, /* mplla cfg5 */ > + 0x4000, /* mplla cfg6 */ > + 0x0003, /* mplla cfg7 */ > + 0x3555, /* mplla cfg8 */ > + 0x0002, /* mplla cfg9 */ This should be 0x0001 ^ for mplla cfg9 according to the consolidated table. These are the suggested changes for now. I would need to check the HDMI tables. - Radhakrishna(RK) Sripada > + }, > +}; > + > +static const struct intel_c20pll_state * const mtl_c20_dp_tables[] = { > + &mtl_c20_dp_rbr, > + &mtl_c20_dp_hbr1, > + &mtl_c20_dp_hbr2, > + &mtl_c20_dp_hbr3, > + &mtl_c20_dp_uhbr10, > + &mtl_c20_dp_uhbr13_5, > + &mtl_c20_dp_uhbr20, > + NULL, > +}; > + > /* > * HDMI link rates with 38.4 MHz reference clock. > */ > @@ -1243,7 +1454,281 @@ static const struct intel_c10pll_state * const mtl_c10_hdmi_tables[] = { > NULL, > }; > > -int intel_c10_phy_check_hdmi_link_rate(int clock) > +static const struct intel_c20pll_state mtl_c20_hdmi_25_175 = { > + .link_bit_rate = 25175, > + .clock = 25175, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0xa0d2, /* mpllb cfg0 */ > + 0x7d80, /* mpllb cfg1 */ > + 0x0906, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x0200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x0000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0001, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_27_0 = { > + .link_bit_rate = 27000, > + .clock = 27000, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0xa0e0, /* mpllb cfg0 */ > + 0x7d80, /* mpllb cfg1 */ > + 0x0906, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x8000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0001, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_74_25 = { > + .link_bit_rate = 74250, > + .clock = 74250, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x609a, /* mpllb cfg0 */ > + 0x7d40, /* mpllb cfg1 */ > + 0xca06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x5800, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0001, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_148_5 = { > + .link_bit_rate = 148500, > + .clock = 148500, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x409a, /* mpllb cfg0 */ > + 0x7d20, /* mpllb cfg1 */ > + 0xca06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x5800, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0001, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_594 = { > + .link_bit_rate = 594000, > + .clock = 594000, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x009a, /* mpllb cfg0 */ > + 0x7d08, /* mpllb cfg1 */ > + 0xca06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x5800, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0001, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_300 = { > + .link_bit_rate = 3000000, > + .clock = 166670, > + .tx = { 0xbe98, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x209c, /* mpllb cfg0 */ > + 0x7d10, /* mpllb cfg1 */ > + 0xca06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x2000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0004, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_600 = { > + .link_bit_rate = 6000000, > + .clock = 333330, > + .tx = { 0xbe98, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x009c, /* mpllb cfg0 */ > + 0x7d08, /* mpllb cfg1 */ > + 0xca06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x2000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0004, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_800 = { > + .link_bit_rate = 8000000, > + .clock = 444440, > + .tx = { 0xbe98, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x00d0, /* mpllb cfg0 */ > + 0x7d08, /* mpllb cfg1 */ > + 0x4a06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0003, /* mpllb cfg7 */ > + 0x2aaa, /* mpllb cfg8 */ > + 0x0002, /* mpllb cfg9 */ > + 0x0004, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_1000 = { > + .link_bit_rate = 10000000, > + .clock = 555560, > + .tx = { 0xbe98, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x1104, /* mpllb cfg0 */ > + 0x7d08, /* mpllb cfg1 */ > + 0x0a06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0003, /* mpllb cfg7 */ > + 0x3555, /* mpllb cfg8 */ > + 0x0001, /* mpllb cfg9 */ > + 0x0004, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_1200 = { > + .link_bit_rate = 12000000, > + .clock = 666670, > + .tx = { 0xbe98, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x0138, /* mpllb cfg0 */ > + 0x7d08, /* mpllb cfg1 */ > + 0x5486, /* mpllb cfg2 */ > + 0xfe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x4000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0004, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state * const mtl_c20_hdmi_tables[] = { > + &mtl_c20_hdmi_25_175, > + &mtl_c20_hdmi_27_0, > + &mtl_c20_hdmi_74_25, > + &mtl_c20_hdmi_148_5, > + &mtl_c20_hdmi_594, > + &mtl_c20_hdmi_300, > + &mtl_c20_hdmi_600, > + &mtl_c20_hdmi_800, > + &mtl_c20_hdmi_1000, > + &mtl_c20_hdmi_1200, > + NULL, > +}; > + > +static int intel_c10_phy_check_hdmi_link_rate(int clock) > { > const struct intel_c10pll_state * const *tables = mtl_c10_hdmi_tables; > int i; > @@ -1319,17 +1804,6 @@ static int intel_c10pll_calc_state(struct intel_crtc_state *crtc_state, > return -EINVAL; > } > > -int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, > - struct intel_encoder *encoder) > -{ > - struct drm_i915_private *i915 = to_i915(encoder->base.dev); > - enum phy phy = intel_port_to_phy(i915, encoder->port); > - > - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); > - > - return intel_c10pll_calc_state(crtc_state, encoder); > -} > - > void intel_c10pll_readout_hw_state(struct intel_encoder *encoder, > struct intel_c10pll_state *pll_state) > { > @@ -1427,6 +1901,74 @@ void intel_c10pll_dump_hw_state(struct drm_i915_private *i915, > i + 2, hw_state->pll[i + 2], i + 3, hw_state->pll[i + 3]); > } > > +static int intel_c20_phy_check_hdmi_link_rate(int clock) > +{ > + const struct intel_c20pll_state * const *tables = mtl_c20_hdmi_tables; > + int i; > + > + for (i = 0; tables[i]; i++) { > + if (clock == tables[i]->link_bit_rate) > + return MODE_OK; > + } > + > + return MODE_CLOCK_RANGE; > +} > + > +int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int clock) > +{ > + struct intel_digital_port *dig_port = hdmi_to_dig_port(hdmi); > + struct drm_i915_private *i915 = intel_hdmi_to_i915(hdmi); > + enum phy phy = intel_port_to_phy(i915, dig_port->base.port); > + > + if (intel_is_c10phy(i915, phy)) > + return intel_c10_phy_check_hdmi_link_rate(clock); > + return intel_c20_phy_check_hdmi_link_rate(clock); > +} > + > +static const struct intel_c20pll_state * const * > +intel_c20_pll_tables_get(struct intel_crtc_state *crtc_state, > + struct intel_encoder *encoder) > +{ > + if (intel_crtc_has_dp_encoder(crtc_state)) > + return mtl_c20_dp_tables; > + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > + return mtl_c20_hdmi_tables; > + > + MISSING_CASE(encoder->type); > + return NULL; > +} > + > +static int intel_c20pll_calc_state(struct intel_crtc_state *crtc_state, > + struct intel_encoder *encoder) > +{ > + const struct intel_c20pll_state * const *tables; > + int i; > + > + tables = intel_c20_pll_tables_get(crtc_state, encoder); > + if (!tables) > + return -EINVAL; > + > + for (i = 0; tables[i]; i++) { > + if (crtc_state->port_clock == tables[i]->link_bit_rate) { > + crtc_state->cx0pll_state.c20 = *tables[i]; > + return 0; > + } > + } > + > + return -EINVAL; > +} > + > +int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, > + struct intel_encoder *encoder) > +{ > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > + enum phy phy = intel_port_to_phy(i915, encoder->port); > + > + if (intel_is_c10phy(i915, phy)) > + return intel_c10pll_calc_state(crtc_state, encoder); > + return intel_c20pll_calc_state(crtc_state, encoder); > +} > + > static bool intel_c20_use_mplla(u32 clock) > { > /* 10G and 20G rates use MPLLA */ > @@ -1436,6 +1978,63 @@ static bool intel_c20_use_mplla(u32 clock) > return false; > } > > +void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, > + struct intel_c20pll_state *pll_state) > +{ > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > + bool cntx, use_mpllb; > + u32 val; > + int i; > + > + /* 1. Read current context selection */ > + cntx = intel_cx0_read(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_VDR_CUSTOM_SERDES_RATE) & PHY_C20_CONTEXT_TOGGLE; > + > + /* Read Tx configuration */ > + for (i = 0; i < ARRAY_SIZE(pll_state->tx); i++) { > + if (cntx) > + pll_state->tx[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > + PHY_C20_B_TX_CNTX_CFG(i)); > + else > + pll_state->tx[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > + PHY_C20_A_TX_CNTX_CFG(i)); > + } > + > + /* Read common configuration */ > + for (i = 0; i < ARRAY_SIZE(pll_state->cmn); i++) { > + if (cntx) > + pll_state->cmn[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > + PHY_C20_B_CMN_CNTX_CFG(i)); > + else > + pll_state->cmn[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > + PHY_C20_A_CMN_CNTX_CFG(i)); > + } > + > + val = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_A_MPLLA_CNTX_CFG(6)); > + use_mpllb = val & C20_MPLLB_FRACEN; > + > + if (use_mpllb) { > + /* MPLLA configuration */ > + for (i = 0; i < ARRAY_SIZE(pll_state->mplla); i++) { > + if (cntx) > + pll_state->mplla[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > + PHY_C20_B_MPLLA_CNTX_CFG(i)); > + else > + pll_state->mplla[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > + PHY_C20_A_MPLLA_CNTX_CFG(i)); > + } > + } else { > + /* MPLLB configuration */ > + for (i = 0; i < ARRAY_SIZE(pll_state->mpllb); i++) { > + if (cntx) > + pll_state->mpllb[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > + PHY_C20_B_MPLLB_CNTX_CFG(i)); > + else > + pll_state->mpllb[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > + PHY_C20_A_MPLLB_CNTX_CFG(i)); > + } > + } > +} > + > static u8 intel_c20_get_dp_rate(u32 clock) > { > switch (clock) { > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.h b/drivers/gpu/drm/i915/display/intel_cx0_phy.h > index 509d1d12776e..9760c6292c81 100644 > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.h > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.h > @@ -30,8 +30,12 @@ int intel_c10pll_calc_port_clock(struct intel_encoder *encoder, > const struct intel_c10pll_state *pll_state); > void intel_c10pll_state_verify(struct intel_atomic_state *state, > struct intel_crtc_state *new_crtc_state); > +void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, > + struct intel_c20pll_state *pll_state); > void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state); > -int intel_c10_phy_check_hdmi_link_rate(int clock); > - > +int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int clock); > +void intel_cx0_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > + const struct intel_crtc_state *crtc_state, > + u32 level); > #endif /* __INTEL_CX0_PHY_H__ */ > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index f445f2613adb..44f07011245b 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -3853,10 +3853,13 @@ static void mtl_ddi_get_config(struct intel_encoder *encoder, > struct drm_i915_private *i915 = to_i915(encoder->base.dev); > enum phy phy = intel_port_to_phy(i915, encoder->port); > > - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); > + if (intel_is_c10phy(i915, phy)) { > + intel_c10pll_readout_hw_state(encoder, &crtc_state->cx0pll_state.c10); > + intel_c10pll_dump_hw_state(i915, &crtc_state->cx0pll_state.c10); > + } else { > + intel_c20pll_readout_hw_state(encoder, &crtc_state->cx0pll_state.c20); > + } > > - intel_c10pll_readout_hw_state(encoder, &crtc_state->cx0pll_state.c10); > - intel_c10pll_dump_hw_state(i915, &crtc_state->cx0pll_state.c10); > crtc_state->port_clock = intel_c10pll_calc_port_clock(encoder, &crtc_state->cx0pll_state.c10); > > intel_ddi_get_config(encoder, crtc_state); > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index c9927e12b95e..4eadf45c0a43 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -997,6 +997,7 @@ struct intel_c10pll_state { > }; > > struct intel_c20pll_state { > + u32 link_bit_rate; > u32 clock; /* in kHz */ > u16 tx[3]; > u16 cmn[4]; > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c > index 8141d5184856..65a258507d62 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -58,7 +58,7 @@ > #include "intel_panel.h" > #include "intel_snps_phy.h" > > -static struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi *intel_hdmi) > +inline struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi *intel_hdmi) > { > return to_i915(hdmi_to_dig_port(intel_hdmi)->base.base.dev); > } > @@ -1865,8 +1865,8 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi, > * FIXME: We will hopefully get an algorithmic way of programming > * the MPLLB for HDMI in the future. > */ > - if (IS_METEORLAKE(dev_priv)) > - return intel_c10_phy_check_hdmi_link_rate(clock); > + if (DISPLAY_VER(dev_priv) >= 14) > + return intel_cx0_phy_check_hdmi_link_rate(hdmi, clock); > else if (IS_DG2(dev_priv)) > return intel_snps_phy_check_hdmi_link_rate(clock); > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h > index 774dda2376ed..492bd3921385 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.h > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h > @@ -54,5 +54,6 @@ int intel_hdmi_dsc_get_num_slices(const struct intel_crtc_state *crtc_state, > int src_max_slices, int src_max_slice_width, > int hdmi_max_slices, int hdmi_throughput); > int intel_hdmi_dsc_get_slice_height(int vactive); > +struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi *intel_hdmi); > > #endif /* __INTEL_HDMI_H__ */ > -- > 2.34.1 >
> -----Original Message----- > From: Sripada, Radhakrishna <radhakrishna.sripada@intel.com> > Sent: Monday, April 24, 2023 11:56 PM > To: Kahola, Mika <mika.kahola@intel.com> > Cc: intel-gfx@lists.freedesktop.org > Subject: Re: [Intel-gfx] [PATCH 02/13] drm/i915/mtl: C20 HW readout > > On Thu, Apr 20, 2023 at 03:40:39PM +0300, Mika Kahola wrote: > > Create a table for C20 DP1.4, DP2.0 and HDMI2.1 rates. > > The PLL settings are based on table, not for algorithmic alternative. > > For DP 1.4 only MPLLB is in use. > > > > Once register settings are done, we read back C20 HW state. > > > > BSpec: 64568 > > > > Signed-off-by: Mika Kahola <mika.kahola@intel.com> > > Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com> > > Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_cx0_phy.c | 623 +++++++++++++++++- > > drivers/gpu/drm/i915/display/intel_cx0_phy.h | 8 +- > > drivers/gpu/drm/i915/display/intel_ddi.c | 9 +- > > .../drm/i915/display/intel_display_types.h | 1 + > > drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +- > > drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + > > 6 files changed, 628 insertions(+), 20 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > > b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > > index dd96bf5e179e..61428c5145e5 100644 > > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > > @@ -11,6 +11,7 @@ > > #include "intel_de.h" > > #include "intel_display_types.h" > > #include "intel_dp.h" > > +#include "intel_hdmi.h" > > #include "intel_panel.h" > > #include "intel_psr.h" > > #include "intel_tc.h" > > @@ -285,6 +286,23 @@ static void intel_c20_sram_write(struct > drm_i915_private *i915, enum port port, > > intel_cx0_write(i915, port, lane, PHY_C20_WR_DATA_L, data & 0xff, > > 1); } > > > > +static u16 intel_c20_sram_read(struct drm_i915_private *i915, enum port > port, > > + int lane, u16 addr) > > +{ > > + u16 val; > > + > > + assert_dc_off(i915); > > + > > + intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_H, addr >> 8, > 0); > > + intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_L, addr & 0xff, > > +1); > > + > > + val = intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_H); > > + val <<= 8; > > + val |= intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_L); > > + > > + return val; > > +} > > + > > static void __intel_cx0_rmw(struct drm_i915_private *i915, enum port port, > > int lane, u16 addr, u8 clear, u8 set, bool committed) { > @@ > > -659,6 +677,199 @@ static const struct intel_c10pll_state * const > mtl_c10_edp_tables[] = { > > NULL, > > }; > > > > +/* C20 basic DP 1.4 tables */ > > +static const struct intel_c20pll_state mtl_c20_dp_rbr = { > > + .link_bit_rate = 162000, > > + .clock = 162000, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x5800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x50a8, /* mpllb cfg0 */ > > + 0x2120, /* mpllb cfg1 */ > > + 0xcd9a, /* mpllb cfg2 */ > > + 0xbfc1, /* mpllb cfg3 */ > > + 0x5ab8, /* mpllb cfg4 */ > > + 0x4c34, /* mpllb cfg5 */ > > + 0x2000, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x6000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0000, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_dp_hbr1 = { > > + .link_bit_rate = 270000, > > + .clock = 270000, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x4800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x308c, /* mpllb cfg0 */ > > + 0x2110, /* mpllb cfg1 */ > > + 0xcc9c, /* mpllb cfg2 */ > > + 0xbfc1, /* mpllb cfg3 */ > > + 0x489a, /* mpllb cfg4 */ > This should be 0x4b9a ^ for mpllb cfg4 according to the consolidated table. Yes. Perhaps this has changed since the time of writing. > > > + 0x3f81, /* mpllb cfg5 */ > > + 0x2000, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x5000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0000, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_dp_hbr2 = { > > + .link_bit_rate = 540000, > > + .clock = 540000, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x4800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x108c, /* mpllb cfg0 */ > > + 0x2108, /* mpllb cfg1 */ > > + 0xcc9c, /* mpllb cfg2 */ > > + 0xbfc1, /* mpllb cfg3 */ > > + 0x489a, /* mpllb cfg4 */ > This should be 0x4b9a ^ for mpllb cfg4 according to the consolidated table. I will change this one too. > > > + 0x3f81, /* mpllb cfg5 */ > > + 0x2000, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x5000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0000, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_dp_hbr3 = { > > + .link_bit_rate = 810000, > > + .clock = 810000, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x4800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x10d2, /* mpllb cfg0 */ > > + 0x2108, /* mpllb cfg1 */ > > + 0x8d98, /* mpllb cfg2 */ > > + 0xbfc1, /* mpllb cfg3 */ > > + 0x7166, /* mpllb cfg4 */ > > + 0x5f42, /* mpllb cfg5 */ > > + 0x2000, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x7800, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0000, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +/* C20 basic DP 2.0 tables */ > > +static const struct intel_c20pll_state mtl_c20_dp_uhbr10 = { > > + .link_bit_rate = 1000000, /* 10 Gbps */ > > + .clock = 312500, > > + .tx = { 0xbe21, /* tx cfg0 */ > > + 0x4800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mplla = { 0x3104, /* mplla cfg0 */ > > + 0xd105, /* mplla cfg1 */ > > + 0xc025, /* mplla cfg2 */ > > + 0xc025, /* mplla cfg3 */ > > + 0xa6ab, /* mplla cfg4 */ > This should be 0x8c00 ^ for mplla cfg4 according to the consolidated table. True. I will update this > > > + 0x8c00, /* mplla cfg5 */ > This should be 0x759a ^ for mplla cfg5 according to the consolidated table. As well as this one. > > > + 0x4000, /* mplla cfg6 */ > > + 0x0003, /* mplla cfg7 */ > > + 0x3555, /* mplla cfg8 */ > > + 0x0000, /* mplla cfg9 */ > This should be 0x0001 ^ for mplla cfg9 according to the consolidated table. This is bit controversial. The consolidated table indeed suggests that these mplla cfg9 values should be 0x0001 for both 10G and 20G rates. However, if we look at the table definition "C20 MPLLA Programming for DP UHBR link rates (10G and 20G)" for mplla cfg9 it states for mplla_frac_rem parameter 0x0000 for 10G and 0x0002 for 20G. Now, which one of these are the correct ones? Should we rely on values defined consolidated table? > > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_dp_uhbr13_5 = { > > + .link_bit_rate = 1350000, /* 13.5 Gbps */ > > + .clock = 421875, > > + .tx = { 0xbea0, /* tx cfg0 */ > > + 0x4800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x015f, /* mpllb cfg0 */ > > + 0x2205, /* mpllb cfg1 */ > > + 0x1b17, /* mpllb cfg2 */ > > + 0xffc1, /* mpllb cfg3 */ > > + 0xe100, /* mpllb cfg4 */ > > + 0xbd00, /* mpllb cfg5 */ > > + 0x2000, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x4800, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0000, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_dp_uhbr20 = { > > + .link_bit_rate = 2000000, /* 20 Gbps */ > > + .clock = 625000, > > + .tx = { 0xbe20, /* tx cfg0 */ > > + 0x4800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mplla = { 0x3104, /* mplla cfg0 */ > > + 0xd105, /* mplla cfg1 */ > > + 0xc025, /* mplla cfg2 */ > > + 0xc025, /* mplla cfg3 */ > > + 0xa6ab, /* mplla cfg4 */ > > + 0x8c00, /* mplla cfg5 */ > > + 0x4000, /* mplla cfg6 */ > > + 0x0003, /* mplla cfg7 */ > > + 0x3555, /* mplla cfg8 */ > > + 0x0002, /* mplla cfg9 */ > This should be 0x0001 ^ for mplla cfg9 according to the consolidated table. > > These are the suggested changes for now. I would need to check the HDMI > tables. Thanks for the review and comments! -Mika- > > - Radhakrishna(RK) Sripada > > + }, > > +}; > > + > > +static const struct intel_c20pll_state * const mtl_c20_dp_tables[] = { > > + &mtl_c20_dp_rbr, > > + &mtl_c20_dp_hbr1, > > + &mtl_c20_dp_hbr2, > > + &mtl_c20_dp_hbr3, > > + &mtl_c20_dp_uhbr10, > > + &mtl_c20_dp_uhbr13_5, > > + &mtl_c20_dp_uhbr20, > > + NULL, > > +}; > > + > > /* > > * HDMI link rates with 38.4 MHz reference clock. > > */ > > @@ -1243,7 +1454,281 @@ static const struct intel_c10pll_state * const > mtl_c10_hdmi_tables[] = { > > NULL, > > }; > > > > -int intel_c10_phy_check_hdmi_link_rate(int clock) > > +static const struct intel_c20pll_state mtl_c20_hdmi_25_175 = { > > + .link_bit_rate = 25175, > > + .clock = 25175, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0xa0d2, /* mpllb cfg0 */ > > + 0x7d80, /* mpllb cfg1 */ > > + 0x0906, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x0200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x0000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0001, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_27_0 = { > > + .link_bit_rate = 27000, > > + .clock = 27000, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0xa0e0, /* mpllb cfg0 */ > > + 0x7d80, /* mpllb cfg1 */ > > + 0x0906, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x8000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0001, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_74_25 = { > > + .link_bit_rate = 74250, > > + .clock = 74250, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x609a, /* mpllb cfg0 */ > > + 0x7d40, /* mpllb cfg1 */ > > + 0xca06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x5800, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0001, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_148_5 = { > > + .link_bit_rate = 148500, > > + .clock = 148500, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x409a, /* mpllb cfg0 */ > > + 0x7d20, /* mpllb cfg1 */ > > + 0xca06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x5800, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0001, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_594 = { > > + .link_bit_rate = 594000, > > + .clock = 594000, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x009a, /* mpllb cfg0 */ > > + 0x7d08, /* mpllb cfg1 */ > > + 0xca06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x5800, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0001, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_300 = { > > + .link_bit_rate = 3000000, > > + .clock = 166670, > > + .tx = { 0xbe98, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x209c, /* mpllb cfg0 */ > > + 0x7d10, /* mpllb cfg1 */ > > + 0xca06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x2000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0004, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_600 = { > > + .link_bit_rate = 6000000, > > + .clock = 333330, > > + .tx = { 0xbe98, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x009c, /* mpllb cfg0 */ > > + 0x7d08, /* mpllb cfg1 */ > > + 0xca06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x2000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0004, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_800 = { > > + .link_bit_rate = 8000000, > > + .clock = 444440, > > + .tx = { 0xbe98, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x00d0, /* mpllb cfg0 */ > > + 0x7d08, /* mpllb cfg1 */ > > + 0x4a06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0003, /* mpllb cfg7 */ > > + 0x2aaa, /* mpllb cfg8 */ > > + 0x0002, /* mpllb cfg9 */ > > + 0x0004, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_1000 = { > > + .link_bit_rate = 10000000, > > + .clock = 555560, > > + .tx = { 0xbe98, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x1104, /* mpllb cfg0 */ > > + 0x7d08, /* mpllb cfg1 */ > > + 0x0a06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0003, /* mpllb cfg7 */ > > + 0x3555, /* mpllb cfg8 */ > > + 0x0001, /* mpllb cfg9 */ > > + 0x0004, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_1200 = { > > + .link_bit_rate = 12000000, > > + .clock = 666670, > > + .tx = { 0xbe98, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x0138, /* mpllb cfg0 */ > > + 0x7d08, /* mpllb cfg1 */ > > + 0x5486, /* mpllb cfg2 */ > > + 0xfe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x4000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0004, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state * const mtl_c20_hdmi_tables[] = { > > + &mtl_c20_hdmi_25_175, > > + &mtl_c20_hdmi_27_0, > > + &mtl_c20_hdmi_74_25, > > + &mtl_c20_hdmi_148_5, > > + &mtl_c20_hdmi_594, > > + &mtl_c20_hdmi_300, > > + &mtl_c20_hdmi_600, > > + &mtl_c20_hdmi_800, > > + &mtl_c20_hdmi_1000, > > + &mtl_c20_hdmi_1200, > > + NULL, > > +}; > > + > > +static int intel_c10_phy_check_hdmi_link_rate(int clock) > > { > > const struct intel_c10pll_state * const *tables = mtl_c10_hdmi_tables; > > int i; > > @@ -1319,17 +1804,6 @@ static int intel_c10pll_calc_state(struct > intel_crtc_state *crtc_state, > > return -EINVAL; > > } > > > > -int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, > > - struct intel_encoder *encoder) > > -{ > > - struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > - enum phy phy = intel_port_to_phy(i915, encoder->port); > > - > > - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); > > - > > - return intel_c10pll_calc_state(crtc_state, encoder); > > -} > > - > > void intel_c10pll_readout_hw_state(struct intel_encoder *encoder, > > struct intel_c10pll_state *pll_state) { @@ - > 1427,6 +1901,74 > > @@ void intel_c10pll_dump_hw_state(struct drm_i915_private *i915, > > i + 2, hw_state->pll[i + 2], i + 3, hw_state->pll[i + 3]); > } > > > > +static int intel_c20_phy_check_hdmi_link_rate(int clock) { > > + const struct intel_c20pll_state * const *tables = mtl_c20_hdmi_tables; > > + int i; > > + > > + for (i = 0; tables[i]; i++) { > > + if (clock == tables[i]->link_bit_rate) > > + return MODE_OK; > > + } > > + > > + return MODE_CLOCK_RANGE; > > +} > > + > > +int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int > > +clock) { > > + struct intel_digital_port *dig_port = hdmi_to_dig_port(hdmi); > > + struct drm_i915_private *i915 = intel_hdmi_to_i915(hdmi); > > + enum phy phy = intel_port_to_phy(i915, dig_port->base.port); > > + > > + if (intel_is_c10phy(i915, phy)) > > + return intel_c10_phy_check_hdmi_link_rate(clock); > > + return intel_c20_phy_check_hdmi_link_rate(clock); > > +} > > + > > +static const struct intel_c20pll_state * const * > > +intel_c20_pll_tables_get(struct intel_crtc_state *crtc_state, > > + struct intel_encoder *encoder) > > +{ > > + if (intel_crtc_has_dp_encoder(crtc_state)) > > + return mtl_c20_dp_tables; > > + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > > + return mtl_c20_hdmi_tables; > > + > > + MISSING_CASE(encoder->type); > > + return NULL; > > +} > > + > > +static int intel_c20pll_calc_state(struct intel_crtc_state *crtc_state, > > + struct intel_encoder *encoder) { > > + const struct intel_c20pll_state * const *tables; > > + int i; > > + > > + tables = intel_c20_pll_tables_get(crtc_state, encoder); > > + if (!tables) > > + return -EINVAL; > > + > > + for (i = 0; tables[i]; i++) { > > + if (crtc_state->port_clock == tables[i]->link_bit_rate) { > > + crtc_state->cx0pll_state.c20 = *tables[i]; > > + return 0; > > + } > > + } > > + > > + return -EINVAL; > > +} > > + > > +int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, > > + struct intel_encoder *encoder) > > +{ > > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > + enum phy phy = intel_port_to_phy(i915, encoder->port); > > + > > + if (intel_is_c10phy(i915, phy)) > > + return intel_c10pll_calc_state(crtc_state, encoder); > > + return intel_c20pll_calc_state(crtc_state, encoder); } > > + > > static bool intel_c20_use_mplla(u32 clock) { > > /* 10G and 20G rates use MPLLA */ > > @@ -1436,6 +1978,63 @@ static bool intel_c20_use_mplla(u32 clock) > > return false; > > } > > > > +void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, > > + struct intel_c20pll_state *pll_state) { > > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > + bool cntx, use_mpllb; > > + u32 val; > > + int i; > > + > > + /* 1. Read current context selection */ > > + cntx = intel_cx0_read(i915, encoder->port, INTEL_CX0_LANE0, > > +PHY_C20_VDR_CUSTOM_SERDES_RATE) & PHY_C20_CONTEXT_TOGGLE; > > + > > + /* Read Tx configuration */ > > + for (i = 0; i < ARRAY_SIZE(pll_state->tx); i++) { > > + if (cntx) > > + pll_state->tx[i] = intel_c20_sram_read(i915, encoder- > >port, INTEL_CX0_LANE0, > > + > PHY_C20_B_TX_CNTX_CFG(i)); > > + else > > + pll_state->tx[i] = intel_c20_sram_read(i915, encoder- > >port, INTEL_CX0_LANE0, > > + > PHY_C20_A_TX_CNTX_CFG(i)); > > + } > > + > > + /* Read common configuration */ > > + for (i = 0; i < ARRAY_SIZE(pll_state->cmn); i++) { > > + if (cntx) > > + pll_state->cmn[i] = intel_c20_sram_read(i915, encoder- > >port, INTEL_CX0_LANE0, > > + > PHY_C20_B_CMN_CNTX_CFG(i)); > > + else > > + pll_state->cmn[i] = intel_c20_sram_read(i915, encoder- > >port, INTEL_CX0_LANE0, > > + > PHY_C20_A_CMN_CNTX_CFG(i)); > > + } > > + > > + val = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > PHY_C20_A_MPLLA_CNTX_CFG(6)); > > + use_mpllb = val & C20_MPLLB_FRACEN; > > + > > + if (use_mpllb) { > > + /* MPLLA configuration */ > > + for (i = 0; i < ARRAY_SIZE(pll_state->mplla); i++) { > > + if (cntx) > > + pll_state->mplla[i] = intel_c20_sram_read(i915, > encoder->port, INTEL_CX0_LANE0, > > + > PHY_C20_B_MPLLA_CNTX_CFG(i)); > > + else > > + pll_state->mplla[i] = intel_c20_sram_read(i915, > encoder->port, INTEL_CX0_LANE0, > > + > PHY_C20_A_MPLLA_CNTX_CFG(i)); > > + } > > + } else { > > + /* MPLLB configuration */ > > + for (i = 0; i < ARRAY_SIZE(pll_state->mpllb); i++) { > > + if (cntx) > > + pll_state->mpllb[i] = intel_c20_sram_read(i915, > encoder->port, INTEL_CX0_LANE0, > > + > PHY_C20_B_MPLLB_CNTX_CFG(i)); > > + else > > + pll_state->mpllb[i] = intel_c20_sram_read(i915, > encoder->port, INTEL_CX0_LANE0, > > + > PHY_C20_A_MPLLB_CNTX_CFG(i)); > > + } > > + } > > +} > > + > > static u8 intel_c20_get_dp_rate(u32 clock) { > > switch (clock) { > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.h > > b/drivers/gpu/drm/i915/display/intel_cx0_phy.h > > index 509d1d12776e..9760c6292c81 100644 > > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.h > > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.h > > @@ -30,8 +30,12 @@ int intel_c10pll_calc_port_clock(struct intel_encoder > *encoder, > > const struct intel_c10pll_state *pll_state); > void > > intel_c10pll_state_verify(struct intel_atomic_state *state, > > struct intel_crtc_state *new_crtc_state); > > +void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, > > + struct intel_c20pll_state *pll_state); > > void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, > > const struct intel_crtc_state *crtc_state); - > int > > intel_c10_phy_check_hdmi_link_rate(int clock); > > - > > +int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int > > +clock); void intel_cx0_phy_ddi_vswing_sequence(struct intel_encoder > *encoder, > > + const struct intel_crtc_state *crtc_state, > > + u32 level); > > #endif /* __INTEL_CX0_PHY_H__ */ > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > > b/drivers/gpu/drm/i915/display/intel_ddi.c > > index f445f2613adb..44f07011245b 100644 > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > > @@ -3853,10 +3853,13 @@ static void mtl_ddi_get_config(struct > intel_encoder *encoder, > > struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > enum phy phy = intel_port_to_phy(i915, encoder->port); > > > > - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); > > + if (intel_is_c10phy(i915, phy)) { > > + intel_c10pll_readout_hw_state(encoder, &crtc_state- > >cx0pll_state.c10); > > + intel_c10pll_dump_hw_state(i915, &crtc_state- > >cx0pll_state.c10); > > + } else { > > + intel_c20pll_readout_hw_state(encoder, &crtc_state- > >cx0pll_state.c20); > > + } > > > > - intel_c10pll_readout_hw_state(encoder, &crtc_state- > >cx0pll_state.c10); > > - intel_c10pll_dump_hw_state(i915, &crtc_state->cx0pll_state.c10); > > crtc_state->port_clock = intel_c10pll_calc_port_clock(encoder, > > &crtc_state->cx0pll_state.c10); > > > > intel_ddi_get_config(encoder, crtc_state); diff --git > > a/drivers/gpu/drm/i915/display/intel_display_types.h > > b/drivers/gpu/drm/i915/display/intel_display_types.h > > index c9927e12b95e..4eadf45c0a43 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > > @@ -997,6 +997,7 @@ struct intel_c10pll_state { }; > > > > struct intel_c20pll_state { > > + u32 link_bit_rate; > > u32 clock; /* in kHz */ > > u16 tx[3]; > > u16 cmn[4]; > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c > > b/drivers/gpu/drm/i915/display/intel_hdmi.c > > index 8141d5184856..65a258507d62 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > > @@ -58,7 +58,7 @@ > > #include "intel_panel.h" > > #include "intel_snps_phy.h" > > > > -static struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi > > *intel_hdmi) > > +inline struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi > > +*intel_hdmi) > > { > > return to_i915(hdmi_to_dig_port(intel_hdmi)->base.base.dev); > > } > > @@ -1865,8 +1865,8 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi, > > * FIXME: We will hopefully get an algorithmic way of programming > > * the MPLLB for HDMI in the future. > > */ > > - if (IS_METEORLAKE(dev_priv)) > > - return intel_c10_phy_check_hdmi_link_rate(clock); > > + if (DISPLAY_VER(dev_priv) >= 14) > > + return intel_cx0_phy_check_hdmi_link_rate(hdmi, clock); > > else if (IS_DG2(dev_priv)) > > return intel_snps_phy_check_hdmi_link_rate(clock); > > > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h > > b/drivers/gpu/drm/i915/display/intel_hdmi.h > > index 774dda2376ed..492bd3921385 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hdmi.h > > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h > > @@ -54,5 +54,6 @@ int intel_hdmi_dsc_get_num_slices(const struct > intel_crtc_state *crtc_state, > > int src_max_slices, int src_max_slice_width, > > int hdmi_max_slices, int hdmi_throughput); > int > > intel_hdmi_dsc_get_slice_height(int vactive); > > +struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi > > +*intel_hdmi); > > > > #endif /* __INTEL_HDMI_H__ */ > > -- > > 2.34.1 > >
> -----Original Message----- > From: Kahola, Mika <mika.kahola@intel.com> > Sent: Thursday, April 20, 2023 6:11 PM > To: intel-gfx@lists.freedesktop.org > Cc: Kahola, Mika <mika.kahola@intel.com>; Murthy, Arun R > <arun.r.murthy@intel.com>; Nautiyal, Ankit K <ankit.k.nautiyal@intel.com> > Subject: [PATCH 02/13] drm/i915/mtl: C20 HW readout > > Create a table for C20 DP1.4, DP2.0 and HDMI2.1 rates. > The PLL settings are based on table, not for algorithmic alternative. > For DP 1.4 only MPLLB is in use. > > Once register settings are done, we read back C20 HW state. > > BSpec: 64568 > > Signed-off-by: Mika Kahola <mika.kahola@intel.com> > Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com> > Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> > --- > drivers/gpu/drm/i915/display/intel_cx0_phy.c | 623 +++++++++++++++++- > drivers/gpu/drm/i915/display/intel_cx0_phy.h | 8 +- > drivers/gpu/drm/i915/display/intel_ddi.c | 9 +- > .../drm/i915/display/intel_display_types.h | 1 + > drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +- > drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + > 6 files changed, 628 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > index dd96bf5e179e..61428c5145e5 100644 > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > @@ -11,6 +11,7 @@ > #include "intel_de.h" > #include "intel_display_types.h" > #include "intel_dp.h" > +#include "intel_hdmi.h" > #include "intel_panel.h" > #include "intel_psr.h" > #include "intel_tc.h" > @@ -285,6 +286,23 @@ static void intel_c20_sram_write(struct > drm_i915_private *i915, enum port port, > intel_cx0_write(i915, port, lane, PHY_C20_WR_DATA_L, data & 0xff, > 1); } > > +static u16 intel_c20_sram_read(struct drm_i915_private *i915, enum port > port, > + int lane, u16 addr) > +{ > + u16 val; > + > + assert_dc_off(i915); > + > + intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_H, addr >> > 8, 0); > + intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_L, addr & > 0xff, > +1); > + > + val = intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_H); > + val <<= 8; > + val |= intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_L); > + > + return val; > +} > + > static void __intel_cx0_rmw(struct drm_i915_private *i915, enum port port, > int lane, u16 addr, u8 clear, u8 set, bool > committed) { @@ -659,6 +677,199 @@ static const struct intel_c10pll_state > * const mtl_c10_edp_tables[] = { > NULL, > }; > > +/* C20 basic DP 1.4 tables */ > +static const struct intel_c20pll_state mtl_c20_dp_rbr = { > + .link_bit_rate = 162000, > + .clock = 162000, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x5800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x50a8, /* mpllb cfg0 */ > + 0x2120, /* mpllb cfg1 */ > + 0xcd9a, /* mpllb cfg2 */ > + 0xbfc1, /* mpllb cfg3 */ > + 0x5ab8, /* mpllb cfg4 */ > + 0x4c34, /* mpllb cfg5 */ > + 0x2000, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x6000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0000, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_dp_hbr1 = { > + .link_bit_rate = 270000, > + .clock = 270000, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x4800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x308c, /* mpllb cfg0 */ > + 0x2110, /* mpllb cfg1 */ > + 0xcc9c, /* mpllb cfg2 */ > + 0xbfc1, /* mpllb cfg3 */ > + 0x489a, /* mpllb cfg4 */ > + 0x3f81, /* mpllb cfg5 */ > + 0x2000, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x5000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0000, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_dp_hbr2 = { > + .link_bit_rate = 540000, > + .clock = 540000, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x4800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x108c, /* mpllb cfg0 */ > + 0x2108, /* mpllb cfg1 */ > + 0xcc9c, /* mpllb cfg2 */ > + 0xbfc1, /* mpllb cfg3 */ > + 0x489a, /* mpllb cfg4 */ > + 0x3f81, /* mpllb cfg5 */ > + 0x2000, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x5000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0000, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_dp_hbr3 = { > + .link_bit_rate = 810000, > + .clock = 810000, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x4800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x10d2, /* mpllb cfg0 */ > + 0x2108, /* mpllb cfg1 */ > + 0x8d98, /* mpllb cfg2 */ > + 0xbfc1, /* mpllb cfg3 */ > + 0x7166, /* mpllb cfg4 */ > + 0x5f42, /* mpllb cfg5 */ > + 0x2000, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x7800, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0000, /* mpllb cfg10 */ > + }, > +}; > + > +/* C20 basic DP 2.0 tables */ > +static const struct intel_c20pll_state mtl_c20_dp_uhbr10 = { > + .link_bit_rate = 1000000, /* 10 Gbps */ > + .clock = 312500, > + .tx = { 0xbe21, /* tx cfg0 */ > + 0x4800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mplla = { 0x3104, /* mplla cfg0 */ > + 0xd105, /* mplla cfg1 */ > + 0xc025, /* mplla cfg2 */ > + 0xc025, /* mplla cfg3 */ > + 0xa6ab, /* mplla cfg4 */ > + 0x8c00, /* mplla cfg5 */ > + 0x4000, /* mplla cfg6 */ > + 0x0003, /* mplla cfg7 */ > + 0x3555, /* mplla cfg8 */ > + 0x0000, /* mplla cfg9 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_dp_uhbr13_5 = { > + .link_bit_rate = 1350000, /* 13.5 Gbps */ > + .clock = 421875, > + .tx = { 0xbea0, /* tx cfg0 */ > + 0x4800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x015f, /* mpllb cfg0 */ > + 0x2205, /* mpllb cfg1 */ > + 0x1b17, /* mpllb cfg2 */ > + 0xffc1, /* mpllb cfg3 */ > + 0xe100, /* mpllb cfg4 */ > + 0xbd00, /* mpllb cfg5 */ > + 0x2000, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x4800, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0000, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_dp_uhbr20 = { > + .link_bit_rate = 2000000, /* 20 Gbps */ > + .clock = 625000, > + .tx = { 0xbe20, /* tx cfg0 */ > + 0x4800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = {0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mplla = { 0x3104, /* mplla cfg0 */ > + 0xd105, /* mplla cfg1 */ > + 0xc025, /* mplla cfg2 */ > + 0xc025, /* mplla cfg3 */ > + 0xa6ab, /* mplla cfg4 */ > + 0x8c00, /* mplla cfg5 */ > + 0x4000, /* mplla cfg6 */ > + 0x0003, /* mplla cfg7 */ > + 0x3555, /* mplla cfg8 */ > + 0x0002, /* mplla cfg9 */ > + }, > +}; > + > +static const struct intel_c20pll_state * const mtl_c20_dp_tables[] = { > + &mtl_c20_dp_rbr, > + &mtl_c20_dp_hbr1, > + &mtl_c20_dp_hbr2, > + &mtl_c20_dp_hbr3, > + &mtl_c20_dp_uhbr10, > + &mtl_c20_dp_uhbr13_5, > + &mtl_c20_dp_uhbr20, > + NULL, > +}; > + > /* > * HDMI link rates with 38.4 MHz reference clock. > */ > @@ -1243,7 +1454,281 @@ static const struct intel_c10pll_state * const > mtl_c10_hdmi_tables[] = { > NULL, > }; > > -int intel_c10_phy_check_hdmi_link_rate(int clock) > +static const struct intel_c20pll_state mtl_c20_hdmi_25_175 = { > + .link_bit_rate = 25175, > + .clock = 25175, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0xa0d2, /* mpllb cfg0 */ > + 0x7d80, /* mpllb cfg1 */ > + 0x0906, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x0200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x0000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0001, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_27_0 = { > + .link_bit_rate = 27000, > + .clock = 27000, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0xa0e0, /* mpllb cfg0 */ > + 0x7d80, /* mpllb cfg1 */ > + 0x0906, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x8000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0001, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_74_25 = { > + .link_bit_rate = 74250, > + .clock = 74250, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x609a, /* mpllb cfg0 */ > + 0x7d40, /* mpllb cfg1 */ > + 0xca06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x5800, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0001, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_148_5 = { > + .link_bit_rate = 148500, > + .clock = 148500, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x409a, /* mpllb cfg0 */ > + 0x7d20, /* mpllb cfg1 */ > + 0xca06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x5800, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0001, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_594 = { > + .link_bit_rate = 594000, > + .clock = 594000, > + .tx = { 0xbe88, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x009a, /* mpllb cfg0 */ > + 0x7d08, /* mpllb cfg1 */ > + 0xca06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x5800, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0001, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_300 = { > + .link_bit_rate = 3000000, > + .clock = 166670, > + .tx = { 0xbe98, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x209c, /* mpllb cfg0 */ > + 0x7d10, /* mpllb cfg1 */ > + 0xca06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x2000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0004, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_600 = { > + .link_bit_rate = 6000000, > + .clock = 333330, > + .tx = { 0xbe98, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x009c, /* mpllb cfg0 */ > + 0x7d08, /* mpllb cfg1 */ > + 0xca06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x2000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0004, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_800 = { > + .link_bit_rate = 8000000, > + .clock = 444440, > + .tx = { 0xbe98, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x00d0, /* mpllb cfg0 */ > + 0x7d08, /* mpllb cfg1 */ > + 0x4a06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0003, /* mpllb cfg7 */ > + 0x2aaa, /* mpllb cfg8 */ > + 0x0002, /* mpllb cfg9 */ > + 0x0004, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_1000 = { > + .link_bit_rate = 10000000, > + .clock = 555560, > + .tx = { 0xbe98, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x1104, /* mpllb cfg0 */ > + 0x7d08, /* mpllb cfg1 */ > + 0x0a06, /* mpllb cfg2 */ > + 0xbe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0003, /* mpllb cfg7 */ > + 0x3555, /* mpllb cfg8 */ > + 0x0001, /* mpllb cfg9 */ > + 0x0004, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state mtl_c20_hdmi_1200 = { > + .link_bit_rate = 12000000, > + .clock = 666670, > + .tx = { 0xbe98, /* tx cfg0 */ > + 0x9800, /* tx cfg1 */ > + 0x0000, /* tx cfg2 */ > + }, > + .cmn = { 0x0500, /* cmn cfg0*/ > + 0x0005, /* cmn cfg1 */ > + 0x0000, /* cmn cfg2 */ > + 0x0000, /* cmn cfg3 */ > + }, > + .mpllb = { 0x0138, /* mpllb cfg0 */ > + 0x7d08, /* mpllb cfg1 */ > + 0x5486, /* mpllb cfg2 */ > + 0xfe40, /* mpllb cfg3 */ > + 0x0000, /* mpllb cfg4 */ > + 0x0000, /* mpllb cfg5 */ > + 0x2200, /* mpllb cfg6 */ > + 0x0001, /* mpllb cfg7 */ > + 0x4000, /* mpllb cfg8 */ > + 0x0000, /* mpllb cfg9 */ > + 0x0004, /* mpllb cfg10 */ > + }, > +}; > + > +static const struct intel_c20pll_state * const mtl_c20_hdmi_tables[] = { > + &mtl_c20_hdmi_25_175, > + &mtl_c20_hdmi_27_0, > + &mtl_c20_hdmi_74_25, > + &mtl_c20_hdmi_148_5, > + &mtl_c20_hdmi_594, > + &mtl_c20_hdmi_300, > + &mtl_c20_hdmi_600, > + &mtl_c20_hdmi_800, > + &mtl_c20_hdmi_1000, > + &mtl_c20_hdmi_1200, > + NULL, > +}; > + > +static int intel_c10_phy_check_hdmi_link_rate(int clock) > { > const struct intel_c10pll_state * const *tables = > mtl_c10_hdmi_tables; > int i; > @@ -1319,17 +1804,6 @@ static int intel_c10pll_calc_state(struct > intel_crtc_state *crtc_state, > return -EINVAL; > } > > -int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, > - struct intel_encoder *encoder) > -{ > - struct drm_i915_private *i915 = to_i915(encoder->base.dev); > - enum phy phy = intel_port_to_phy(i915, encoder->port); > - > - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); > - > - return intel_c10pll_calc_state(crtc_state, encoder); > -} > - > void intel_c10pll_readout_hw_state(struct intel_encoder *encoder, > struct intel_c10pll_state *pll_state) { @@ - > 1427,6 +1901,74 @@ void intel_c10pll_dump_hw_state(struct > drm_i915_private *i915, > i + 2, hw_state->pll[i + 2], i + 3, hw_state->pll[i + > 3]); } > > +static int intel_c20_phy_check_hdmi_link_rate(int clock) { > + const struct intel_c20pll_state * const *tables = > mtl_c20_hdmi_tables; > + int i; > + > + for (i = 0; tables[i]; i++) { > + if (clock == tables[i]->link_bit_rate) > + return MODE_OK; > + } > + > + return MODE_CLOCK_RANGE; > +} > + > +int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int > +clock) { > + struct intel_digital_port *dig_port = hdmi_to_dig_port(hdmi); > + struct drm_i915_private *i915 = intel_hdmi_to_i915(hdmi); > + enum phy phy = intel_port_to_phy(i915, dig_port->base.port); > + > + if (intel_is_c10phy(i915, phy)) > + return intel_c10_phy_check_hdmi_link_rate(clock); > + return intel_c20_phy_check_hdmi_link_rate(clock); > +} > + > +static const struct intel_c20pll_state * const * > +intel_c20_pll_tables_get(struct intel_crtc_state *crtc_state, > + struct intel_encoder *encoder) > +{ > + if (intel_crtc_has_dp_encoder(crtc_state)) > + return mtl_c20_dp_tables; > + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > + return mtl_c20_hdmi_tables; > + > + MISSING_CASE(encoder->type); > + return NULL; > +} > + > +static int intel_c20pll_calc_state(struct intel_crtc_state *crtc_state, > + struct intel_encoder *encoder) > +{ > + const struct intel_c20pll_state * const *tables; > + int i; > + > + tables = intel_c20_pll_tables_get(crtc_state, encoder); > + if (!tables) > + return -EINVAL; > + > + for (i = 0; tables[i]; i++) { > + if (crtc_state->port_clock == tables[i]->link_bit_rate) { > + crtc_state->cx0pll_state.c20 = *tables[i]; > + return 0; > + } > + } > + > + return -EINVAL; > +} > + > +int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, > + struct intel_encoder *encoder) > +{ > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > + enum phy phy = intel_port_to_phy(i915, encoder->port); > + > + if (intel_is_c10phy(i915, phy)) > + return intel_c10pll_calc_state(crtc_state, encoder); > + return intel_c20pll_calc_state(crtc_state, encoder); } > + > static bool intel_c20_use_mplla(u32 clock) { > /* 10G and 20G rates use MPLLA */ > @@ -1436,6 +1978,63 @@ static bool intel_c20_use_mplla(u32 clock) > return false; > } > > +void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, > + struct intel_c20pll_state *pll_state) { > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > + bool cntx, use_mpllb; > + u32 val; > + int i; > + > + /* 1. Read current context selection */ > + cntx = intel_cx0_read(i915, encoder->port, INTEL_CX0_LANE0, > +PHY_C20_VDR_CUSTOM_SERDES_RATE) & PHY_C20_CONTEXT_TOGGLE; > + > + /* Read Tx configuration */ > + for (i = 0; i < ARRAY_SIZE(pll_state->tx); i++) { > + if (cntx) > + pll_state->tx[i] = intel_c20_sram_read(i915, encoder- > >port, INTEL_CX0_LANE0, > + > PHY_C20_B_TX_CNTX_CFG(i)); > + else > + pll_state->tx[i] = intel_c20_sram_read(i915, encoder- > >port, INTEL_CX0_LANE0, > + > PHY_C20_A_TX_CNTX_CFG(i)); > + } > + > + /* Read common configuration */ > + for (i = 0; i < ARRAY_SIZE(pll_state->cmn); i++) { > + if (cntx) > + pll_state->cmn[i] = intel_c20_sram_read(i915, > encoder->port, INTEL_CX0_LANE0, > + > PHY_C20_B_CMN_CNTX_CFG(i)); > + else > + pll_state->cmn[i] = intel_c20_sram_read(i915, > encoder->port, INTEL_CX0_LANE0, > + > PHY_C20_A_CMN_CNTX_CFG(i)); > + } > + > + val = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > PHY_C20_A_MPLLA_CNTX_CFG(6)); > + use_mpllb = val & C20_MPLLB_FRACEN; > + > + if (use_mpllb) { If mpllb is in use why is it that the data read is copied to mplla of pll_state? I assume that the change is for only context! > + /* MPLLA configuration */ > + for (i = 0; i < ARRAY_SIZE(pll_state->mplla); i++) { > + if (cntx) > + pll_state->mplla[i] = > intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > + > PHY_C20_B_MPLLA_CNTX_CFG(i)); > + else > + pll_state->mplla[i] = > intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > + > PHY_C20_A_MPLLA_CNTX_CFG(i)); > + } > + } else { > + /* MPLLB configuration */ Same here, should this be mplla? Thanks and Regards, Arun R Murthy -------------------- > + for (i = 0; i < ARRAY_SIZE(pll_state->mpllb); i++) { > + if (cntx) > + pll_state->mpllb[i] = > intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > + > PHY_C20_B_MPLLB_CNTX_CFG(i)); > + else > + pll_state->mpllb[i] = > intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > + > PHY_C20_A_MPLLB_CNTX_CFG(i)); > + } > + } > +} > + > static u8 intel_c20_get_dp_rate(u32 clock) { > switch (clock) { > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.h > b/drivers/gpu/drm/i915/display/intel_cx0_phy.h > index 509d1d12776e..9760c6292c81 100644 > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.h > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.h > @@ -30,8 +30,12 @@ int intel_c10pll_calc_port_clock(struct intel_encoder > *encoder, > const struct intel_c10pll_state *pll_state); > void intel_c10pll_state_verify(struct intel_atomic_state *state, > struct intel_crtc_state *new_crtc_state); > +void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, > + struct intel_c20pll_state *pll_state); > void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state); - > int intel_c10_phy_check_hdmi_link_rate(int clock); > - > +int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int > +clock); void intel_cx0_phy_ddi_vswing_sequence(struct intel_encoder > *encoder, > + const struct intel_crtc_state *crtc_state, > + u32 level); > #endif /* __INTEL_CX0_PHY_H__ */ > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > b/drivers/gpu/drm/i915/display/intel_ddi.c > index f445f2613adb..44f07011245b 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -3853,10 +3853,13 @@ static void mtl_ddi_get_config(struct > intel_encoder *encoder, > struct drm_i915_private *i915 = to_i915(encoder->base.dev); > enum phy phy = intel_port_to_phy(i915, encoder->port); > > - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); > + if (intel_is_c10phy(i915, phy)) { > + intel_c10pll_readout_hw_state(encoder, &crtc_state- > >cx0pll_state.c10); > + intel_c10pll_dump_hw_state(i915, &crtc_state- > >cx0pll_state.c10); > + } else { > + intel_c20pll_readout_hw_state(encoder, &crtc_state- > >cx0pll_state.c20); > + } > > - intel_c10pll_readout_hw_state(encoder, &crtc_state- > >cx0pll_state.c10); > - intel_c10pll_dump_hw_state(i915, &crtc_state->cx0pll_state.c10); > crtc_state->port_clock = intel_c10pll_calc_port_clock(encoder, > &crtc_state->cx0pll_state.c10); > > intel_ddi_get_config(encoder, crtc_state); diff --git > a/drivers/gpu/drm/i915/display/intel_display_types.h > b/drivers/gpu/drm/i915/display/intel_display_types.h > index c9927e12b95e..4eadf45c0a43 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -997,6 +997,7 @@ struct intel_c10pll_state { }; > > struct intel_c20pll_state { > + u32 link_bit_rate; > u32 clock; /* in kHz */ > u16 tx[3]; > u16 cmn[4]; > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c > b/drivers/gpu/drm/i915/display/intel_hdmi.c > index 8141d5184856..65a258507d62 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -58,7 +58,7 @@ > #include "intel_panel.h" > #include "intel_snps_phy.h" > > -static struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi > *intel_hdmi) > +inline struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi > +*intel_hdmi) > { > return to_i915(hdmi_to_dig_port(intel_hdmi)->base.base.dev); > } > @@ -1865,8 +1865,8 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi, > * FIXME: We will hopefully get an algorithmic way of programming > * the MPLLB for HDMI in the future. > */ > - if (IS_METEORLAKE(dev_priv)) > - return intel_c10_phy_check_hdmi_link_rate(clock); > + if (DISPLAY_VER(dev_priv) >= 14) > + return intel_cx0_phy_check_hdmi_link_rate(hdmi, clock); > else if (IS_DG2(dev_priv)) > return intel_snps_phy_check_hdmi_link_rate(clock); > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h > b/drivers/gpu/drm/i915/display/intel_hdmi.h > index 774dda2376ed..492bd3921385 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.h > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h > @@ -54,5 +54,6 @@ int intel_hdmi_dsc_get_num_slices(const struct > intel_crtc_state *crtc_state, > int src_max_slices, int src_max_slice_width, > int hdmi_max_slices, int hdmi_throughput); > int intel_hdmi_dsc_get_slice_height(int vactive); > +struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi > +*intel_hdmi); > > #endif /* __INTEL_HDMI_H__ */ > -- > 2.34.1
> -----Original Message----- > From: Murthy, Arun R <arun.r.murthy@intel.com> > Sent: Thursday, April 27, 2023 6:31 AM > To: Kahola, Mika <mika.kahola@intel.com>; intel-gfx@lists.freedesktop.org > Cc: Nautiyal, Ankit K <ankit.k.nautiyal@intel.com> > Subject: RE: [PATCH 02/13] drm/i915/mtl: C20 HW readout > > > -----Original Message----- > > From: Kahola, Mika <mika.kahola@intel.com> > > Sent: Thursday, April 20, 2023 6:11 PM > > To: intel-gfx@lists.freedesktop.org > > Cc: Kahola, Mika <mika.kahola@intel.com>; Murthy, Arun R > > <arun.r.murthy@intel.com>; Nautiyal, Ankit K > > <ankit.k.nautiyal@intel.com> > > Subject: [PATCH 02/13] drm/i915/mtl: C20 HW readout > > > > Create a table for C20 DP1.4, DP2.0 and HDMI2.1 rates. > > The PLL settings are based on table, not for algorithmic alternative. > > For DP 1.4 only MPLLB is in use. > > > > Once register settings are done, we read back C20 HW state. > > > > BSpec: 64568 > > > > Signed-off-by: Mika Kahola <mika.kahola@intel.com> > > Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com> > > Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_cx0_phy.c | 623 +++++++++++++++++- > > drivers/gpu/drm/i915/display/intel_cx0_phy.h | 8 +- > > drivers/gpu/drm/i915/display/intel_ddi.c | 9 +- > > .../drm/i915/display/intel_display_types.h | 1 + > > drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +- > > drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + > > 6 files changed, 628 insertions(+), 20 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > > b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > > index dd96bf5e179e..61428c5145e5 100644 > > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > > @@ -11,6 +11,7 @@ > > #include "intel_de.h" > > #include "intel_display_types.h" > > #include "intel_dp.h" > > +#include "intel_hdmi.h" > > #include "intel_panel.h" > > #include "intel_psr.h" > > #include "intel_tc.h" > > @@ -285,6 +286,23 @@ static void intel_c20_sram_write(struct > > drm_i915_private *i915, enum port port, > > intel_cx0_write(i915, port, lane, PHY_C20_WR_DATA_L, data & 0xff, > > 1); } > > > > +static u16 intel_c20_sram_read(struct drm_i915_private *i915, enum > > +port > > port, > > + int lane, u16 addr) > > +{ > > + u16 val; > > + > > + assert_dc_off(i915); > > + > > + intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_H, addr >> > > 8, 0); > > + intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_L, addr & > > 0xff, > > +1); > > + > > + val = intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_H); > > + val <<= 8; > > + val |= intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_L); > > + > > + return val; > > +} > > + > > static void __intel_cx0_rmw(struct drm_i915_private *i915, enum port port, > > int lane, u16 addr, u8 clear, u8 set, bool > > committed) { @@ -659,6 +677,199 @@ static const struct > > intel_c10pll_state > > * const mtl_c10_edp_tables[] = { > > NULL, > > }; > > > > +/* C20 basic DP 1.4 tables */ > > +static const struct intel_c20pll_state mtl_c20_dp_rbr = { > > + .link_bit_rate = 162000, > > + .clock = 162000, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x5800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x50a8, /* mpllb cfg0 */ > > + 0x2120, /* mpllb cfg1 */ > > + 0xcd9a, /* mpllb cfg2 */ > > + 0xbfc1, /* mpllb cfg3 */ > > + 0x5ab8, /* mpllb cfg4 */ > > + 0x4c34, /* mpllb cfg5 */ > > + 0x2000, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x6000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0000, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_dp_hbr1 = { > > + .link_bit_rate = 270000, > > + .clock = 270000, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x4800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x308c, /* mpllb cfg0 */ > > + 0x2110, /* mpllb cfg1 */ > > + 0xcc9c, /* mpllb cfg2 */ > > + 0xbfc1, /* mpllb cfg3 */ > > + 0x489a, /* mpllb cfg4 */ > > + 0x3f81, /* mpllb cfg5 */ > > + 0x2000, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x5000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0000, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_dp_hbr2 = { > > + .link_bit_rate = 540000, > > + .clock = 540000, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x4800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x108c, /* mpllb cfg0 */ > > + 0x2108, /* mpllb cfg1 */ > > + 0xcc9c, /* mpllb cfg2 */ > > + 0xbfc1, /* mpllb cfg3 */ > > + 0x489a, /* mpllb cfg4 */ > > + 0x3f81, /* mpllb cfg5 */ > > + 0x2000, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x5000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0000, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_dp_hbr3 = { > > + .link_bit_rate = 810000, > > + .clock = 810000, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x4800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x10d2, /* mpllb cfg0 */ > > + 0x2108, /* mpllb cfg1 */ > > + 0x8d98, /* mpllb cfg2 */ > > + 0xbfc1, /* mpllb cfg3 */ > > + 0x7166, /* mpllb cfg4 */ > > + 0x5f42, /* mpllb cfg5 */ > > + 0x2000, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x7800, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0000, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +/* C20 basic DP 2.0 tables */ > > +static const struct intel_c20pll_state mtl_c20_dp_uhbr10 = { > > + .link_bit_rate = 1000000, /* 10 Gbps */ > > + .clock = 312500, > > + .tx = { 0xbe21, /* tx cfg0 */ > > + 0x4800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mplla = { 0x3104, /* mplla cfg0 */ > > + 0xd105, /* mplla cfg1 */ > > + 0xc025, /* mplla cfg2 */ > > + 0xc025, /* mplla cfg3 */ > > + 0xa6ab, /* mplla cfg4 */ > > + 0x8c00, /* mplla cfg5 */ > > + 0x4000, /* mplla cfg6 */ > > + 0x0003, /* mplla cfg7 */ > > + 0x3555, /* mplla cfg8 */ > > + 0x0000, /* mplla cfg9 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_dp_uhbr13_5 = { > > + .link_bit_rate = 1350000, /* 13.5 Gbps */ > > + .clock = 421875, > > + .tx = { 0xbea0, /* tx cfg0 */ > > + 0x4800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x015f, /* mpllb cfg0 */ > > + 0x2205, /* mpllb cfg1 */ > > + 0x1b17, /* mpllb cfg2 */ > > + 0xffc1, /* mpllb cfg3 */ > > + 0xe100, /* mpllb cfg4 */ > > + 0xbd00, /* mpllb cfg5 */ > > + 0x2000, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x4800, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0000, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_dp_uhbr20 = { > > + .link_bit_rate = 2000000, /* 20 Gbps */ > > + .clock = 625000, > > + .tx = { 0xbe20, /* tx cfg0 */ > > + 0x4800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = {0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mplla = { 0x3104, /* mplla cfg0 */ > > + 0xd105, /* mplla cfg1 */ > > + 0xc025, /* mplla cfg2 */ > > + 0xc025, /* mplla cfg3 */ > > + 0xa6ab, /* mplla cfg4 */ > > + 0x8c00, /* mplla cfg5 */ > > + 0x4000, /* mplla cfg6 */ > > + 0x0003, /* mplla cfg7 */ > > + 0x3555, /* mplla cfg8 */ > > + 0x0002, /* mplla cfg9 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state * const mtl_c20_dp_tables[] = { > > + &mtl_c20_dp_rbr, > > + &mtl_c20_dp_hbr1, > > + &mtl_c20_dp_hbr2, > > + &mtl_c20_dp_hbr3, > > + &mtl_c20_dp_uhbr10, > > + &mtl_c20_dp_uhbr13_5, > > + &mtl_c20_dp_uhbr20, > > + NULL, > > +}; > > + > > /* > > * HDMI link rates with 38.4 MHz reference clock. > > */ > > @@ -1243,7 +1454,281 @@ static const struct intel_c10pll_state * const > > mtl_c10_hdmi_tables[] = { > > NULL, > > }; > > > > -int intel_c10_phy_check_hdmi_link_rate(int clock) > > +static const struct intel_c20pll_state mtl_c20_hdmi_25_175 = { > > + .link_bit_rate = 25175, > > + .clock = 25175, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0xa0d2, /* mpllb cfg0 */ > > + 0x7d80, /* mpllb cfg1 */ > > + 0x0906, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x0200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x0000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0001, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_27_0 = { > > + .link_bit_rate = 27000, > > + .clock = 27000, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0xa0e0, /* mpllb cfg0 */ > > + 0x7d80, /* mpllb cfg1 */ > > + 0x0906, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x8000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0001, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_74_25 = { > > + .link_bit_rate = 74250, > > + .clock = 74250, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x609a, /* mpllb cfg0 */ > > + 0x7d40, /* mpllb cfg1 */ > > + 0xca06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x5800, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0001, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_148_5 = { > > + .link_bit_rate = 148500, > > + .clock = 148500, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x409a, /* mpllb cfg0 */ > > + 0x7d20, /* mpllb cfg1 */ > > + 0xca06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x5800, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0001, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_594 = { > > + .link_bit_rate = 594000, > > + .clock = 594000, > > + .tx = { 0xbe88, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x009a, /* mpllb cfg0 */ > > + 0x7d08, /* mpllb cfg1 */ > > + 0xca06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x5800, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0001, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_300 = { > > + .link_bit_rate = 3000000, > > + .clock = 166670, > > + .tx = { 0xbe98, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x209c, /* mpllb cfg0 */ > > + 0x7d10, /* mpllb cfg1 */ > > + 0xca06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x2000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0004, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_600 = { > > + .link_bit_rate = 6000000, > > + .clock = 333330, > > + .tx = { 0xbe98, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x009c, /* mpllb cfg0 */ > > + 0x7d08, /* mpllb cfg1 */ > > + 0xca06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x2000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0004, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_800 = { > > + .link_bit_rate = 8000000, > > + .clock = 444440, > > + .tx = { 0xbe98, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x00d0, /* mpllb cfg0 */ > > + 0x7d08, /* mpllb cfg1 */ > > + 0x4a06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0003, /* mpllb cfg7 */ > > + 0x2aaa, /* mpllb cfg8 */ > > + 0x0002, /* mpllb cfg9 */ > > + 0x0004, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_1000 = { > > + .link_bit_rate = 10000000, > > + .clock = 555560, > > + .tx = { 0xbe98, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x1104, /* mpllb cfg0 */ > > + 0x7d08, /* mpllb cfg1 */ > > + 0x0a06, /* mpllb cfg2 */ > > + 0xbe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0003, /* mpllb cfg7 */ > > + 0x3555, /* mpllb cfg8 */ > > + 0x0001, /* mpllb cfg9 */ > > + 0x0004, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state mtl_c20_hdmi_1200 = { > > + .link_bit_rate = 12000000, > > + .clock = 666670, > > + .tx = { 0xbe98, /* tx cfg0 */ > > + 0x9800, /* tx cfg1 */ > > + 0x0000, /* tx cfg2 */ > > + }, > > + .cmn = { 0x0500, /* cmn cfg0*/ > > + 0x0005, /* cmn cfg1 */ > > + 0x0000, /* cmn cfg2 */ > > + 0x0000, /* cmn cfg3 */ > > + }, > > + .mpllb = { 0x0138, /* mpllb cfg0 */ > > + 0x7d08, /* mpllb cfg1 */ > > + 0x5486, /* mpllb cfg2 */ > > + 0xfe40, /* mpllb cfg3 */ > > + 0x0000, /* mpllb cfg4 */ > > + 0x0000, /* mpllb cfg5 */ > > + 0x2200, /* mpllb cfg6 */ > > + 0x0001, /* mpllb cfg7 */ > > + 0x4000, /* mpllb cfg8 */ > > + 0x0000, /* mpllb cfg9 */ > > + 0x0004, /* mpllb cfg10 */ > > + }, > > +}; > > + > > +static const struct intel_c20pll_state * const mtl_c20_hdmi_tables[] = { > > + &mtl_c20_hdmi_25_175, > > + &mtl_c20_hdmi_27_0, > > + &mtl_c20_hdmi_74_25, > > + &mtl_c20_hdmi_148_5, > > + &mtl_c20_hdmi_594, > > + &mtl_c20_hdmi_300, > > + &mtl_c20_hdmi_600, > > + &mtl_c20_hdmi_800, > > + &mtl_c20_hdmi_1000, > > + &mtl_c20_hdmi_1200, > > + NULL, > > +}; > > + > > +static int intel_c10_phy_check_hdmi_link_rate(int clock) > > { > > const struct intel_c10pll_state * const *tables = > > mtl_c10_hdmi_tables; > > int i; > > @@ -1319,17 +1804,6 @@ static int intel_c10pll_calc_state(struct > > intel_crtc_state *crtc_state, > > return -EINVAL; > > } > > > > -int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, > > - struct intel_encoder *encoder) > > -{ > > - struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > - enum phy phy = intel_port_to_phy(i915, encoder->port); > > - > > - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); > > - > > - return intel_c10pll_calc_state(crtc_state, encoder); > > -} > > - > > void intel_c10pll_readout_hw_state(struct intel_encoder *encoder, > > struct intel_c10pll_state *pll_state) { @@ - > > 1427,6 +1901,74 @@ void intel_c10pll_dump_hw_state(struct > > drm_i915_private *i915, > > i + 2, hw_state->pll[i + 2], i + 3, hw_state->pll[i + 3]); > } > > > > +static int intel_c20_phy_check_hdmi_link_rate(int clock) { > > + const struct intel_c20pll_state * const *tables = > > mtl_c20_hdmi_tables; > > + int i; > > + > > + for (i = 0; tables[i]; i++) { > > + if (clock == tables[i]->link_bit_rate) > > + return MODE_OK; > > + } > > + > > + return MODE_CLOCK_RANGE; > > +} > > + > > +int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int > > +clock) { > > + struct intel_digital_port *dig_port = hdmi_to_dig_port(hdmi); > > + struct drm_i915_private *i915 = intel_hdmi_to_i915(hdmi); > > + enum phy phy = intel_port_to_phy(i915, dig_port->base.port); > > + > > + if (intel_is_c10phy(i915, phy)) > > + return intel_c10_phy_check_hdmi_link_rate(clock); > > + return intel_c20_phy_check_hdmi_link_rate(clock); > > +} > > + > > +static const struct intel_c20pll_state * const * > > +intel_c20_pll_tables_get(struct intel_crtc_state *crtc_state, > > + struct intel_encoder *encoder) > > +{ > > + if (intel_crtc_has_dp_encoder(crtc_state)) > > + return mtl_c20_dp_tables; > > + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > > + return mtl_c20_hdmi_tables; > > + > > + MISSING_CASE(encoder->type); > > + return NULL; > > +} > > + > > +static int intel_c20pll_calc_state(struct intel_crtc_state *crtc_state, > > + struct intel_encoder *encoder) { > > + const struct intel_c20pll_state * const *tables; > > + int i; > > + > > + tables = intel_c20_pll_tables_get(crtc_state, encoder); > > + if (!tables) > > + return -EINVAL; > > + > > + for (i = 0; tables[i]; i++) { > > + if (crtc_state->port_clock == tables[i]->link_bit_rate) { > > + crtc_state->cx0pll_state.c20 = *tables[i]; > > + return 0; > > + } > > + } > > + > > + return -EINVAL; > > +} > > + > > +int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, > > + struct intel_encoder *encoder) > > +{ > > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > + enum phy phy = intel_port_to_phy(i915, encoder->port); > > + > > + if (intel_is_c10phy(i915, phy)) > > + return intel_c10pll_calc_state(crtc_state, encoder); > > + return intel_c20pll_calc_state(crtc_state, encoder); } > > + > > static bool intel_c20_use_mplla(u32 clock) { > > /* 10G and 20G rates use MPLLA */ > > @@ -1436,6 +1978,63 @@ static bool intel_c20_use_mplla(u32 clock) > > return false; > > } > > > > +void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, > > + struct intel_c20pll_state *pll_state) { > > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > + bool cntx, use_mpllb; > > + u32 val; > > + int i; > > + > > + /* 1. Read current context selection */ > > + cntx = intel_cx0_read(i915, encoder->port, INTEL_CX0_LANE0, > > +PHY_C20_VDR_CUSTOM_SERDES_RATE) & PHY_C20_CONTEXT_TOGGLE; > > + > > + /* Read Tx configuration */ > > + for (i = 0; i < ARRAY_SIZE(pll_state->tx); i++) { > > + if (cntx) > > + pll_state->tx[i] = intel_c20_sram_read(i915, encoder- > > >port, INTEL_CX0_LANE0, > > + > > PHY_C20_B_TX_CNTX_CFG(i)); > > + else > > + pll_state->tx[i] = intel_c20_sram_read(i915, encoder- > > >port, INTEL_CX0_LANE0, > > + > > PHY_C20_A_TX_CNTX_CFG(i)); > > + } > > + > > + /* Read common configuration */ > > + for (i = 0; i < ARRAY_SIZE(pll_state->cmn); i++) { > > + if (cntx) > > + pll_state->cmn[i] = intel_c20_sram_read(i915, > > encoder->port, INTEL_CX0_LANE0, > > + > > PHY_C20_B_CMN_CNTX_CFG(i)); > > + else > > + pll_state->cmn[i] = intel_c20_sram_read(i915, > > encoder->port, INTEL_CX0_LANE0, > > + > > PHY_C20_A_CMN_CNTX_CFG(i)); > > + } > > + > > + val = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > > PHY_C20_A_MPLLA_CNTX_CFG(6)); > > + use_mpllb = val & C20_MPLLB_FRACEN; > > + > > + if (use_mpllb) { > > If mpllb is in use why is it that the data read is copied to mplla of pll_state? > I assume that the change is for only context! This should state use_mplla. This is a typo from the change that wasn't useful. Good catch, thanks! I also noticed that we cannot use mplla_fracen as differentiator between mplla and mpllb. These both has fracen enabled. I was thinking that in this case the differentiator could be mpllx_fracn_quot i.e. tx[8]. For both 10G and 20G rates the franc_quot is 0x3555 which is not used for any other rate. -Mika- > > > + /* MPLLA configuration */ > > + for (i = 0; i < ARRAY_SIZE(pll_state->mplla); i++) { > > + if (cntx) > > + pll_state->mplla[i] = > > intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > > + > > PHY_C20_B_MPLLA_CNTX_CFG(i)); > > + else > > + pll_state->mplla[i] = > > intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > > + > > PHY_C20_A_MPLLA_CNTX_CFG(i)); > > + } > > + } else { > > + /* MPLLB configuration */ > > > Same here, should this be mplla? > > Thanks and Regards, > Arun R Murthy > -------------------- > > > + for (i = 0; i < ARRAY_SIZE(pll_state->mpllb); i++) { > > + if (cntx) > > + pll_state->mpllb[i] = > > intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > > + > > PHY_C20_B_MPLLB_CNTX_CFG(i)); > > + else > > + pll_state->mpllb[i] = > > intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > > + > > PHY_C20_A_MPLLB_CNTX_CFG(i)); > > + } > > + } > > +} > > + > > static u8 intel_c20_get_dp_rate(u32 clock) { > > switch (clock) { > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.h > > b/drivers/gpu/drm/i915/display/intel_cx0_phy.h > > index 509d1d12776e..9760c6292c81 100644 > > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.h > > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.h > > @@ -30,8 +30,12 @@ int intel_c10pll_calc_port_clock(struct > > intel_encoder *encoder, > > const struct intel_c10pll_state *pll_state); void > > intel_c10pll_state_verify(struct intel_atomic_state *state, > > struct intel_crtc_state *new_crtc_state); > > +void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, > > + struct intel_c20pll_state *pll_state); > > void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, > > const struct intel_crtc_state *crtc_state); - > int > > intel_c10_phy_check_hdmi_link_rate(int clock); > > - > > +int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int > > +clock); void intel_cx0_phy_ddi_vswing_sequence(struct intel_encoder > > *encoder, > > + const struct intel_crtc_state *crtc_state, > > + u32 level); > > #endif /* __INTEL_CX0_PHY_H__ */ > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > > b/drivers/gpu/drm/i915/display/intel_ddi.c > > index f445f2613adb..44f07011245b 100644 > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > > @@ -3853,10 +3853,13 @@ static void mtl_ddi_get_config(struct > > intel_encoder *encoder, > > struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > enum phy phy = intel_port_to_phy(i915, encoder->port); > > > > - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); > > + if (intel_is_c10phy(i915, phy)) { > > + intel_c10pll_readout_hw_state(encoder, &crtc_state- > > >cx0pll_state.c10); > > + intel_c10pll_dump_hw_state(i915, &crtc_state- > > >cx0pll_state.c10); > > + } else { > > + intel_c20pll_readout_hw_state(encoder, &crtc_state- > > >cx0pll_state.c20); > > + } > > > > - intel_c10pll_readout_hw_state(encoder, &crtc_state- > > >cx0pll_state.c10); > > - intel_c10pll_dump_hw_state(i915, &crtc_state->cx0pll_state.c10); > > crtc_state->port_clock = intel_c10pll_calc_port_clock(encoder, > > &crtc_state->cx0pll_state.c10); > > > > intel_ddi_get_config(encoder, crtc_state); diff --git > > a/drivers/gpu/drm/i915/display/intel_display_types.h > > b/drivers/gpu/drm/i915/display/intel_display_types.h > > index c9927e12b95e..4eadf45c0a43 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > > @@ -997,6 +997,7 @@ struct intel_c10pll_state { }; > > > > struct intel_c20pll_state { > > + u32 link_bit_rate; > > u32 clock; /* in kHz */ > > u16 tx[3]; > > u16 cmn[4]; > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c > > b/drivers/gpu/drm/i915/display/intel_hdmi.c > > index 8141d5184856..65a258507d62 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > > @@ -58,7 +58,7 @@ > > #include "intel_panel.h" > > #include "intel_snps_phy.h" > > > > -static struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi > > *intel_hdmi) > > +inline struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi > > +*intel_hdmi) > > { > > return to_i915(hdmi_to_dig_port(intel_hdmi)->base.base.dev); > > } > > @@ -1865,8 +1865,8 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi, > > * FIXME: We will hopefully get an algorithmic way of programming > > * the MPLLB for HDMI in the future. > > */ > > - if (IS_METEORLAKE(dev_priv)) > > - return intel_c10_phy_check_hdmi_link_rate(clock); > > + if (DISPLAY_VER(dev_priv) >= 14) > > + return intel_cx0_phy_check_hdmi_link_rate(hdmi, clock); > > else if (IS_DG2(dev_priv)) > > return intel_snps_phy_check_hdmi_link_rate(clock); > > > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h > > b/drivers/gpu/drm/i915/display/intel_hdmi.h > > index 774dda2376ed..492bd3921385 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hdmi.h > > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h > > @@ -54,5 +54,6 @@ int intel_hdmi_dsc_get_num_slices(const struct > > intel_crtc_state *crtc_state, > > int src_max_slices, int src_max_slice_width, > > int hdmi_max_slices, int hdmi_throughput); int > > intel_hdmi_dsc_get_slice_height(int vactive); > > +struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi > > +*intel_hdmi); > > > > #endif /* __INTEL_HDMI_H__ */ > > -- > > 2.34.1
> -----Original Message----- > From: Kahola, Mika <mika.kahola@intel.com> > Sent: Wednesday, April 26, 2023 4:43 AM > To: Sripada, Radhakrishna <radhakrishna.sripada@intel.com> > Cc: intel-gfx@lists.freedesktop.org > Subject: RE: [Intel-gfx] [PATCH 02/13] drm/i915/mtl: C20 HW readout > > > -----Original Message----- > > From: Sripada, Radhakrishna <radhakrishna.sripada@intel.com> > > Sent: Monday, April 24, 2023 11:56 PM > > To: Kahola, Mika <mika.kahola@intel.com> > > Cc: intel-gfx@lists.freedesktop.org > > Subject: Re: [Intel-gfx] [PATCH 02/13] drm/i915/mtl: C20 HW readout > > > > On Thu, Apr 20, 2023 at 03:40:39PM +0300, Mika Kahola wrote: > > > Create a table for C20 DP1.4, DP2.0 and HDMI2.1 rates. > > > The PLL settings are based on table, not for algorithmic alternative. > > > For DP 1.4 only MPLLB is in use. > > > > > > Once register settings are done, we read back C20 HW state. > > > > > > BSpec: 64568 > > > > > > Signed-off-by: Mika Kahola <mika.kahola@intel.com> > > > Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com> > > > Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> > > > --- > > > drivers/gpu/drm/i915/display/intel_cx0_phy.c | 623 +++++++++++++++++- > > > drivers/gpu/drm/i915/display/intel_cx0_phy.h | 8 +- > > > drivers/gpu/drm/i915/display/intel_ddi.c | 9 +- > > > .../drm/i915/display/intel_display_types.h | 1 + > > > drivers/gpu/drm/i915/display/intel_hdmi.c | 6 +- > > > drivers/gpu/drm/i915/display/intel_hdmi.h | 1 + > > > 6 files changed, 628 insertions(+), 20 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > > > b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > > > index dd96bf5e179e..61428c5145e5 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > > > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > > > @@ -11,6 +11,7 @@ > > > #include "intel_de.h" > > > #include "intel_display_types.h" > > > #include "intel_dp.h" > > > +#include "intel_hdmi.h" > > > #include "intel_panel.h" > > > #include "intel_psr.h" > > > #include "intel_tc.h" > > > @@ -285,6 +286,23 @@ static void intel_c20_sram_write(struct > > drm_i915_private *i915, enum port port, > > > intel_cx0_write(i915, port, lane, PHY_C20_WR_DATA_L, data & 0xff, > > > 1); } > > > > > > +static u16 intel_c20_sram_read(struct drm_i915_private *i915, enum port > > port, > > > + int lane, u16 addr) > > > +{ > > > + u16 val; > > > + > > > + assert_dc_off(i915); > > > + > > > + intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_H, addr >> 8, > > 0); > > > + intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_L, addr & 0xff, > > > +1); > > > + > > > + val = intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_H); > > > + val <<= 8; > > > + val |= intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_L); > > > + > > > + return val; > > > +} > > > + > > > static void __intel_cx0_rmw(struct drm_i915_private *i915, enum port port, > > > int lane, u16 addr, u8 clear, u8 set, bool committed) { > > @@ > > > -659,6 +677,199 @@ static const struct intel_c10pll_state * const > > mtl_c10_edp_tables[] = { > > > NULL, > > > }; > > > > > > +/* C20 basic DP 1.4 tables */ > > > +static const struct intel_c20pll_state mtl_c20_dp_rbr = { > > > + .link_bit_rate = 162000, > > > + .clock = 162000, > > > + .tx = { 0xbe88, /* tx cfg0 */ > > > + 0x5800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = {0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x50a8, /* mpllb cfg0 */ > > > + 0x2120, /* mpllb cfg1 */ > > > + 0xcd9a, /* mpllb cfg2 */ > > > + 0xbfc1, /* mpllb cfg3 */ > > > + 0x5ab8, /* mpllb cfg4 */ > > > + 0x4c34, /* mpllb cfg5 */ > > > + 0x2000, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x6000, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0000, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_dp_hbr1 = { > > > + .link_bit_rate = 270000, > > > + .clock = 270000, > > > + .tx = { 0xbe88, /* tx cfg0 */ > > > + 0x4800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = {0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x308c, /* mpllb cfg0 */ > > > + 0x2110, /* mpllb cfg1 */ > > > + 0xcc9c, /* mpllb cfg2 */ > > > + 0xbfc1, /* mpllb cfg3 */ > > > + 0x489a, /* mpllb cfg4 */ > > This should be 0x4b9a ^ for mpllb cfg4 according to the consolidated table. > Yes. Perhaps this has changed since the time of writing. > > > > > > + 0x3f81, /* mpllb cfg5 */ > > > + 0x2000, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x5000, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0000, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_dp_hbr2 = { > > > + .link_bit_rate = 540000, > > > + .clock = 540000, > > > + .tx = { 0xbe88, /* tx cfg0 */ > > > + 0x4800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = {0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x108c, /* mpllb cfg0 */ > > > + 0x2108, /* mpllb cfg1 */ > > > + 0xcc9c, /* mpllb cfg2 */ > > > + 0xbfc1, /* mpllb cfg3 */ > > > + 0x489a, /* mpllb cfg4 */ > > This should be 0x4b9a ^ for mpllb cfg4 according to the consolidated table. > I will change this one too. > > > > > > + 0x3f81, /* mpllb cfg5 */ > > > + 0x2000, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x5000, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0000, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_dp_hbr3 = { > > > + .link_bit_rate = 810000, > > > + .clock = 810000, > > > + .tx = { 0xbe88, /* tx cfg0 */ > > > + 0x4800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = {0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x10d2, /* mpllb cfg0 */ > > > + 0x2108, /* mpllb cfg1 */ > > > + 0x8d98, /* mpllb cfg2 */ > > > + 0xbfc1, /* mpllb cfg3 */ > > > + 0x7166, /* mpllb cfg4 */ > > > + 0x5f42, /* mpllb cfg5 */ > > > + 0x2000, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x7800, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0000, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +/* C20 basic DP 2.0 tables */ > > > +static const struct intel_c20pll_state mtl_c20_dp_uhbr10 = { > > > + .link_bit_rate = 1000000, /* 10 Gbps */ > > > + .clock = 312500, > > > + .tx = { 0xbe21, /* tx cfg0 */ > > > + 0x4800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = {0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mplla = { 0x3104, /* mplla cfg0 */ > > > + 0xd105, /* mplla cfg1 */ > > > + 0xc025, /* mplla cfg2 */ > > > + 0xc025, /* mplla cfg3 */ > > > + 0xa6ab, /* mplla cfg4 */ > > This should be 0x8c00 ^ for mplla cfg4 according to the consolidated table. > True. I will update this > > > > > + 0x8c00, /* mplla cfg5 */ > > This should be 0x759a ^ for mplla cfg5 according to the consolidated table. > As well as this one. > > > > > + 0x4000, /* mplla cfg6 */ > > > + 0x0003, /* mplla cfg7 */ > > > + 0x3555, /* mplla cfg8 */ > > > + 0x0000, /* mplla cfg9 */ > > This should be 0x0001 ^ for mplla cfg9 according to the consolidated table. > This is bit controversial. The consolidated table indeed suggests that these mplla > cfg9 > values should be 0x0001 for both 10G and 20G rates. However, if we look at the > table > definition "C20 MPLLA Programming for DP UHBR link rates (10G and 20G)" for > mplla cfg9 > it states for mplla_frac_rem parameter 0x0000 for 10G and 0x0002 for 20G. > Now, which > one of these are the correct ones? Should we rely on values defined > consolidated table? I was in discussion with HW Architects for some C10 phy issue. I was told that consolidated tables are more accurate. -Radhakrishna(RK) Sripada > > > > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_dp_uhbr13_5 = { > > > + .link_bit_rate = 1350000, /* 13.5 Gbps */ > > > + .clock = 421875, > > > + .tx = { 0xbea0, /* tx cfg0 */ > > > + 0x4800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = {0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x015f, /* mpllb cfg0 */ > > > + 0x2205, /* mpllb cfg1 */ > > > + 0x1b17, /* mpllb cfg2 */ > > > + 0xffc1, /* mpllb cfg3 */ > > > + 0xe100, /* mpllb cfg4 */ > > > + 0xbd00, /* mpllb cfg5 */ > > > + 0x2000, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x4800, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0000, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_dp_uhbr20 = { > > > + .link_bit_rate = 2000000, /* 20 Gbps */ > > > + .clock = 625000, > > > + .tx = { 0xbe20, /* tx cfg0 */ > > > + 0x4800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = {0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mplla = { 0x3104, /* mplla cfg0 */ > > > + 0xd105, /* mplla cfg1 */ > > > + 0xc025, /* mplla cfg2 */ > > > + 0xc025, /* mplla cfg3 */ > > > + 0xa6ab, /* mplla cfg4 */ > > > + 0x8c00, /* mplla cfg5 */ > > > + 0x4000, /* mplla cfg6 */ > > > + 0x0003, /* mplla cfg7 */ > > > + 0x3555, /* mplla cfg8 */ > > > + 0x0002, /* mplla cfg9 */ > > This should be 0x0001 ^ for mplla cfg9 according to the consolidated table. > > > > These are the suggested changes for now. I would need to check the HDMI > > tables. > > Thanks for the review and comments! > > -Mika- > > > > - Radhakrishna(RK) Sripada > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state * const mtl_c20_dp_tables[] = { > > > + &mtl_c20_dp_rbr, > > > + &mtl_c20_dp_hbr1, > > > + &mtl_c20_dp_hbr2, > > > + &mtl_c20_dp_hbr3, > > > + &mtl_c20_dp_uhbr10, > > > + &mtl_c20_dp_uhbr13_5, > > > + &mtl_c20_dp_uhbr20, > > > + NULL, > > > +}; > > > + > > > /* > > > * HDMI link rates with 38.4 MHz reference clock. > > > */ > > > @@ -1243,7 +1454,281 @@ static const struct intel_c10pll_state * const > > mtl_c10_hdmi_tables[] = { > > > NULL, > > > }; > > > > > > -int intel_c10_phy_check_hdmi_link_rate(int clock) > > > +static const struct intel_c20pll_state mtl_c20_hdmi_25_175 = { > > > + .link_bit_rate = 25175, > > > + .clock = 25175, > > > + .tx = { 0xbe88, /* tx cfg0 */ > > > + 0x9800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = { 0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0xa0d2, /* mpllb cfg0 */ > > > + 0x7d80, /* mpllb cfg1 */ > > > + 0x0906, /* mpllb cfg2 */ > > > + 0xbe40, /* mpllb cfg3 */ > > > + 0x0000, /* mpllb cfg4 */ > > > + 0x0000, /* mpllb cfg5 */ > > > + 0x0200, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x0000, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0001, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_hdmi_27_0 = { > > > + .link_bit_rate = 27000, > > > + .clock = 27000, > > > + .tx = { 0xbe88, /* tx cfg0 */ > > > + 0x9800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = { 0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0xa0e0, /* mpllb cfg0 */ > > > + 0x7d80, /* mpllb cfg1 */ > > > + 0x0906, /* mpllb cfg2 */ > > > + 0xbe40, /* mpllb cfg3 */ > > > + 0x0000, /* mpllb cfg4 */ > > > + 0x0000, /* mpllb cfg5 */ > > > + 0x2200, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x8000, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0001, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_hdmi_74_25 = { > > > + .link_bit_rate = 74250, > > > + .clock = 74250, > > > + .tx = { 0xbe88, /* tx cfg0 */ > > > + 0x9800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = { 0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x609a, /* mpllb cfg0 */ > > > + 0x7d40, /* mpllb cfg1 */ > > > + 0xca06, /* mpllb cfg2 */ > > > + 0xbe40, /* mpllb cfg3 */ > > > + 0x0000, /* mpllb cfg4 */ > > > + 0x0000, /* mpllb cfg5 */ > > > + 0x2200, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x5800, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0001, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_hdmi_148_5 = { > > > + .link_bit_rate = 148500, > > > + .clock = 148500, > > > + .tx = { 0xbe88, /* tx cfg0 */ > > > + 0x9800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = { 0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x409a, /* mpllb cfg0 */ > > > + 0x7d20, /* mpllb cfg1 */ > > > + 0xca06, /* mpllb cfg2 */ > > > + 0xbe40, /* mpllb cfg3 */ > > > + 0x0000, /* mpllb cfg4 */ > > > + 0x0000, /* mpllb cfg5 */ > > > + 0x2200, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x5800, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0001, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_hdmi_594 = { > > > + .link_bit_rate = 594000, > > > + .clock = 594000, > > > + .tx = { 0xbe88, /* tx cfg0 */ > > > + 0x9800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = { 0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x009a, /* mpllb cfg0 */ > > > + 0x7d08, /* mpllb cfg1 */ > > > + 0xca06, /* mpllb cfg2 */ > > > + 0xbe40, /* mpllb cfg3 */ > > > + 0x0000, /* mpllb cfg4 */ > > > + 0x0000, /* mpllb cfg5 */ > > > + 0x2200, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x5800, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0001, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_hdmi_300 = { > > > + .link_bit_rate = 3000000, > > > + .clock = 166670, > > > + .tx = { 0xbe98, /* tx cfg0 */ > > > + 0x9800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = { 0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x209c, /* mpllb cfg0 */ > > > + 0x7d10, /* mpllb cfg1 */ > > > + 0xca06, /* mpllb cfg2 */ > > > + 0xbe40, /* mpllb cfg3 */ > > > + 0x0000, /* mpllb cfg4 */ > > > + 0x0000, /* mpllb cfg5 */ > > > + 0x2200, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x2000, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0004, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_hdmi_600 = { > > > + .link_bit_rate = 6000000, > > > + .clock = 333330, > > > + .tx = { 0xbe98, /* tx cfg0 */ > > > + 0x9800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = { 0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x009c, /* mpllb cfg0 */ > > > + 0x7d08, /* mpllb cfg1 */ > > > + 0xca06, /* mpllb cfg2 */ > > > + 0xbe40, /* mpllb cfg3 */ > > > + 0x0000, /* mpllb cfg4 */ > > > + 0x0000, /* mpllb cfg5 */ > > > + 0x2200, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x2000, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0004, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_hdmi_800 = { > > > + .link_bit_rate = 8000000, > > > + .clock = 444440, > > > + .tx = { 0xbe98, /* tx cfg0 */ > > > + 0x9800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = { 0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x00d0, /* mpllb cfg0 */ > > > + 0x7d08, /* mpllb cfg1 */ > > > + 0x4a06, /* mpllb cfg2 */ > > > + 0xbe40, /* mpllb cfg3 */ > > > + 0x0000, /* mpllb cfg4 */ > > > + 0x0000, /* mpllb cfg5 */ > > > + 0x2200, /* mpllb cfg6 */ > > > + 0x0003, /* mpllb cfg7 */ > > > + 0x2aaa, /* mpllb cfg8 */ > > > + 0x0002, /* mpllb cfg9 */ > > > + 0x0004, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_hdmi_1000 = { > > > + .link_bit_rate = 10000000, > > > + .clock = 555560, > > > + .tx = { 0xbe98, /* tx cfg0 */ > > > + 0x9800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = { 0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x1104, /* mpllb cfg0 */ > > > + 0x7d08, /* mpllb cfg1 */ > > > + 0x0a06, /* mpllb cfg2 */ > > > + 0xbe40, /* mpllb cfg3 */ > > > + 0x0000, /* mpllb cfg4 */ > > > + 0x0000, /* mpllb cfg5 */ > > > + 0x2200, /* mpllb cfg6 */ > > > + 0x0003, /* mpllb cfg7 */ > > > + 0x3555, /* mpllb cfg8 */ > > > + 0x0001, /* mpllb cfg9 */ > > > + 0x0004, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state mtl_c20_hdmi_1200 = { > > > + .link_bit_rate = 12000000, > > > + .clock = 666670, > > > + .tx = { 0xbe98, /* tx cfg0 */ > > > + 0x9800, /* tx cfg1 */ > > > + 0x0000, /* tx cfg2 */ > > > + }, > > > + .cmn = { 0x0500, /* cmn cfg0*/ > > > + 0x0005, /* cmn cfg1 */ > > > + 0x0000, /* cmn cfg2 */ > > > + 0x0000, /* cmn cfg3 */ > > > + }, > > > + .mpllb = { 0x0138, /* mpllb cfg0 */ > > > + 0x7d08, /* mpllb cfg1 */ > > > + 0x5486, /* mpllb cfg2 */ > > > + 0xfe40, /* mpllb cfg3 */ > > > + 0x0000, /* mpllb cfg4 */ > > > + 0x0000, /* mpllb cfg5 */ > > > + 0x2200, /* mpllb cfg6 */ > > > + 0x0001, /* mpllb cfg7 */ > > > + 0x4000, /* mpllb cfg8 */ > > > + 0x0000, /* mpllb cfg9 */ > > > + 0x0004, /* mpllb cfg10 */ > > > + }, > > > +}; > > > + > > > +static const struct intel_c20pll_state * const mtl_c20_hdmi_tables[] = { > > > + &mtl_c20_hdmi_25_175, > > > + &mtl_c20_hdmi_27_0, > > > + &mtl_c20_hdmi_74_25, > > > + &mtl_c20_hdmi_148_5, > > > + &mtl_c20_hdmi_594, > > > + &mtl_c20_hdmi_300, > > > + &mtl_c20_hdmi_600, > > > + &mtl_c20_hdmi_800, > > > + &mtl_c20_hdmi_1000, > > > + &mtl_c20_hdmi_1200, > > > + NULL, > > > +}; > > > + > > > +static int intel_c10_phy_check_hdmi_link_rate(int clock) > > > { > > > const struct intel_c10pll_state * const *tables = mtl_c10_hdmi_tables; > > > int i; > > > @@ -1319,17 +1804,6 @@ static int intel_c10pll_calc_state(struct > > intel_crtc_state *crtc_state, > > > return -EINVAL; > > > } > > > > > > -int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, > > > - struct intel_encoder *encoder) > > > -{ > > > - struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > > - enum phy phy = intel_port_to_phy(i915, encoder->port); > > > - > > > - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); > > > - > > > - return intel_c10pll_calc_state(crtc_state, encoder); > > > -} > > > - > > > void intel_c10pll_readout_hw_state(struct intel_encoder *encoder, > > > struct intel_c10pll_state *pll_state) { @@ - > > 1427,6 +1901,74 > > > @@ void intel_c10pll_dump_hw_state(struct drm_i915_private *i915, > > > i + 2, hw_state->pll[i + 2], i + 3, hw_state->pll[i + 3]); > > } > > > > > > +static int intel_c20_phy_check_hdmi_link_rate(int clock) { > > > + const struct intel_c20pll_state * const *tables = mtl_c20_hdmi_tables; > > > + int i; > > > + > > > + for (i = 0; tables[i]; i++) { > > > + if (clock == tables[i]->link_bit_rate) > > > + return MODE_OK; > > > + } > > > + > > > + return MODE_CLOCK_RANGE; > > > +} > > > + > > > +int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int > > > +clock) { > > > + struct intel_digital_port *dig_port = hdmi_to_dig_port(hdmi); > > > + struct drm_i915_private *i915 = intel_hdmi_to_i915(hdmi); > > > + enum phy phy = intel_port_to_phy(i915, dig_port->base.port); > > > + > > > + if (intel_is_c10phy(i915, phy)) > > > + return intel_c10_phy_check_hdmi_link_rate(clock); > > > + return intel_c20_phy_check_hdmi_link_rate(clock); > > > +} > > > + > > > +static const struct intel_c20pll_state * const * > > > +intel_c20_pll_tables_get(struct intel_crtc_state *crtc_state, > > > + struct intel_encoder *encoder) > > > +{ > > > + if (intel_crtc_has_dp_encoder(crtc_state)) > > > + return mtl_c20_dp_tables; > > > + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > > > + return mtl_c20_hdmi_tables; > > > + > > > + MISSING_CASE(encoder->type); > > > + return NULL; > > > +} > > > + > > > +static int intel_c20pll_calc_state(struct intel_crtc_state *crtc_state, > > > + struct intel_encoder *encoder) { > > > + const struct intel_c20pll_state * const *tables; > > > + int i; > > > + > > > + tables = intel_c20_pll_tables_get(crtc_state, encoder); > > > + if (!tables) > > > + return -EINVAL; > > > + > > > + for (i = 0; tables[i]; i++) { > > > + if (crtc_state->port_clock == tables[i]->link_bit_rate) { > > > + crtc_state->cx0pll_state.c20 = *tables[i]; > > > + return 0; > > > + } > > > + } > > > + > > > + return -EINVAL; > > > +} > > > + > > > +int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, > > > + struct intel_encoder *encoder) > > > +{ > > > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > > + enum phy phy = intel_port_to_phy(i915, encoder->port); > > > + > > > + if (intel_is_c10phy(i915, phy)) > > > + return intel_c10pll_calc_state(crtc_state, encoder); > > > + return intel_c20pll_calc_state(crtc_state, encoder); } > > > + > > > static bool intel_c20_use_mplla(u32 clock) { > > > /* 10G and 20G rates use MPLLA */ > > > @@ -1436,6 +1978,63 @@ static bool intel_c20_use_mplla(u32 clock) > > > return false; > > > } > > > > > > +void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, > > > + struct intel_c20pll_state *pll_state) { > > > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > > + bool cntx, use_mpllb; > > > + u32 val; > > > + int i; > > > + > > > + /* 1. Read current context selection */ > > > + cntx = intel_cx0_read(i915, encoder->port, INTEL_CX0_LANE0, > > > +PHY_C20_VDR_CUSTOM_SERDES_RATE) & PHY_C20_CONTEXT_TOGGLE; > > > + > > > + /* Read Tx configuration */ > > > + for (i = 0; i < ARRAY_SIZE(pll_state->tx); i++) { > > > + if (cntx) > > > + pll_state->tx[i] = intel_c20_sram_read(i915, encoder- > > >port, INTEL_CX0_LANE0, > > > + > > PHY_C20_B_TX_CNTX_CFG(i)); > > > + else > > > + pll_state->tx[i] = intel_c20_sram_read(i915, encoder- > > >port, INTEL_CX0_LANE0, > > > + > > PHY_C20_A_TX_CNTX_CFG(i)); > > > + } > > > + > > > + /* Read common configuration */ > > > + for (i = 0; i < ARRAY_SIZE(pll_state->cmn); i++) { > > > + if (cntx) > > > + pll_state->cmn[i] = intel_c20_sram_read(i915, encoder- > > >port, INTEL_CX0_LANE0, > > > + > > PHY_C20_B_CMN_CNTX_CFG(i)); > > > + else > > > + pll_state->cmn[i] = intel_c20_sram_read(i915, encoder- > > >port, INTEL_CX0_LANE0, > > > + > > PHY_C20_A_CMN_CNTX_CFG(i)); > > > + } > > > + > > > + val = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, > > PHY_C20_A_MPLLA_CNTX_CFG(6)); > > > + use_mpllb = val & C20_MPLLB_FRACEN; > > > + > > > + if (use_mpllb) { > > > + /* MPLLA configuration */ > > > + for (i = 0; i < ARRAY_SIZE(pll_state->mplla); i++) { > > > + if (cntx) > > > + pll_state->mplla[i] = intel_c20_sram_read(i915, > > encoder->port, INTEL_CX0_LANE0, > > > + > > PHY_C20_B_MPLLA_CNTX_CFG(i)); > > > + else > > > + pll_state->mplla[i] = intel_c20_sram_read(i915, > > encoder->port, INTEL_CX0_LANE0, > > > + > > PHY_C20_A_MPLLA_CNTX_CFG(i)); > > > + } > > > + } else { > > > + /* MPLLB configuration */ > > > + for (i = 0; i < ARRAY_SIZE(pll_state->mpllb); i++) { > > > + if (cntx) > > > + pll_state->mpllb[i] = intel_c20_sram_read(i915, > > encoder->port, INTEL_CX0_LANE0, > > > + > > PHY_C20_B_MPLLB_CNTX_CFG(i)); > > > + else > > > + pll_state->mpllb[i] = intel_c20_sram_read(i915, > > encoder->port, INTEL_CX0_LANE0, > > > + > > PHY_C20_A_MPLLB_CNTX_CFG(i)); > > > + } > > > + } > > > +} > > > + > > > static u8 intel_c20_get_dp_rate(u32 clock) { > > > switch (clock) { > > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.h > > > b/drivers/gpu/drm/i915/display/intel_cx0_phy.h > > > index 509d1d12776e..9760c6292c81 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.h > > > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.h > > > @@ -30,8 +30,12 @@ int intel_c10pll_calc_port_clock(struct intel_encoder > > *encoder, > > > const struct intel_c10pll_state *pll_state); > > void > > > intel_c10pll_state_verify(struct intel_atomic_state *state, > > > struct intel_crtc_state *new_crtc_state); > > > +void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, > > > + struct intel_c20pll_state *pll_state); > > > void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, > > > const struct intel_crtc_state *crtc_state); - > > int > > > intel_c10_phy_check_hdmi_link_rate(int clock); > > > - > > > +int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int > > > +clock); void intel_cx0_phy_ddi_vswing_sequence(struct intel_encoder > > *encoder, > > > + const struct intel_crtc_state *crtc_state, > > > + u32 level); > > > #endif /* __INTEL_CX0_PHY_H__ */ > > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c > > > b/drivers/gpu/drm/i915/display/intel_ddi.c > > > index f445f2613adb..44f07011245b 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > > > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > > > @@ -3853,10 +3853,13 @@ static void mtl_ddi_get_config(struct > > intel_encoder *encoder, > > > struct drm_i915_private *i915 = to_i915(encoder->base.dev); > > > enum phy phy = intel_port_to_phy(i915, encoder->port); > > > > > > - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); > > > + if (intel_is_c10phy(i915, phy)) { > > > + intel_c10pll_readout_hw_state(encoder, &crtc_state- > > >cx0pll_state.c10); > > > + intel_c10pll_dump_hw_state(i915, &crtc_state- > > >cx0pll_state.c10); > > > + } else { > > > + intel_c20pll_readout_hw_state(encoder, &crtc_state- > > >cx0pll_state.c20); > > > + } > > > > > > - intel_c10pll_readout_hw_state(encoder, &crtc_state- > > >cx0pll_state.c10); > > > - intel_c10pll_dump_hw_state(i915, &crtc_state->cx0pll_state.c10); > > > crtc_state->port_clock = intel_c10pll_calc_port_clock(encoder, > > > &crtc_state->cx0pll_state.c10); > > > > > > intel_ddi_get_config(encoder, crtc_state); diff --git > > > a/drivers/gpu/drm/i915/display/intel_display_types.h > > > b/drivers/gpu/drm/i915/display/intel_display_types.h > > > index c9927e12b95e..4eadf45c0a43 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > > > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > > > @@ -997,6 +997,7 @@ struct intel_c10pll_state { }; > > > > > > struct intel_c20pll_state { > > > + u32 link_bit_rate; > > > u32 clock; /* in kHz */ > > > u16 tx[3]; > > > u16 cmn[4]; > > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c > > > b/drivers/gpu/drm/i915/display/intel_hdmi.c > > > index 8141d5184856..65a258507d62 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > > > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > > > @@ -58,7 +58,7 @@ > > > #include "intel_panel.h" > > > #include "intel_snps_phy.h" > > > > > > -static struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi > > > *intel_hdmi) > > > +inline struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi > > > +*intel_hdmi) > > > { > > > return to_i915(hdmi_to_dig_port(intel_hdmi)->base.base.dev); > > > } > > > @@ -1865,8 +1865,8 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi, > > > * FIXME: We will hopefully get an algorithmic way of programming > > > * the MPLLB for HDMI in the future. > > > */ > > > - if (IS_METEORLAKE(dev_priv)) > > > - return intel_c10_phy_check_hdmi_link_rate(clock); > > > + if (DISPLAY_VER(dev_priv) >= 14) > > > + return intel_cx0_phy_check_hdmi_link_rate(hdmi, clock); > > > else if (IS_DG2(dev_priv)) > > > return intel_snps_phy_check_hdmi_link_rate(clock); > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h > > > b/drivers/gpu/drm/i915/display/intel_hdmi.h > > > index 774dda2376ed..492bd3921385 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_hdmi.h > > > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h > > > @@ -54,5 +54,6 @@ int intel_hdmi_dsc_get_num_slices(const struct > > intel_crtc_state *crtc_state, > > > int src_max_slices, int src_max_slice_width, > > > int hdmi_max_slices, int hdmi_throughput); > > int > > > intel_hdmi_dsc_get_slice_height(int vactive); > > > +struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi > > > +*intel_hdmi); > > > > > > #endif /* __INTEL_HDMI_H__ */ > > > -- > > > 2.34.1 > > >
Hi Mika, [...] > +static int intel_c20_phy_check_hdmi_link_rate(int clock) > +{ > + const struct intel_c20pll_state * const *tables = mtl_c20_hdmi_tables; > + int i; > + > + for (i = 0; tables[i]; i++) { > + if (clock == tables[i]->link_bit_rate) > + return MODE_OK; > + } because you are going to resend it... you could remove these braces here... there are a few cases below, as well. Andi
diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c b/drivers/gpu/drm/i915/display/intel_cx0_phy.c index dd96bf5e179e..61428c5145e5 100644 --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c @@ -11,6 +11,7 @@ #include "intel_de.h" #include "intel_display_types.h" #include "intel_dp.h" +#include "intel_hdmi.h" #include "intel_panel.h" #include "intel_psr.h" #include "intel_tc.h" @@ -285,6 +286,23 @@ static void intel_c20_sram_write(struct drm_i915_private *i915, enum port port, intel_cx0_write(i915, port, lane, PHY_C20_WR_DATA_L, data & 0xff, 1); } +static u16 intel_c20_sram_read(struct drm_i915_private *i915, enum port port, + int lane, u16 addr) +{ + u16 val; + + assert_dc_off(i915); + + intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_H, addr >> 8, 0); + intel_cx0_write(i915, port, lane, PHY_C20_RD_ADDRESS_L, addr & 0xff, 1); + + val = intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_H); + val <<= 8; + val |= intel_cx0_read(i915, port, lane, PHY_C20_RD_DATA_L); + + return val; +} + static void __intel_cx0_rmw(struct drm_i915_private *i915, enum port port, int lane, u16 addr, u8 clear, u8 set, bool committed) { @@ -659,6 +677,199 @@ static const struct intel_c10pll_state * const mtl_c10_edp_tables[] = { NULL, }; +/* C20 basic DP 1.4 tables */ +static const struct intel_c20pll_state mtl_c20_dp_rbr = { + .link_bit_rate = 162000, + .clock = 162000, + .tx = { 0xbe88, /* tx cfg0 */ + 0x5800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = {0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x50a8, /* mpllb cfg0 */ + 0x2120, /* mpllb cfg1 */ + 0xcd9a, /* mpllb cfg2 */ + 0xbfc1, /* mpllb cfg3 */ + 0x5ab8, /* mpllb cfg4 */ + 0x4c34, /* mpllb cfg5 */ + 0x2000, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x6000, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0000, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_dp_hbr1 = { + .link_bit_rate = 270000, + .clock = 270000, + .tx = { 0xbe88, /* tx cfg0 */ + 0x4800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = {0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x308c, /* mpllb cfg0 */ + 0x2110, /* mpllb cfg1 */ + 0xcc9c, /* mpllb cfg2 */ + 0xbfc1, /* mpllb cfg3 */ + 0x489a, /* mpllb cfg4 */ + 0x3f81, /* mpllb cfg5 */ + 0x2000, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x5000, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0000, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_dp_hbr2 = { + .link_bit_rate = 540000, + .clock = 540000, + .tx = { 0xbe88, /* tx cfg0 */ + 0x4800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = {0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x108c, /* mpllb cfg0 */ + 0x2108, /* mpllb cfg1 */ + 0xcc9c, /* mpllb cfg2 */ + 0xbfc1, /* mpllb cfg3 */ + 0x489a, /* mpllb cfg4 */ + 0x3f81, /* mpllb cfg5 */ + 0x2000, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x5000, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0000, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_dp_hbr3 = { + .link_bit_rate = 810000, + .clock = 810000, + .tx = { 0xbe88, /* tx cfg0 */ + 0x4800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = {0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x10d2, /* mpllb cfg0 */ + 0x2108, /* mpllb cfg1 */ + 0x8d98, /* mpllb cfg2 */ + 0xbfc1, /* mpllb cfg3 */ + 0x7166, /* mpllb cfg4 */ + 0x5f42, /* mpllb cfg5 */ + 0x2000, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x7800, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0000, /* mpllb cfg10 */ + }, +}; + +/* C20 basic DP 2.0 tables */ +static const struct intel_c20pll_state mtl_c20_dp_uhbr10 = { + .link_bit_rate = 1000000, /* 10 Gbps */ + .clock = 312500, + .tx = { 0xbe21, /* tx cfg0 */ + 0x4800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = {0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mplla = { 0x3104, /* mplla cfg0 */ + 0xd105, /* mplla cfg1 */ + 0xc025, /* mplla cfg2 */ + 0xc025, /* mplla cfg3 */ + 0xa6ab, /* mplla cfg4 */ + 0x8c00, /* mplla cfg5 */ + 0x4000, /* mplla cfg6 */ + 0x0003, /* mplla cfg7 */ + 0x3555, /* mplla cfg8 */ + 0x0000, /* mplla cfg9 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_dp_uhbr13_5 = { + .link_bit_rate = 1350000, /* 13.5 Gbps */ + .clock = 421875, + .tx = { 0xbea0, /* tx cfg0 */ + 0x4800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = {0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x015f, /* mpllb cfg0 */ + 0x2205, /* mpllb cfg1 */ + 0x1b17, /* mpllb cfg2 */ + 0xffc1, /* mpllb cfg3 */ + 0xe100, /* mpllb cfg4 */ + 0xbd00, /* mpllb cfg5 */ + 0x2000, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x4800, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0000, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_dp_uhbr20 = { + .link_bit_rate = 2000000, /* 20 Gbps */ + .clock = 625000, + .tx = { 0xbe20, /* tx cfg0 */ + 0x4800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = {0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mplla = { 0x3104, /* mplla cfg0 */ + 0xd105, /* mplla cfg1 */ + 0xc025, /* mplla cfg2 */ + 0xc025, /* mplla cfg3 */ + 0xa6ab, /* mplla cfg4 */ + 0x8c00, /* mplla cfg5 */ + 0x4000, /* mplla cfg6 */ + 0x0003, /* mplla cfg7 */ + 0x3555, /* mplla cfg8 */ + 0x0002, /* mplla cfg9 */ + }, +}; + +static const struct intel_c20pll_state * const mtl_c20_dp_tables[] = { + &mtl_c20_dp_rbr, + &mtl_c20_dp_hbr1, + &mtl_c20_dp_hbr2, + &mtl_c20_dp_hbr3, + &mtl_c20_dp_uhbr10, + &mtl_c20_dp_uhbr13_5, + &mtl_c20_dp_uhbr20, + NULL, +}; + /* * HDMI link rates with 38.4 MHz reference clock. */ @@ -1243,7 +1454,281 @@ static const struct intel_c10pll_state * const mtl_c10_hdmi_tables[] = { NULL, }; -int intel_c10_phy_check_hdmi_link_rate(int clock) +static const struct intel_c20pll_state mtl_c20_hdmi_25_175 = { + .link_bit_rate = 25175, + .clock = 25175, + .tx = { 0xbe88, /* tx cfg0 */ + 0x9800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = { 0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0xa0d2, /* mpllb cfg0 */ + 0x7d80, /* mpllb cfg1 */ + 0x0906, /* mpllb cfg2 */ + 0xbe40, /* mpllb cfg3 */ + 0x0000, /* mpllb cfg4 */ + 0x0000, /* mpllb cfg5 */ + 0x0200, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x0000, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0001, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_hdmi_27_0 = { + .link_bit_rate = 27000, + .clock = 27000, + .tx = { 0xbe88, /* tx cfg0 */ + 0x9800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = { 0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0xa0e0, /* mpllb cfg0 */ + 0x7d80, /* mpllb cfg1 */ + 0x0906, /* mpllb cfg2 */ + 0xbe40, /* mpllb cfg3 */ + 0x0000, /* mpllb cfg4 */ + 0x0000, /* mpllb cfg5 */ + 0x2200, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x8000, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0001, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_hdmi_74_25 = { + .link_bit_rate = 74250, + .clock = 74250, + .tx = { 0xbe88, /* tx cfg0 */ + 0x9800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = { 0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x609a, /* mpllb cfg0 */ + 0x7d40, /* mpllb cfg1 */ + 0xca06, /* mpllb cfg2 */ + 0xbe40, /* mpllb cfg3 */ + 0x0000, /* mpllb cfg4 */ + 0x0000, /* mpllb cfg5 */ + 0x2200, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x5800, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0001, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_hdmi_148_5 = { + .link_bit_rate = 148500, + .clock = 148500, + .tx = { 0xbe88, /* tx cfg0 */ + 0x9800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = { 0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x409a, /* mpllb cfg0 */ + 0x7d20, /* mpllb cfg1 */ + 0xca06, /* mpllb cfg2 */ + 0xbe40, /* mpllb cfg3 */ + 0x0000, /* mpllb cfg4 */ + 0x0000, /* mpllb cfg5 */ + 0x2200, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x5800, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0001, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_hdmi_594 = { + .link_bit_rate = 594000, + .clock = 594000, + .tx = { 0xbe88, /* tx cfg0 */ + 0x9800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = { 0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x009a, /* mpllb cfg0 */ + 0x7d08, /* mpllb cfg1 */ + 0xca06, /* mpllb cfg2 */ + 0xbe40, /* mpllb cfg3 */ + 0x0000, /* mpllb cfg4 */ + 0x0000, /* mpllb cfg5 */ + 0x2200, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x5800, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0001, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_hdmi_300 = { + .link_bit_rate = 3000000, + .clock = 166670, + .tx = { 0xbe98, /* tx cfg0 */ + 0x9800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = { 0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x209c, /* mpllb cfg0 */ + 0x7d10, /* mpllb cfg1 */ + 0xca06, /* mpllb cfg2 */ + 0xbe40, /* mpllb cfg3 */ + 0x0000, /* mpllb cfg4 */ + 0x0000, /* mpllb cfg5 */ + 0x2200, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x2000, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0004, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_hdmi_600 = { + .link_bit_rate = 6000000, + .clock = 333330, + .tx = { 0xbe98, /* tx cfg0 */ + 0x9800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = { 0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x009c, /* mpllb cfg0 */ + 0x7d08, /* mpllb cfg1 */ + 0xca06, /* mpllb cfg2 */ + 0xbe40, /* mpllb cfg3 */ + 0x0000, /* mpllb cfg4 */ + 0x0000, /* mpllb cfg5 */ + 0x2200, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x2000, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0004, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_hdmi_800 = { + .link_bit_rate = 8000000, + .clock = 444440, + .tx = { 0xbe98, /* tx cfg0 */ + 0x9800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = { 0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x00d0, /* mpllb cfg0 */ + 0x7d08, /* mpllb cfg1 */ + 0x4a06, /* mpllb cfg2 */ + 0xbe40, /* mpllb cfg3 */ + 0x0000, /* mpllb cfg4 */ + 0x0000, /* mpllb cfg5 */ + 0x2200, /* mpllb cfg6 */ + 0x0003, /* mpllb cfg7 */ + 0x2aaa, /* mpllb cfg8 */ + 0x0002, /* mpllb cfg9 */ + 0x0004, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_hdmi_1000 = { + .link_bit_rate = 10000000, + .clock = 555560, + .tx = { 0xbe98, /* tx cfg0 */ + 0x9800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = { 0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x1104, /* mpllb cfg0 */ + 0x7d08, /* mpllb cfg1 */ + 0x0a06, /* mpllb cfg2 */ + 0xbe40, /* mpllb cfg3 */ + 0x0000, /* mpllb cfg4 */ + 0x0000, /* mpllb cfg5 */ + 0x2200, /* mpllb cfg6 */ + 0x0003, /* mpllb cfg7 */ + 0x3555, /* mpllb cfg8 */ + 0x0001, /* mpllb cfg9 */ + 0x0004, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state mtl_c20_hdmi_1200 = { + .link_bit_rate = 12000000, + .clock = 666670, + .tx = { 0xbe98, /* tx cfg0 */ + 0x9800, /* tx cfg1 */ + 0x0000, /* tx cfg2 */ + }, + .cmn = { 0x0500, /* cmn cfg0*/ + 0x0005, /* cmn cfg1 */ + 0x0000, /* cmn cfg2 */ + 0x0000, /* cmn cfg3 */ + }, + .mpllb = { 0x0138, /* mpllb cfg0 */ + 0x7d08, /* mpllb cfg1 */ + 0x5486, /* mpllb cfg2 */ + 0xfe40, /* mpllb cfg3 */ + 0x0000, /* mpllb cfg4 */ + 0x0000, /* mpllb cfg5 */ + 0x2200, /* mpllb cfg6 */ + 0x0001, /* mpllb cfg7 */ + 0x4000, /* mpllb cfg8 */ + 0x0000, /* mpllb cfg9 */ + 0x0004, /* mpllb cfg10 */ + }, +}; + +static const struct intel_c20pll_state * const mtl_c20_hdmi_tables[] = { + &mtl_c20_hdmi_25_175, + &mtl_c20_hdmi_27_0, + &mtl_c20_hdmi_74_25, + &mtl_c20_hdmi_148_5, + &mtl_c20_hdmi_594, + &mtl_c20_hdmi_300, + &mtl_c20_hdmi_600, + &mtl_c20_hdmi_800, + &mtl_c20_hdmi_1000, + &mtl_c20_hdmi_1200, + NULL, +}; + +static int intel_c10_phy_check_hdmi_link_rate(int clock) { const struct intel_c10pll_state * const *tables = mtl_c10_hdmi_tables; int i; @@ -1319,17 +1804,6 @@ static int intel_c10pll_calc_state(struct intel_crtc_state *crtc_state, return -EINVAL; } -int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, - struct intel_encoder *encoder) -{ - struct drm_i915_private *i915 = to_i915(encoder->base.dev); - enum phy phy = intel_port_to_phy(i915, encoder->port); - - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); - - return intel_c10pll_calc_state(crtc_state, encoder); -} - void intel_c10pll_readout_hw_state(struct intel_encoder *encoder, struct intel_c10pll_state *pll_state) { @@ -1427,6 +1901,74 @@ void intel_c10pll_dump_hw_state(struct drm_i915_private *i915, i + 2, hw_state->pll[i + 2], i + 3, hw_state->pll[i + 3]); } +static int intel_c20_phy_check_hdmi_link_rate(int clock) +{ + const struct intel_c20pll_state * const *tables = mtl_c20_hdmi_tables; + int i; + + for (i = 0; tables[i]; i++) { + if (clock == tables[i]->link_bit_rate) + return MODE_OK; + } + + return MODE_CLOCK_RANGE; +} + +int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int clock) +{ + struct intel_digital_port *dig_port = hdmi_to_dig_port(hdmi); + struct drm_i915_private *i915 = intel_hdmi_to_i915(hdmi); + enum phy phy = intel_port_to_phy(i915, dig_port->base.port); + + if (intel_is_c10phy(i915, phy)) + return intel_c10_phy_check_hdmi_link_rate(clock); + return intel_c20_phy_check_hdmi_link_rate(clock); +} + +static const struct intel_c20pll_state * const * +intel_c20_pll_tables_get(struct intel_crtc_state *crtc_state, + struct intel_encoder *encoder) +{ + if (intel_crtc_has_dp_encoder(crtc_state)) + return mtl_c20_dp_tables; + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) + return mtl_c20_hdmi_tables; + + MISSING_CASE(encoder->type); + return NULL; +} + +static int intel_c20pll_calc_state(struct intel_crtc_state *crtc_state, + struct intel_encoder *encoder) +{ + const struct intel_c20pll_state * const *tables; + int i; + + tables = intel_c20_pll_tables_get(crtc_state, encoder); + if (!tables) + return -EINVAL; + + for (i = 0; tables[i]; i++) { + if (crtc_state->port_clock == tables[i]->link_bit_rate) { + crtc_state->cx0pll_state.c20 = *tables[i]; + return 0; + } + } + + return -EINVAL; +} + +int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, + struct intel_encoder *encoder) +{ + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + enum phy phy = intel_port_to_phy(i915, encoder->port); + + if (intel_is_c10phy(i915, phy)) + return intel_c10pll_calc_state(crtc_state, encoder); + return intel_c20pll_calc_state(crtc_state, encoder); +} + static bool intel_c20_use_mplla(u32 clock) { /* 10G and 20G rates use MPLLA */ @@ -1436,6 +1978,63 @@ static bool intel_c20_use_mplla(u32 clock) return false; } +void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, + struct intel_c20pll_state *pll_state) +{ + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + bool cntx, use_mpllb; + u32 val; + int i; + + /* 1. Read current context selection */ + cntx = intel_cx0_read(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_VDR_CUSTOM_SERDES_RATE) & PHY_C20_CONTEXT_TOGGLE; + + /* Read Tx configuration */ + for (i = 0; i < ARRAY_SIZE(pll_state->tx); i++) { + if (cntx) + pll_state->tx[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, + PHY_C20_B_TX_CNTX_CFG(i)); + else + pll_state->tx[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, + PHY_C20_A_TX_CNTX_CFG(i)); + } + + /* Read common configuration */ + for (i = 0; i < ARRAY_SIZE(pll_state->cmn); i++) { + if (cntx) + pll_state->cmn[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, + PHY_C20_B_CMN_CNTX_CFG(i)); + else + pll_state->cmn[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, + PHY_C20_A_CMN_CNTX_CFG(i)); + } + + val = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, PHY_C20_A_MPLLA_CNTX_CFG(6)); + use_mpllb = val & C20_MPLLB_FRACEN; + + if (use_mpllb) { + /* MPLLA configuration */ + for (i = 0; i < ARRAY_SIZE(pll_state->mplla); i++) { + if (cntx) + pll_state->mplla[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, + PHY_C20_B_MPLLA_CNTX_CFG(i)); + else + pll_state->mplla[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, + PHY_C20_A_MPLLA_CNTX_CFG(i)); + } + } else { + /* MPLLB configuration */ + for (i = 0; i < ARRAY_SIZE(pll_state->mpllb); i++) { + if (cntx) + pll_state->mpllb[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, + PHY_C20_B_MPLLB_CNTX_CFG(i)); + else + pll_state->mpllb[i] = intel_c20_sram_read(i915, encoder->port, INTEL_CX0_LANE0, + PHY_C20_A_MPLLB_CNTX_CFG(i)); + } + } +} + static u8 intel_c20_get_dp_rate(u32 clock) { switch (clock) { diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.h b/drivers/gpu/drm/i915/display/intel_cx0_phy.h index 509d1d12776e..9760c6292c81 100644 --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.h +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.h @@ -30,8 +30,12 @@ int intel_c10pll_calc_port_clock(struct intel_encoder *encoder, const struct intel_c10pll_state *pll_state); void intel_c10pll_state_verify(struct intel_atomic_state *state, struct intel_crtc_state *new_crtc_state); +void intel_c20pll_readout_hw_state(struct intel_encoder *encoder, + struct intel_c20pll_state *pll_state); void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state); -int intel_c10_phy_check_hdmi_link_rate(int clock); - +int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int clock); +void intel_cx0_phy_ddi_vswing_sequence(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + u32 level); #endif /* __INTEL_CX0_PHY_H__ */ diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index f445f2613adb..44f07011245b 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -3853,10 +3853,13 @@ static void mtl_ddi_get_config(struct intel_encoder *encoder, struct drm_i915_private *i915 = to_i915(encoder->base.dev); enum phy phy = intel_port_to_phy(i915, encoder->port); - drm_WARN_ON(&i915->drm, !intel_is_c10phy(i915, phy)); + if (intel_is_c10phy(i915, phy)) { + intel_c10pll_readout_hw_state(encoder, &crtc_state->cx0pll_state.c10); + intel_c10pll_dump_hw_state(i915, &crtc_state->cx0pll_state.c10); + } else { + intel_c20pll_readout_hw_state(encoder, &crtc_state->cx0pll_state.c20); + } - intel_c10pll_readout_hw_state(encoder, &crtc_state->cx0pll_state.c10); - intel_c10pll_dump_hw_state(i915, &crtc_state->cx0pll_state.c10); crtc_state->port_clock = intel_c10pll_calc_port_clock(encoder, &crtc_state->cx0pll_state.c10); intel_ddi_get_config(encoder, crtc_state); diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index c9927e12b95e..4eadf45c0a43 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -997,6 +997,7 @@ struct intel_c10pll_state { }; struct intel_c20pll_state { + u32 link_bit_rate; u32 clock; /* in kHz */ u16 tx[3]; u16 cmn[4]; diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 8141d5184856..65a258507d62 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -58,7 +58,7 @@ #include "intel_panel.h" #include "intel_snps_phy.h" -static struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi *intel_hdmi) +inline struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi *intel_hdmi) { return to_i915(hdmi_to_dig_port(intel_hdmi)->base.base.dev); } @@ -1865,8 +1865,8 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi, * FIXME: We will hopefully get an algorithmic way of programming * the MPLLB for HDMI in the future. */ - if (IS_METEORLAKE(dev_priv)) - return intel_c10_phy_check_hdmi_link_rate(clock); + if (DISPLAY_VER(dev_priv) >= 14) + return intel_cx0_phy_check_hdmi_link_rate(hdmi, clock); else if (IS_DG2(dev_priv)) return intel_snps_phy_check_hdmi_link_rate(clock); diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h index 774dda2376ed..492bd3921385 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.h +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h @@ -54,5 +54,6 @@ int intel_hdmi_dsc_get_num_slices(const struct intel_crtc_state *crtc_state, int src_max_slices, int src_max_slice_width, int hdmi_max_slices, int hdmi_throughput); int intel_hdmi_dsc_get_slice_height(int vactive); +struct drm_i915_private *intel_hdmi_to_i915(struct intel_hdmi *intel_hdmi); #endif /* __INTEL_HDMI_H__ */