drm/i915/mtl: Add Support for C10 phy
Subsystems (3)
cover drm/i915/mtl: Add Support for C10 phy
This is a new rev for the series with the same title posted
by Mika Kahola at [1].
Reusing the commit message from the series to preserve the version history.
Phy programming support for C10 phy. This is the first part of the series that adds support for PICA phy. Later stage the support for C20 phy is added. This series gets the eDP going.
v2: Register refinitions in intel_cx0_phy_regs.h file (Jani)
v3: Add waits for between message bus writes (Imre)
General cleanups and macro definitions (Imre)
v4: Several nitpicks across patches(Imre)
s/dev_priv/i915/,s/intel_c10mpllb_state/intel_c10pll_state/ Push the output init patch later
Add teh HDMI definition patch.
Note that patches 1-7 are required to boot with edp/native DP. Patches 8, 9 add the HDMI functionality.
1. https://patchwork.freedesktop.org/series/116191/
Ankit Nautiyal (1):
drm/i915/display/mtl: Fill port width in
DDI_BUF_/TRANS_DDI_FUNC_/PORT_BUF_CTL for HDMI
Clint Taylor (1):
drm/i915/mtl: Initial DDI port setup
José Roberto de Souza (1):
drm/i915/mtl/display: Implement DisplayPort sequences
Mika Kahola (4):
drm/i915/mtl: Add DP rates
drm/i915/mtl: Create separate reg file for PICA registers drm/i915/mtl: Add vswing programming for C10 phys drm/i915/mtl: MTL PICA hotplug detection
Radhakrishna Sripada (2):
drm/i915/mtl: Add Support for C10 PHY message bus and pll programming drm/i915/mtl: Add C10 phy programming for HDMI
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 1941 +++++++++++++++++ drivers/gpu/drm/i915/display/intel_cx0_phy.h | 37 + .../gpu/drm/i915/display/intel_cx0_phy_regs.h | 180 ++ drivers/gpu/drm/i915/display/intel_ddi.c | 403 +++- .../drm/i915/display/intel_ddi_buf_trans.c | 31 +- drivers/gpu/drm/i915/display/intel_display.c | 6 +- .../drm/i915/display/intel_display_types.h | 13 + drivers/gpu/drm/i915/display/intel_dp.c | 15 +- drivers/gpu/drm/i915/display/intel_dpll.c | 26 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 5 +- .../drm/i915/display/intel_modeset_verify.c | 2 + drivers/gpu/drm/i915/i915_irq.c | 237 +- drivers/gpu/drm/i915/i915_reg.h | 43 +- drivers/gpu/drm/i915/i915_reg_defs.h | 57 + 16 files changed, 2970 insertions(+), 29 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_cx0_phy.c create mode 100644 drivers/gpu/drm/i915/display/intel_cx0_phy.h create mode 100644 drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h
Signature · 1 line
2.34.1
PATCH 1/9 drm/i915/mtl: Add DP rates
From: Mika Kahola <[email protected]>
Add DP rates for Meteorlake.
--- drivers/gpu/drm/i915/display/intel_dp.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_dp.c +14 -1
@@ -420,6 +420,11 @@ static int ehl_max_source_rate(struct intel_dp *intel_dp)return 810000 ; } +static int mtl_max_source_rate (struct intel_dp *intel_dp) +{ +return intel_dp_is_edp (intel_dp) ?675000 :810000 ; +} +static int vbt_max_link_rate (struct intel_dp *intel_dp) {struct intel_encoder *encoder = &dp_to_dig_port (intel_dp)->base;
@@ -444,6 +449,10 @@ static void intel_dp_set_source_rates(struct intel_dp *intel_dp) {/* The values must be in increasing order */ +static const int mtl_rates[] = { +162000 ,216000 ,243000 ,270000 ,324000 ,432000 ,540000 ,675000 , +810000 , + };static const int icl_rates[] = {162000 ,216000 ,270000 ,324000 ,432000 ,540000 ,648000 ,810000 ,1000000 ,1350000 ,
@@ -469,7 +478,11 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)drm_WARN_ON (&dev_priv->drm, intel_dp->source_rates || intel_dp->num_source_rates); -if (DISPLAY_VER (dev_priv) >=11 ) { +if (DISPLAY_VER (dev_priv) >=14 ) { + source_rates = mtl_rates; + size =ARRAY_SIZE (mtl_rates); + max_rate =mtl_max_source_rate (intel_dp); + }else if (DISPLAY_VER (dev_priv) >=11 ) { source_rates = icl_rates; size =ARRAY_SIZE (icl_rates);if (IS_DG2 (dev_priv))
Signature · 1 line
2.34.1
PATCH 2/9 drm/i915/mtl: Create separate reg file for PICA registers
In reply to Radhakrishna SripadaFrom: Mika Kahola <[email protected]>
Create a separate file to store registers for PICA chips C10 and C20.
v2: Rename file (Jani)
v3: Use _PICK_EVEN_2RANGES() macro (Lucas)
Coding style fixed (Lucas)
v4: Redefine macros (Imre)
--- .../gpu/drm/i915/display/intel_cx0_phy_regs.h | 133 ++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h
drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h new file +133 -0
@@ -0,0 +1,133 @@ +/* SPDX-License-Identifier: MIT +* +* Copyright © 2022 Intel Corporation +*/ + +#ifndef __INTEL_CX0_PHY_REGS_H__ +#define __INTEL_CX0_PHY_REGS_H__ + +#include "i915_reg_defs.h" + +#define _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_A 0x64040 +#define _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_B 0x64140 +#define _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_USBC1 0x16F240 +#define _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_USBC2 0x16F440 +#define XELPDP_PORT_M2P_MSGBUS_CTL (port, lane) _MMIO(_PICK_EVEN_2RANGES(port, PORT_TC1, \ + _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_A, \ + _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_B, \ + _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_USBC1, \ + _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_USBC2) + (lane) * 4) +#define XELPDP_PORT_M2P_TRANSACTION_PENDING REG_BIT(31) +#define XELPDP_PORT_M2P_COMMAND_TYPE_MASK REG_GENMASK(30, 27) +#define XELPDP_PORT_M2P_COMMAND_WRITE_UNCOMMITTED REG_FIELD_PREP(XELPDP_PORT_M2P_COMMAND_TYPE_MASK, 0x1) +#define XELPDP_PORT_M2P_COMMAND_WRITE_COMMITTED REG_FIELD_PREP(XELPDP_PORT_M2P_COMMAND_TYPE_MASK, 0x2) +#define XELPDP_PORT_M2P_COMMAND_READ REG_FIELD_PREP(XELPDP_PORT_M2P_COMMAND_TYPE_MASK, 0x3) +#define XELPDP_PORT_M2P_DATA_MASK REG_GENMASK(23, 16) +#define XELPDP_PORT_M2P_DATA (val) REG_FIELD_PREP(XELPDP_PORT_M2P_DATA_MASK, val) +#define XELPDP_PORT_M2P_TRANSACTION_RESET REG_BIT(15) +#define XELPDP_PORT_M2P_ADDRESS_MASK REG_GENMASK(11, 0) +#define XELPDP_PORT_M2P_ADDRESS (val) REG_FIELD_PREP(XELPDP_PORT_M2P_ADDRESS_MASK, val) +#define XELPDP_PORT_P2M_MSGBUS_STATUS (port, lane) _MMIO(_PICK_EVEN_2RANGES(port, PORT_TC1, \ + _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_A, \ + _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_B, \ + _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_USBC1, \ + _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_USBC2) + (lane) * 4 + 8) +#define XELPDP_PORT_P2M_RESPONSE_READY REG_BIT(31) +#define XELPDP_PORT_P2M_COMMAND_TYPE_MASK REG_GENMASK(30, 27) +#define XELPDP_PORT_P2M_COMMAND_READ_ACK 0x4 +#define XELPDP_PORT_P2M_COMMAND_WRITE_ACK 0x5 +#define XELPDP_PORT_P2M_DATA_MASK REG_GENMASK(23, 16) +#define XELPDP_PORT_P2M_DATA (val) REG_FIELD_PREP(XELPDP_PORT_P2M_DATA_MASK, val) +#define XELPDP_PORT_P2M_ERROR_SET REG_BIT(15) + +#define XELPDP_MSGBUS_TIMEOUT_SLOW 1 +#define XELPDP_MSGBUS_TIMEOUT_FAST_US 2 +#define XELPDP_PCLK_PLL_ENABLE_TIMEOUT_US 3200 +#define XELPDP_PCLK_PLL_DISABLE_TIMEOUT_US 20 +#define XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US 100 +#define XELPDP_PORT_RESET_START_TIMEOUT_US 5 +#define XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_US 100 +#define XELPDP_PORT_RESET_END_TIMEOUT 15 +#define XELPDP_REFCLK_ENABLE_TIMEOUT_US 1 + +#define _XELPDP_PORT_BUF_CTL1_LN0_A 0x64004 +#define _XELPDP_PORT_BUF_CTL1_LN0_B 0x64104 +#define _XELPDP_PORT_BUF_CTL1_LN0_USBC1 0x16F200 +#define _XELPDP_PORT_BUF_CTL1_LN0_USBC2 0x16F400 +#define XELPDP_PORT_BUF_CTL1 (port) _MMIO(_PICK_EVEN_2RANGES(port, PORT_TC1, \ + _XELPDP_PORT_BUF_CTL1_LN0_A, \ + _XELPDP_PORT_BUF_CTL1_LN0_B, \ + _XELPDP_PORT_BUF_CTL1_LN0_USBC1, \ + _XELPDP_PORT_BUF_CTL1_LN0_USBC2)) +#define XELPDP_PORT_BUF_SOC_PHY_READY REG_BIT(24) +#define XELPDP_PORT_REVERSAL REG_BIT(16) +#define XELPDP_TC_PHY_OWNERSHIP REG_BIT(6) +#define XELPDP_TCSS_POWER_REQUEST REG_BIT(5) +#define XELPDP_TCSS_POWER_STATE REG_BIT(4) +#define XELPDP_PORT_WIDTH_MASK REG_GENMASK(3, 1) +#define XELPDP_PORT_WIDTH (val) REG_FIELD_PREP(XELPDP_PORT_WIDTH_MASK, val) + +#define XELPDP_PORT_BUF_CTL2 (port) _MMIO(_PICK_EVEN_2RANGES(port, PORT_TC1, \ + _XELPDP_PORT_BUF_CTL1_LN0_A, \ + _XELPDP_PORT_BUF_CTL1_LN0_B, \ + _XELPDP_PORT_BUF_CTL1_LN0_USBC1, \ + _XELPDP_PORT_BUF_CTL1_LN0_USBC2) + 4) + +#define XELPDP_LANE_PIPE_RESET (lane) _PICK(lane, REG_BIT(31), REG_BIT(30)) +#define XELPDP_LANE_PHY_CURRENT_STATUS (lane) _PICK(lane, REG_BIT(29), REG_BIT(28)) +#define XELPDP_LANE_POWERDOWN_UPDATE (lane) _PICK(lane, REG_BIT(25), REG_BIT(24)) +#define _XELPDP_LANE0_POWERDOWN_NEW_STATE_MASK REG_GENMASK(23, 20) +#define _XELPDP_LANE0_POWERDOWN_NEW_STATE (val) REG_FIELD_PREP(_XELPDP_LANE0_POWERDOWN_NEW_STATE_MASK, val) +#define _XELPDP_LANE1_POWERDOWN_NEW_STATE_MASK REG_GENMASK(19, 16) +#define _XELPDP_LANE1_POWERDOWN_NEW_STATE (val) REG_FIELD_PREP(_XELPDP_LANE1_POWERDOWN_NEW_STATE_MASK, val) +#define XELPDP_LANE_POWERDOWN_NEW_STATE (lane, val) _PICK(lane, \ + _XELPDP_LANE0_POWERDOWN_NEW_STATE(val), \ + _XELPDP_LANE1_POWERDOWN_NEW_STATE(val)) +#define XELPDP_LANE_POWERDOWN_NEW_STATE_MASK REG_GENMASK(3, 0) +#define XELPDP_POWER_STATE_READY_MASK REG_GENMASK(7, 4) +#define XELPDP_POWER_STATE_READY (val) REG_FIELD_PREP(XELPDP_POWER_STATE_READY_MASK, val) + +#define XELPDP_PORT_BUF_CTL3 (port) _MMIO(_PICK_EVEN_2RANGES(port, PORT_TC1, \ + _XELPDP_PORT_BUF_CTL1_LN0_A, \ + _XELPDP_PORT_BUF_CTL1_LN0_B, \ + _XELPDP_PORT_BUF_CTL1_LN0_USBC1, \ + _XELPDP_PORT_BUF_CTL1_LN0_USBC2) + 8) +#define XELPDP_PLL_LANE_STAGGERING_DELAY_MASK REG_GENMASK(15, 8) +#define XELPDP_PLL_LANE_STAGGERING_DELAY (val) REG_FIELD_PREP(XELPDP_PLL_LANE_STAGGERING_DELAY_MASK, val) +#define XELPDP_POWER_STATE_ACTIVE_MASK REG_GENMASK(3, 0) +#define XELPDP_POWER_STATE_ACTIVE (val) REG_FIELD_PREP(XELPDP_POWER_STATE_ACTIVE_MASK, val) + +#define _XELPDP_PORT_CLOCK_CTL_A 0x640E0 +#define _XELPDP_PORT_CLOCK_CTL_B 0x641E0 +#define _XELPDP_PORT_CLOCK_CTL_USBC1 0x16F260 +#define _XELPDP_PORT_CLOCK_CTL_USBC2 0x16F460 +#define XELPDP_PORT_CLOCK_CTL (port) _MMIO(_PICK_EVEN_2RANGES(port, PORT_TC1, \ + _XELPDP_PORT_CLOCK_CTL_A, \ + _XELPDP_PORT_CLOCK_CTL_B, \ + _XELPDP_PORT_CLOCK_CTL_USBC1, \ + _XELPDP_PORT_CLOCK_CTL_USBC2)) +#define XELPDP_LANE0_PCLK_PLL_REQUEST REG_BIT(31) +#define XELPDP_LANE0_PCLK_PLL_ACK REG_BIT(30) +#define XELPDP_LANE0_PCLK_REFCLK_REQUEST REG_BIT(29) +#define XELPDP_LANE0_PCLK_REFCLK_ACK REG_BIT(28) +#define XELPDP_LANE1_PCLK_PLL_REQUEST REG_BIT(27) +#define XELPDP_LANE1_PCLK_PLL_ACK REG_BIT(26) +#define XELPDP_LANE1_PCLK_REFCLK_REQUEST REG_BIT(25) +#define XELPDP_LANE1_PCLK_REFCLK_ACK REG_BIT(24) +#define XELPDP_TBT_CLOCK_REQUEST REG_BIT(19) +#define XELPDP_TBT_CLOCK_ACK REG_BIT(18) +#define XELPDP_DDI_CLOCK_SELECT_MASK REG_GENMASK(15, 12) +#define XELPDP_DDI_CLOCK_SELECT (val) REG_FIELD_PREP(XELPDP_DDI_CLOCK_SELECT_MASK, val) +#define XELPDP_DDI_CLOCK_SELECT_NONE 0x0 +#define XELPDP_DDI_CLOCK_SELECT_MAXPCLK 0x8 +#define XELPDP_DDI_CLOCK_SELECT_DIV18CLK 0x9 +#define XELPDP_DDI_CLOCK_SELECT_TBT_162 0xc +#define XELPDP_DDI_CLOCK_SELECT_TBT_270 0xd +#define XELPDP_DDI_CLOCK_SELECT_TBT_540 0xe +#define XELPDP_DDI_CLOCK_SELECT_TBT_810 0xf +#define XELPDP_FORWARD_CLOCK_UNGATE REG_BIT(10) +#define XELPDP_LANE1_PHY_CLOCK_SELECT REG_BIT(8) +#define XELPDP_SSC_ENABLE_PLLA REG_BIT(1) +#define XELPDP_SSC_ENABLE_PLLB REG_BIT(0) + +#endif /* __INTEL_CX0_PHY_REGS_H__ */
Signature · 1 line
2.34.1
PATCH 3/9 drm/i915/mtl: Add Support for C10 PHY message bus and pll programming
In reply to Radhakrishna SripadaXELPDP has C10 and C20 phys from Synopsys to drive displays. Each phy has a dedicated PIPE 5.2 Message bus for configuration. This message bus is used to configure the phy internal registers.
XELPDP has C10 phys to drive output to the EDP and the native output from the display engine. Add structures, programming hardware state readout logic. Port clock calculations are similar to DG2. Use the DG2 formulae to calculate the port clock but use the relevant pll signals.
Note: PHY lane 0 is always used for PLL programming.
Add sequences for C10 phy enable/disable phy lane reset, powerdown change sequence and phy lane programming.
Bspec: 64539, 64568, 64599, 65100, 65101, 65450, 65451, 67610, 67636
v2: Squash patches related to C10 phy message bus and pll
programming support (Jani)
Move register definitions to a new file i.e. intel_cx0_reg_defs.h (Jani) Move macro definitions (Jani)
DP rates as separate patch (Jani)
Spin out xelpdp register definitions into a separate file (Jani) Replace macro to select registers based on phy lane with function calls (Jani)
Fix styling issues (Jani)
Call XELPDP_PORT_P2M_MSGBUS_STATUS() with port instead of phy (Lucas)
v3: Move clear request flag into try-loop
v4: On PHY idle change drm_err_once() as drm_dbg_kms() (Jani)
use __intel_de_wait_for_register() instead of __intel_wait_for_register and uncomment intel_uncore.h (Jani)
Add DP-alt support for PHY lane programming (Khaled)
v4: Add tx and cmn on c10mpllb_state (Imre)
Add missing waits for pending transactions between two message bus writes (Imre)
General cleanups and simplifications (Imre)
v5: Few nit cleanups from rev4 (imre)
s/dev_priv/i915/ , s/c10mpllb/c10pll/ (RK)
Rebase--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 1207 +++++++++++++++++ drivers/gpu/drm/i915/display/intel_cx0_phy.h | 34 + .../gpu/drm/i915/display/intel_cx0_phy_regs.h | 49 +- drivers/gpu/drm/i915/display/intel_ddi.c | 22 +- .../drm/i915/display/intel_display_types.h | 13 + drivers/gpu/drm/i915/display/intel_dpll.c | 26 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- .../drm/i915/display/intel_modeset_verify.c | 2 + drivers/gpu/drm/i915/i915_reg.h | 5 + drivers/gpu/drm/i915/i915_reg_defs.h | 57 + 11 files changed, 1405 insertions(+), 13 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_cx0_phy.c create mode 100644 drivers/gpu/drm/i915/display/intel_cx0_phy.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -298,6 +298,7 @@ i915-y += \ display/icl_dsi.o \ display/intel_backlight.o \ display/intel_crt.o \ + display/intel_cx0_phy.o \ display/intel_ddi.o \ display/intel_ddi_buf_trans.o \ display/intel_display_trace.o \
drivers/gpu/drm/i915/display/intel_cx0_phy.c new file +1207 -0
1,207 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_cx0_phy.h new file +34 -0
@@ -0,0 +1,34 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2023 Intel Corporation +*/ + +#ifndef __INTEL_CX0_PHY_H__ +#define __INTEL_CX0_PHY_H__ + +#include <linux/types.h> +#include <linux/bitfield.h> +#include <linux/bits.h> + +#include "i915_drv.h" +#include "intel_display_types.h" + +struct drm_i915_private ; +struct intel_encoder ; +struct intel_crtc_state ; +enum phy ; + +bool intel_is_c10phy (struct drm_i915_private *dev_priv,enum phy phy); +void intel_cx0pll_enable (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state); +void intel_cx0pll_disable (struct intel_encoder *encoder); +void intel_c10pll_readout_hw_state (struct intel_encoder *encoder,struct intel_c10pll_state *pll_state); +int intel_cx0pll_calc_state (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder); +void intel_c10pll_dump_hw_state (struct drm_i915_private *dev_priv, +const struct intel_c10pll_state *hw_state); +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); + +#endif /* __INTEL_CX0_PHY_H__ */
drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h +39 -10
69 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_ddi.c +21 -1
@@ -39,6 +39,7 @@#include "intel_combo_phy_regs.h" #include "intel_connector.h" #include "intel_crtc.h" +#include "intel_cx0_phy.h" #include "intel_ddi.h" #include "intel_ddi_buf_trans.h" #include "intel_de.h"
@@ -3488,6 +3489,21 @@ void intel_ddi_get_clock(struct intel_encoder *encoder, &crtc_state->dpll_hw_state); } +static void mtl_ddi_get_config (struct intel_encoder *encoder, +struct intel_crtc_state *crtc_state) +{ +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)); + +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); +} +static void dg2_ddi_get_config (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) {
@@ -4395,7 +4411,11 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder->cloneable =0 ; encoder->pipe_mask = ~0 ; -if (IS_DG2 (dev_priv)) { +if (DISPLAY_VER (dev_priv) >=14 ) { + encoder->enable_clock = intel_cx0pll_enable; + encoder->disable_clock = intel_cx0pll_disable; + encoder->get_config = mtl_ddi_get_config; + }else if (IS_DG2 (dev_priv)) { encoder->enable_clock = intel_mpllb_enable; encoder->disable_clock = intel_mpllb_disable; encoder->get_config = dg2_ddi_get_config;
drivers/gpu/drm/i915/display/intel_display_types.h +13 -0
@@ -986,6 +986,18 @@ struct intel_csc_matrix {u16 postoff[3 ]; }; +struct intel_c10pll_state { +u32 clock;/* in KHz */ +u8 tx; +u8 cmn; +u8 pll[20 ]; +}; + +struct intel_cx0pll_state { +struct intel_c10pll_state c10; +bool ssc_enabled; +}; +struct intel_crtc_state {/* * uapi (drm) state. This is the software state shown to userspace.
@@ -1131,6 +1143,7 @@ struct intel_crtc_state {union {struct intel_dpll_hw_state dpll_hw_state;struct intel_mpllb_state mpllb_state; +struct intel_cx0pll_state cx0pll_state; };/*
drivers/gpu/drm/i915/display/intel_dpll.c +25 -1
@@ -8,6 +8,7 @@#include "i915_reg.h" #include "intel_crtc.h" +#include "intel_cx0_phy.h" #include "intel_de.h" #include "intel_display.h" #include "intel_display_types.h"
@@ -980,21 +981,38 @@ static int hsw_crtc_get_shared_dpll(struct intel_atomic_state *state,static int dg2_crtc_compute_clock (struct intel_atomic_state *state,struct intel_crtc *crtc) { +struct drm_i915_private *i915 =to_i915 (state->base.dev);struct intel_crtc_state *crtc_state =intel_atomic_get_new_crtc_state (state, crtc);struct intel_encoder *encoder =intel_get_crtc_new_encoder (state, crtc_state); +enum phy phy =intel_port_to_phy (i915, encoder->port);int ret; ret =intel_mpllb_calc_state (crtc_state, encoder);if (ret)return ret; +/* TODO: Do the readback via intel_compute_shared_dplls() */ +if (intel_is_c10phy (i915, phy)) + crtc_state->port_clock =intel_c10pll_calc_port_clock (encoder, &crtc_state->cx0pll_state.c10); + crtc_state->hw.adjusted_mode.crtc_clock =intel_crtc_dotclock (crtc_state);return 0 ; } +static int mtl_crtc_compute_clock (struct intel_atomic_state *state, +struct intel_crtc *crtc) +{ +struct intel_crtc_state *crtc_state = +intel_atomic_get_new_crtc_state (state, crtc); +struct intel_encoder *encoder = +intel_get_crtc_new_encoder (state, crtc_state); + +return intel_cx0pll_calc_state (crtc_state, encoder); +} +static bool ilk_needs_fb_cb_tune (const struct dpll *dpll,int factor) {return dpll->m < factor * dpll->n;
@@ -1423,6 +1441,10 @@ static int i8xx_crtc_compute_clock(struct intel_atomic_state *state,return 0 ; } +static const struct intel_dpll_funcs mtl_dpll_funcs = { + .crtc_compute_clock = mtl_crtc_compute_clock, +}; +static const struct intel_dpll_funcs dg2_dpll_funcs = { .crtc_compute_clock = dg2_crtc_compute_clock, };
@@ -1517,7 +1539,9 @@ int intel_dpll_crtc_get_shared_dpll(struct intel_atomic_state *state,void intel_dpll_init_clock_hook (struct drm_i915_private *dev_priv) { -if (IS_DG2 (dev_priv)) +if (DISPLAY_VER (dev_priv) >=14 ) + dev_priv->display.funcs.dpll = &mtl_dpll_funcs; +else if (IS_DG2 (dev_priv)) dev_priv->display.funcs.dpll = &dg2_dpll_funcs;else if (DISPLAY_VER (dev_priv) >=9 ||HAS_DDI (dev_priv)) dev_priv->display.funcs.dpll = &hsw_dpll_funcs;
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +1 -1
@@ -4104,7 +4104,7 @@ void intel_shared_dpll_init(struct drm_i915_private *dev_priv)mutex_init (&dev_priv->display.dpll.lock); -if (IS_DG2 (dev_priv)) +if (DISPLAY_VER (dev_priv) >=14 ||IS_DG2 (dev_priv))/* No shared DPLLs on DG2; port PLLs are part of the PHY */ dpll_mgr =NULL ;else if (IS_ALDERLAKE_P (dev_priv))
drivers/gpu/drm/i915/display/intel_modeset_verify.c +2 -0
@@ -11,6 +11,7 @@#include "intel_atomic.h" #include "intel_crtc.h" #include "intel_crtc_state_dump.h" +#include "intel_cx0_phy.h" #include "intel_display.h" #include "intel_display_types.h" #include "intel_fdi.h"
@@ -236,6 +237,7 @@ void intel_modeset_verify_crtc(struct intel_crtc *crtc,verify_crtc_state (crtc, old_crtc_state, new_crtc_state);intel_shared_dpll_state_verify (crtc, old_crtc_state, new_crtc_state);intel_mpllb_state_verify (state, new_crtc_state); +intel_c10pll_state_verify (state, new_crtc_state); } void intel_modeset_verify_disabled(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -1809,6 +1809,11 @@#define CLKGATE_DIS_PSL_EXT (pipe) \ _MMIO_PIPE(pipe, _CLKGATE_DIS_PSL_EXT_A, _CLKGATE_DIS_PSL_EXT_B) +/* DDI Buffer Control */ +#define _DDI_CLK_VALFREQ_A 0x64030 +#define _DDI_CLK_VALFREQ_B 0x64130 +#define DDI_CLK_VALFREQ (port) _MMIO_PORT(port, _DDI_CLK_VALFREQ_A, _DDI_CLK_VALFREQ_B) +/* * Display engine regs */
drivers/gpu/drm/i915/i915_reg_defs.h +57 -0
81 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH 3/9] drm/i915/mtl: Add Support for C10 PHY message bus and pll programming
Quoted 11 lines · Radhakrishna Sripada
[...]
drivers/gpu/drm/i915/display/intel_dpll.c +2
-0@@ -980,21 +981,38 @@ static int hsw_crtc_get_shared_dpll(struct intel_atomic_state *state,static int dg2_crtc_compute_clock (struct intel_atomic_state *state,struct intel_crtc *crtc) { +struct drm_i915_private *i915 =to_i915 (state->base.dev);struct intel_crtc_state *crtc_state =intel_atomic_get_new_crtc_state (state, crtc);struct intel_encoder *encoder =intel_get_crtc_new_encoder (state, crtc_state); +enum phy phy =intel_port_to_phy (i915, encoder->port);
drivers/gpu/drm/i915/display/intel_dpll.c static int hsw_crtc_get_shared_dpll(struct intel_atomic_state *state, · line 999
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dpll.c +4
-0int ret; ret =intel_mpllb_calc_state (crtc_state, encoder);if (ret)return ret; +/* TODO: Do the readback via intel_compute_shared_dplls() */ +if (intel_is_c10phy (i915, phy)) + crtc_state->port_clock =intel_c10pll_calc_port_clock (encoder, &crtc_state->cx0pll_state.c10); +
Added to the wrong function.
drivers/gpu/drm/i915/display/intel_dpll.c static int hsw_crtc_get_shared_dpll(struct intel_atomic_state *state, · line 1000
Quoted 1 line
drivers/gpu/drm/i915/display/intel_dpll.c +0
-0crtc_state->hw.adjusted_mode.crtc_clock =intel_crtc_dotclock (crtc_state);
The above is also missing for mtl.
Quoted 14 lines
drivers/gpu/drm/i915/display/intel_dpll.c +10
-0return 0 ; } +static int mtl_crtc_compute_clock (struct intel_atomic_state *state, +struct intel_crtc *crtc) +{ +struct intel_crtc_state *crtc_state = +intel_atomic_get_new_crtc_state (state, crtc); +struct intel_encoder *encoder = +intel_get_crtc_new_encoder (state, crtc_state); + +return intel_cx0pll_calc_state (crtc_state, encoder); +}
drivers/gpu/drm/i915/display/intel_dpll.c static int hsw_crtc_get_shared_dpll(struct intel_atomic_state *state,
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dpll.c +7
-0+ +/** +* REG_FIELD_PREP8() - Prepare a u8 bitfield value +* @__mask: shifted mask defining the field's length and position +* @__val: value to put in the field +* +* Local copy of FIELD_PREP8() to generate an integer constant expression, force
Local copy of FIELD_PREP()
Quoted 18 lines
+ * u8 and for consistency with
REG_FIELD_GET8(),REG_BIT8()andREG_GENMASK8().
+ *
+ * @return: @__val masked and shifted into the field defined by @__mask.
+ */drivers/gpu/drm/i915/i915_reg_defs.h +7
-0+#define REG_FIELD_PREP8 (__mask, __val) \ + ((u8)((((typeof(__mask))(__val) << __bf_shf(__mask)) & (__mask)) + \ + BUILD_BUG_ON_ZERO(!__is_constexpr(__mask)) + \ + BUILD_BUG_ON_ZERO((__mask) == 0 || (__mask) > U8_MAX) + \ + BUILD_BUG_ON_ZERO(!IS_POWER_OF_2((__mask) + (1ULL << __bf_shf(__mask)))) + \ + BUILD_BUG_ON_ZERO(__builtin_choose_expr(__is_constexpr(__val), (~((__mask) >> __bf_shf(__mask)) & (__val)), 0)))) +/** * REG_FIELD_GET() - Extract a u32 bitfield value * @__mask: shifted mask defining the field's length and position @@ -155,6 +200,18 @@*/ #define _PICK (__index, ...) (((const u32 []){ __VA_ARGS__ })[__index])
PATCH 4/9 drm/i915/mtl: Add vswing programming for C10 phys
In reply to Radhakrishna SripadaFrom: Mika Kahola <[email protected]>
C10 phys uses direct mapping internally for voltage and pre-emphasis levels. Program the levels directly to the fields in the VDR Registers.
Bspec: 65449
v2: From table "C10: Tx EQ settings for DP 1.4x" it shows level 1
and preemphasis 1 instead of two times of level 1 preemphasis 0. Fix this in the driver code as well.
v3: VSwing update (Clint)
v4: Add vboost termination ctl programming(Imre)
Fix tx llogic and other nits
Restrict C10 vdr ctl register access for C10 phy(RK)
--- drivers/gpu/drm/i915/display/intel_cx0_phy.c | 102 +++++++++++++++++- drivers/gpu/drm/i915/display/intel_cx0_phy.h | 2 + .../gpu/drm/i915/display/intel_cx0_phy_regs.h | 14 ++- drivers/gpu/drm/i915/display/intel_ddi.c | 4 +- .../drm/i915/display/intel_ddi_buf_trans.c | 31 +++++- 5 files changed, 143 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/intel_cx0_phy.c +97 -5
@@ -6,6 +6,8 @@#include "i915_reg.h" #include "intel_cx0_phy.h" #include "intel_cx0_phy_regs.h" +#include "intel_ddi.h" +#include "intel_ddi_buf_trans.h" #include "intel_de.h" #include "intel_display_types.h" #include "intel_dp.h"
@@ -292,6 +294,97 @@ static void intel_cx0_rmw(struct drm_i915_private *i915, enum port port,__intel_cx0_rmw (i915, port, lane, addr, clear, set, committed); } +static u8 intel_c10_get_tx_vboost_lvl (const struct intel_crtc_state *crtc_state) +{ +if (intel_crtc_has_dp_encoder (crtc_state)) { +if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_EDP ) && + (crtc_state->port_clock ==540000 || + crtc_state->port_clock ==810000 )) +return 5 ; +else +return 4 ; + }else { +return 5 ; + } +} + +static u8 intel_c10_get_tx_term_ctl (const struct intel_crtc_state *crtc_state) +{ +if (intel_crtc_has_dp_encoder (crtc_state)) { +if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_EDP ) && + (crtc_state->port_clock ==540000 || + crtc_state->port_clock ==810000 )) +return 5 ; +else +return 2 ; + }else { +return 6 ; + } +} + +void intel_cx0_phy_set_signal_levels (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +const struct intel_ddi_buf_trans *trans; +enum phy phy =intel_port_to_phy (i915, encoder->port); +intel_wakeref_t wakeref; +int n_entries, ln; + + wakeref =intel_cx0_phy_transaction_begin (encoder); + + trans = encoder->get_buf_trans (encoder, crtc_state, &n_entries); +if (drm_WARN_ON_ONCE (&i915->drm, !trans)) { +intel_cx0_phy_transaction_end (encoder, wakeref); +return ; + } + +if (intel_is_c10phy (i915, phy)) { +intel_cx0_rmw (i915, encoder->port,INTEL_CX0_BOTH_LANES ,PHY_C10_VDR_CONTROL (1 ), +0 ,C10_VDR_CTRL_MSGBUS_ACCESS ,MB_WRITE_COMMITTED ); +intel_cx0_rmw (i915, encoder->port,INTEL_CX0_LANE0 ,PHY_C10_VDR_CMN (3 ), +C10_CMN3_TXVBOOST_MASK , +C10_CMN3_TXVBOOST (intel_c10_get_tx_vboost_lvl (crtc_state)), +MB_WRITE_UNCOMMITTED ); +intel_cx0_rmw (i915, encoder->port,INTEL_CX0_LANE0 ,PHY_C10_VDR_TX (1 ), +C10_TX1_TERMCTL_MASK , +C10_TX1_TERMCTL (intel_c10_get_tx_term_ctl (crtc_state)), +MB_WRITE_COMMITTED ); + } + +for (ln =0 ; ln < crtc_state->lane_count; ln++) { +int level =intel_ddi_level (encoder, crtc_state, ln); +int lane, tx; + + lane = ln /2 ; + tx = ln %2 ; + +intel_cx0_rmw (i915, encoder->port,BIT (lane),PHY_CX0_VDROVRD_CTL (lane, tx,0 ), +C10_PHY_OVRD_LEVEL_MASK , +C10_PHY_OVRD_LEVEL (trans->entries[level].snps.pre_cursor), +MB_WRITE_COMMITTED ); +intel_cx0_rmw (i915, encoder->port,BIT (lane),PHY_CX0_VDROVRD_CTL (lane, tx,1 ), +C10_PHY_OVRD_LEVEL_MASK , +C10_PHY_OVRD_LEVEL (trans->entries[level].snps.vswing), +MB_WRITE_COMMITTED ); +intel_cx0_rmw (i915, encoder->port,BIT (lane),PHY_CX0_VDROVRD_CTL (lane, tx,2 ), +C10_PHY_OVRD_LEVEL_MASK , +C10_PHY_OVRD_LEVEL (trans->entries[level].snps.post_cursor), +MB_WRITE_COMMITTED ); + } + +/* Write Override enables in 0xD71 */ +intel_cx0_rmw (i915, encoder->port,INTEL_CX0_BOTH_LANES ,PHY_C10_VDR_OVRD , +0 ,PHY_C10_VDR_OVRD_TX1 |PHY_C10_VDR_OVRD_TX2 , +MB_WRITE_COMMITTED ); + +if (intel_is_c10phy (i915, phy)) +intel_cx0_rmw (i915, encoder->port,INTEL_CX0_BOTH_LANES ,PHY_C10_VDR_CONTROL (1 ), +0 ,C10_VDR_CTRL_UPDATE_CFG ,MB_WRITE_COMMITTED ); + +intel_cx0_phy_transaction_end (encoder, wakeref); +} +/* * Basic DP link rates with 38.4 MHz reference clock. * Note: The tables below are with SSC. In non-ssc
@@ -766,10 +859,8 @@ static void intel_program_port_clock_ctl(struct intel_encoder *encoder, val |= crtc_state->cx0pll_state.ssc_enabled ?XELPDP_SSC_ENABLE_PLLB :0 ;intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (encoder->port), -XELPDP_LANE1_PHY_CLOCK_SELECT | -XELPDP_FORWARD_CLOCK_UNGATE | -XELPDP_DDI_CLOCK_SELECT_MASK | -XELPDP_SSC_ENABLE_PLLB , val); +XELPDP_LANE1_PHY_CLOCK_SELECT |XELPDP_FORWARD_CLOCK_UNGATE | +XELPDP_DDI_CLOCK_SELECT_MASK |XELPDP_SSC_ENABLE_PLLB , val); }static u32 intel_cx0_get_powerdown_update (u8 lane_mask)
@@ -1144,7 +1235,8 @@ static void intel_c10pll_disable(struct intel_encoder *encoder)/* 7. Program PORT_CLOCK_CTL register to disable and gate clocks. */ intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (encoder->port), -XELPDP_DDI_CLOCK_SELECT_MASK | +XELPDP_DDI_CLOCK_SELECT_MASK ,0 ); +intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (encoder->port),XELPDP_FORWARD_CLOCK_UNGATE ,0 ); }
drivers/gpu/drm/i915/display/intel_cx0_phy.h +2 -0
@@ -30,5 +30,7 @@ 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_cx0_phy_set_signal_levels (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state);#endif /* __INTEL_CX0_PHY_H__ */
drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h +11 -3
@@ -144,6 +144,8 @@#define C10_CMN3_TXVBOOST (val) REG_FIELD_PREP8(C10_CMN3_TXVBOOST_MASK, val)#define PHY_C10_VDR_TX (idx) (0xC30 + (idx))#define C10_TX0_TX_MPLLB_SEL REG_BIT(4) +#define C10_TX1_TERMCTL_MASK REG_GENMASK8(7, 5) +#define C10_TX1_TERMCTL (val) REG_FIELD_PREP8(C10_TX1_TERMCTL_MASK, val)#define PHY_C10_VDR_CONTROL (idx) (0xC70 + (idx) - 1)#define C10_VDR_CTRL_MSGBUS_ACCESS REG_BIT8(2)#define C10_VDR_CTRL_MASTER_LANE REG_BIT8(1)
@@ -151,9 +153,15 @@#define PHY_C10_VDR_CUSTOM_WIDTH 0xD02#define C10_VDR_CUSTOM_WIDTH_MASK REG_GENMASK(1, 0)#define C10_VDR_CUSTOM_WIDTH_8_10 REG_FIELD_PREP(C10_VDR_CUSTOM_WIDTH_MASK, 0) - -/* PHY_C10_VDR_PLL0 */ -#define PLL_C10_MPLL_SSC_EN REG_BIT8(0) +#define PHY_C10_VDR_OVRD 0xD71 +#define PHY_C10_VDR_OVRD_TX1 REG_BIT8(0) +#define PHY_C10_VDR_OVRD_TX2 REG_BIT8(2) +#define PHY_C10_VDR_PRE_OVRD_TX1 0xD80 +#define C10_PHY_OVRD_LEVEL_MASK REG_GENMASK8(5, 0) +#define C10_PHY_OVRD_LEVEL (val) REG_FIELD_PREP8(C10_PHY_OVRD_LEVEL_MASK, val) +#define PHY_CX0_VDROVRD_CTL (lane, tx, control) \ + (PHY_C10_VDR_PRE_OVRD_TX1 + \ + ((lane) ^ (tx)) * 0x10 + (control))/* PIPE SPEC Defined Registers */ #define PHY_CX0_TX_CONTROL (tx, control) (0x400 + ((tx) - 1) * 0x200 + (control))
drivers/gpu/drm/i915/display/intel_ddi.c +3 -1
@@ -4475,7 +4475,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder->get_config = hsw_ddi_get_config; } -if (IS_DG2 (dev_priv)) { +if (DISPLAY_VER (dev_priv) >=14 ) { + encoder->set_signal_levels = intel_cx0_phy_set_signal_levels; + }else if (IS_DG2 (dev_priv)) { encoder->set_signal_levels = intel_snps_phy_set_signal_levels; }else if (DISPLAY_VER (dev_priv) >=12 ) {if (intel_phy_is_combo (dev_priv, phy))
drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +30 -1
@@ -1035,6 +1035,25 @@ static const struct intel_ddi_buf_trans dg2_snps_trans_uhbr = { .num_entries = ARRAY_SIZE(_dg2_snps_trans_uhbr), }; +static const union intel_ddi_buf_trans_entry _mtl_c10_trans_dp14[] = { + { .snps = {26 ,0 ,0 } },/* preset 0 */ + { .snps = {33 ,0 ,6 } },/* preset 1 */ + { .snps = {38 ,0 ,11 } },/* preset 2 */ + { .snps = {43 ,0 ,19 } },/* preset 3 */ + { .snps = {39 ,0 ,0 } },/* preset 4 */ + { .snps = {45 ,0 ,7 } },/* preset 5 */ + { .snps = {46 ,0 ,13 } },/* preset 6 */ + { .snps = {46 ,0 ,0 } },/* preset 7 */ + { .snps = {55 ,0 ,7 } },/* preset 8 */ + { .snps = {62 ,0 ,0 } },/* preset 9 */ +}; + +static const struct intel_ddi_buf_trans mtl_cx0c10_trans = { + .entries = _mtl_c10_trans_dp14, + .num_entries =ARRAY_SIZE (_mtl_c10_trans_dp14), + .hdmi_default_entry =ARRAY_SIZE (_mtl_c10_trans_dp14) -1 , +}; +bool is_hobl_buf_trans (const struct intel_ddi_buf_trans *table) {return table == &tgl_combo_phy_trans_edp_hbr2_hobl;
@@ -1606,12 +1625,22 @@ dg2_get_snps_buf_trans(struct intel_encoder *encoder,return intel_get_buf_trans (&dg2_snps_trans, n_entries); } +static const struct intel_ddi_buf_trans * +mtl_get_cx0_buf_trans (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state, +int *n_entries) +{ +return intel_get_buf_trans (&mtl_cx0c10_trans, n_entries); +} +void intel_ddi_buf_trans_init (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 (IS_DG2 (i915)) { +if (DISPLAY_VER (i915) >=14 ) { + encoder->get_buf_trans = mtl_get_cx0_buf_trans; + }else if (IS_DG2 (i915)) { encoder->get_buf_trans = dg2_get_snps_buf_trans; }else if (IS_ALDERLAKE_P (i915)) {if (intel_phy_is_combo (i915, phy))
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH 4/9] drm/i915/mtl: Add vswing programming for C10 phys
Quoted 92 lines · Radhakrishna Sripada
From: Mika Kahola <[email protected]>
C10 phys uses direct mapping internally for voltage and pre-emphasis levels. Program the levels directly to the fields in the VDR Registers.
Bspec: 65449
v2: From table "C10: Tx EQ settings for DP 1.4x" it shows level 1
and preemphasis 1 instead of two times of level 1 preemphasis 0. Fix this in the driver code as well.
v3: VSwing update (Clint)
v4: Add vboost termination ctl programming(Imre)
Fix tx llogic and other nits
Restrict C10 vdr ctl register access for C10 phy(RK)Cc Imre Deak <[email protected]>Cc Uma Shankar <[email protected]>Signed-off-by Clint Taylor <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>Signed-off-by Mika Kahola <[email protected]>Reviewed-by Imre Deak <[email protected]>(v3)--- drivers/gpu/drm/i915/display/intel_cx0_phy.c | 102 +++++++++++++++++- drivers/gpu/drm/i915/display/intel_cx0_phy.h | 2 + .../gpu/drm/i915/display/intel_cx0_phy_regs.h | 14 ++- drivers/gpu/drm/i915/display/intel_ddi.c | 4 +- .../drm/i915/display/intel_ddi_buf_trans.c | 31 +++++- 5 files changed, 143 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/display/intel_cx0_phy.c +48
-0@@ -6,6 +6,8 @@#include "i915_reg.h" #include "intel_cx0_phy.h" #include "intel_cx0_phy_regs.h" +#include "intel_ddi.h" +#include "intel_ddi_buf_trans.h" #include "intel_de.h" #include "intel_display_types.h" #include "intel_dp.h" @@ -292,6 +294,97 @@ static void intel_cx0_rmw(struct drm_i915_private *i915, enum port port,__intel_cx0_rmw (i915, port, lane, addr, clear, set, committed); } +static u8 intel_c10_get_tx_vboost_lvl (const struct intel_crtc_state *crtc_state) +{ +if (intel_crtc_has_dp_encoder (crtc_state)) { +if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_EDP ) && + (crtc_state->port_clock ==540000 || + crtc_state->port_clock ==810000 )) +return 5 ; +else +return 4 ; + }else { +return 5 ; + } +} + +static u8 intel_c10_get_tx_term_ctl (const struct intel_crtc_state *crtc_state) +{ +if (intel_crtc_has_dp_encoder (crtc_state)) { +if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_EDP ) && + (crtc_state->port_clock ==540000 || + crtc_state->port_clock ==810000 )) +return 5 ; +else +return 2 ; + }else { +return 6 ; + } +} + +void intel_cx0_phy_set_signal_levels (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +const struct intel_ddi_buf_trans *trans; +enum phy phy =intel_port_to_phy (i915, encoder->port); +intel_wakeref_t wakeref; +int n_entries, ln; + + wakeref =intel_cx0_phy_transaction_begin (encoder); + + trans = encoder->get_buf_trans (encoder, crtc_state, &n_entries); +if (drm_WARN_ON_ONCE (&i915->drm, !trans)) { +intel_cx0_phy_transaction_end (encoder, wakeref); +return ; + } + +if (intel_is_c10phy (i915, phy)) {
drivers/gpu/drm/i915/display/intel_cx0_phy.c static void intel_cx0_rmw(struct drm_i915_private *i915, enum port port, · line 352
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cx0_phy.c +10
-0+intel_cx0_rmw (i915, encoder->port,INTEL_CX0_BOTH_LANES ,PHY_C10_VDR_CONTROL (1 ), +0 ,C10_VDR_CTRL_MSGBUS_ACCESS ,MB_WRITE_COMMITTED ); +intel_cx0_rmw (i915, encoder->port,INTEL_CX0_LANE0 ,PHY_C10_VDR_CMN (3 ), +C10_CMN3_TXVBOOST_MASK , +C10_CMN3_TXVBOOST (intel_c10_get_tx_vboost_lvl (crtc_state)), +MB_WRITE_UNCOMMITTED ); +intel_cx0_rmw (i915, encoder->port,INTEL_CX0_LANE0 ,PHY_C10_VDR_TX (1 ), +C10_TX1_TERMCTL_MASK , +C10_TX1_TERMCTL (intel_c10_get_tx_term_ctl (crtc_state)), +MB_WRITE_COMMITTED );
Both PHY lanes need to be programmed for all these vswing settings.
Quoted 177 lines
drivers/gpu/drm/i915/display/intel_cx0_phy.c +39
-5+ } + +for (ln =0 ; ln < crtc_state->lane_count; ln++) { +int level =intel_ddi_level (encoder, crtc_state, ln); +int lane, tx; + + lane = ln /2 ; + tx = ln %2 ; + +intel_cx0_rmw (i915, encoder->port,BIT (lane),PHY_CX0_VDROVRD_CTL (lane, tx,0 ), +C10_PHY_OVRD_LEVEL_MASK , +C10_PHY_OVRD_LEVEL (trans->entries[level].snps.pre_cursor), +MB_WRITE_COMMITTED ); +intel_cx0_rmw (i915, encoder->port,BIT (lane),PHY_CX0_VDROVRD_CTL (lane, tx,1 ), +C10_PHY_OVRD_LEVEL_MASK , +C10_PHY_OVRD_LEVEL (trans->entries[level].snps.vswing), +MB_WRITE_COMMITTED ); +intel_cx0_rmw (i915, encoder->port,BIT (lane),PHY_CX0_VDROVRD_CTL (lane, tx,2 ), +C10_PHY_OVRD_LEVEL_MASK , +C10_PHY_OVRD_LEVEL (trans->entries[level].snps.post_cursor), +MB_WRITE_COMMITTED ); + } + +/* Write Override enables in 0xD71 */ +intel_cx0_rmw (i915, encoder->port,INTEL_CX0_BOTH_LANES ,PHY_C10_VDR_OVRD , +0 ,PHY_C10_VDR_OVRD_TX1 |PHY_C10_VDR_OVRD_TX2 , +MB_WRITE_COMMITTED ); + +if (intel_is_c10phy (i915, phy)) +intel_cx0_rmw (i915, encoder->port,INTEL_CX0_BOTH_LANES ,PHY_C10_VDR_CONTROL (1 ), +0 ,C10_VDR_CTRL_UPDATE_CFG ,MB_WRITE_COMMITTED ); + +intel_cx0_phy_transaction_end (encoder, wakeref); +} +/* * Basic DP link rates with 38.4 MHz reference clock. * Note: The tables below are with SSC. In non-ssc @@ -766,10 +859,8 @@ static void intel_program_port_clock_ctl(struct intel_encoder *encoder, val |= crtc_state->cx0pll_state.ssc_enabled ?XELPDP_SSC_ENABLE_PLLB :0 ;intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (encoder->port), -XELPDP_LANE1_PHY_CLOCK_SELECT | -XELPDP_FORWARD_CLOCK_UNGATE | -XELPDP_DDI_CLOCK_SELECT_MASK | -XELPDP_SSC_ENABLE_PLLB , val); +XELPDP_LANE1_PHY_CLOCK_SELECT |XELPDP_FORWARD_CLOCK_UNGATE | +XELPDP_DDI_CLOCK_SELECT_MASK |XELPDP_SSC_ENABLE_PLLB , val); }static u32 intel_cx0_get_powerdown_update (u8 lane_mask)@@ -1144,7 +1235,8 @@ static void intel_c10pll_disable(struct intel_encoder *encoder)/* 7. Program PORT_CLOCK_CTL register to disable and gate clocks. */ intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (encoder->port), -XELPDP_DDI_CLOCK_SELECT_MASK | +XELPDP_DDI_CLOCK_SELECT_MASK ,0 ); +intel_de_rmw (i915,XELPDP_PORT_CLOCK_CTL (encoder->port),XELPDP_FORWARD_CLOCK_UNGATE ,0 ); }drivers/gpu/drm/i915/display/intel_cx0_phy.h +2
-0@@ -30,5 +30,7 @@ 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_cx0_phy_set_signal_levels (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state);#endif /* __INTEL_CX0_PHY_H__ */ drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h +11
-3@@ -144,6 +144,8 @@#define C10_CMN3_TXVBOOST (val) REG_FIELD_PREP8(C10_CMN3_TXVBOOST_MASK, val)#define PHY_C10_VDR_TX (idx) (0xC30 + (idx))#define C10_TX0_TX_MPLLB_SEL REG_BIT(4) +#define C10_TX1_TERMCTL_MASK REG_GENMASK8(7, 5) +#define C10_TX1_TERMCTL (val) REG_FIELD_PREP8(C10_TX1_TERMCTL_MASK, val)#define PHY_C10_VDR_CONTROL (idx) (0xC70 + (idx) - 1)#define C10_VDR_CTRL_MSGBUS_ACCESS REG_BIT8(2)#define C10_VDR_CTRL_MASTER_LANE REG_BIT8(1)@@ -151,9 +153,15 @@#define PHY_C10_VDR_CUSTOM_WIDTH 0xD02#define C10_VDR_CUSTOM_WIDTH_MASK REG_GENMASK(1, 0)#define C10_VDR_CUSTOM_WIDTH_8_10 REG_FIELD_PREP(C10_VDR_CUSTOM_WIDTH_MASK, 0) - -/* PHY_C10_VDR_PLL0 */ -#define PLL_C10_MPLL_SSC_EN REG_BIT8(0) +#define PHY_C10_VDR_OVRD 0xD71 +#define PHY_C10_VDR_OVRD_TX1 REG_BIT8(0) +#define PHY_C10_VDR_OVRD_TX2 REG_BIT8(2) +#define PHY_C10_VDR_PRE_OVRD_TX1 0xD80 +#define C10_PHY_OVRD_LEVEL_MASK REG_GENMASK8(5, 0) +#define C10_PHY_OVRD_LEVEL (val) REG_FIELD_PREP8(C10_PHY_OVRD_LEVEL_MASK, val) +#define PHY_CX0_VDROVRD_CTL (lane, tx, control) \ + (PHY_C10_VDR_PRE_OVRD_TX1 + \ + ((lane) ^ (tx)) * 0x10 + (control))/* PIPE SPEC Defined Registers */ #define PHY_CX0_TX_CONTROL (tx, control) (0x400 + ((tx) - 1) * 0x200 + (control))drivers/gpu/drm/i915/display/intel_ddi.c +3
-1@@ -4475,7 +4475,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder->get_config = hsw_ddi_get_config; } -if (IS_DG2 (dev_priv)) { +if (DISPLAY_VER (dev_priv) >=14 ) { + encoder->set_signal_levels = intel_cx0_phy_set_signal_levels; + }else if (IS_DG2 (dev_priv)) { encoder->set_signal_levels = intel_snps_phy_set_signal_levels; }else if (DISPLAY_VER (dev_priv) >=12 ) {if (intel_phy_is_combo (dev_priv, phy))drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +30
-1@@ -1035,6 +1035,25 @@ static const struct intel_ddi_buf_trans dg2_snps_trans_uhbr = { .num_entries = ARRAY_SIZE(_dg2_snps_trans_uhbr), }; +static const union intel_ddi_buf_trans_entry _mtl_c10_trans_dp14[] = { + { .snps = {26 ,0 ,0 } },/* preset 0 */ + { .snps = {33 ,0 ,6 } },/* preset 1 */ + { .snps = {38 ,0 ,11 } },/* preset 2 */ + { .snps = {43 ,0 ,19 } },/* preset 3 */ + { .snps = {39 ,0 ,0 } },/* preset 4 */ + { .snps = {45 ,0 ,7 } },/* preset 5 */ + { .snps = {46 ,0 ,13 } },/* preset 6 */ + { .snps = {46 ,0 ,0 } },/* preset 7 */ + { .snps = {55 ,0 ,7 } },/* preset 8 */ + { .snps = {62 ,0 ,0 } },/* preset 9 */ +}; + +static const struct intel_ddi_buf_trans mtl_cx0c10_trans = { + .entries = _mtl_c10_trans_dp14, + .num_entries =ARRAY_SIZE (_mtl_c10_trans_dp14), + .hdmi_default_entry =ARRAY_SIZE (_mtl_c10_trans_dp14) -1 , +}; +bool is_hobl_buf_trans (const struct intel_ddi_buf_trans *table) {return table == &tgl_combo_phy_trans_edp_hbr2_hobl;@@ -1606,12 +1625,22 @@ dg2_get_snps_buf_trans(struct intel_encoder *encoder,return intel_get_buf_trans (&dg2_snps_trans, n_entries); } +static const struct intel_ddi_buf_trans * +mtl_get_cx0_buf_trans (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state, +int *n_entries) +{ +return intel_get_buf_trans (&mtl_cx0c10_trans, n_entries); +} +void intel_ddi_buf_trans_init (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 (IS_DG2 (i915)) { +if (DISPLAY_VER (i915) >=14 ) { + encoder->get_buf_trans = mtl_get_cx0_buf_trans; + }else if (IS_DG2 (i915)) { encoder->get_buf_trans = dg2_get_snps_buf_trans; }else if (IS_ALDERLAKE_P (i915)) {if (intel_phy_is_combo (i915, phy))Signature · 1 line
2.34.1
PATCH 5/9 drm/i915/mtl: MTL PICA hotplug detection
In reply to Radhakrishna SripadaFrom: Mika Kahola <[email protected]>
PICA is used for DP alt mode and TBT modes. Hotplug interruption is routed from PICA chip to south display engine and from there to north display engine. This patch adds functionality to enable hotplug detection for all Type-C ports (4 ports available).
Differently from HPD in south display, PICA provides a dedicated HPD control register for each supported port, so we loop over ports ourselves instead of using intel_hpd_hotplug_enables() or intel_get_hpd_pins().
BSpec: 49305, 55726, 65107, 65300
--- drivers/gpu/drm/i915/i915_irq.c | 237 +++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/i915_reg.h | 31 ++++- 2 files changed, 261 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +231 -6
@@ -162,6 +162,13 @@ static const u32 hpd_gen11[HPD_NUM_PINS] = { [HPD_PORT_TC6] = GEN11_TC_HOTPLUG(HPD_PORT_TC6) | GEN11_TBT_HOTPLUG(HPD_PORT_TC6), }; +static const u32 hpd_xelpdp[HPD_NUM_PINS ] = { + [HPD_PORT_TC1 ] =XELPDP_TBT_HOTPLUG (HPD_PORT_TC1 ) |XELPDP_DP_ALT_HOTPLUG (HPD_PORT_TC1 ), + [HPD_PORT_TC2 ] =XELPDP_TBT_HOTPLUG (HPD_PORT_TC2 ) |XELPDP_DP_ALT_HOTPLUG (HPD_PORT_TC2 ), + [HPD_PORT_TC3 ] =XELPDP_TBT_HOTPLUG (HPD_PORT_TC3 ) |XELPDP_DP_ALT_HOTPLUG (HPD_PORT_TC3 ), + [HPD_PORT_TC4 ] =XELPDP_TBT_HOTPLUG (HPD_PORT_TC4 ) |XELPDP_DP_ALT_HOTPLUG (HPD_PORT_TC4 ), +}; +static const u32 hpd_icp[HPD_NUM_PINS ] = { [HPD_PORT_A ] =SDE_DDI_HOTPLUG_ICP (HPD_PORT_A ), [HPD_PORT_B ] =SDE_DDI_HOTPLUG_ICP (HPD_PORT_B ),
@@ -182,6 +189,15 @@ static const u32 hpd_sde_dg1[HPD_NUM_PINS] = { [HPD_PORT_TC1] = SDE_TC_HOTPLUG_DG2(HPD_PORT_TC1), }; +static const u32 hpd_mtp[HPD_NUM_PINS ] = { + [HPD_PORT_A ] =SDE_DDI_HOTPLUG_ICP (HPD_PORT_A ), + [HPD_PORT_B ] =SDE_DDI_HOTPLUG_ICP (HPD_PORT_B ), + [HPD_PORT_TC1 ] =SDE_TC_HOTPLUG_ICP (HPD_PORT_TC1 ), + [HPD_PORT_TC2 ] =SDE_TC_HOTPLUG_ICP (HPD_PORT_TC2 ), + [HPD_PORT_TC3 ] =SDE_TC_HOTPLUG_ICP (HPD_PORT_TC3 ), + [HPD_PORT_TC4 ] =SDE_TC_HOTPLUG_ICP (HPD_PORT_TC4 ), +}; +static void intel_hpd_init_pins (struct drm_i915_private *dev_priv) {struct intel_hotplug *hpd = &dev_priv->display.hotplug;
@@ -195,7 +211,9 @@ static void intel_hpd_init_pins(struct drm_i915_private *dev_priv)return ; } -if (DISPLAY_VER (dev_priv) >=11 ) +if (DISPLAY_VER (dev_priv) >=14 ) + hpd->hpd = hpd_xelpdp; +else if (DISPLAY_VER (dev_priv) >=11 ) hpd->hpd = hpd_gen11;else if (IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv)) hpd->hpd = hpd_bxt;
@@ -214,6 +232,8 @@ static void intel_hpd_init_pins(struct drm_i915_private *dev_priv)if (INTEL_PCH_TYPE (dev_priv) >=PCH_DG1 ) hpd->pch_hpd = hpd_sde_dg1; +else if (INTEL_PCH_TYPE (dev_priv) >=PCH_MTP ) + hpd->pch_hpd = hpd_mtp;else if (INTEL_PCH_TYPE (dev_priv) >=PCH_ICP ) hpd->pch_hpd = hpd_icp;else if (HAS_PCH_CNP (dev_priv) ||HAS_PCH_SPT (dev_priv))
@@ -1559,6 +1579,44 @@ static void cpt_irq_handler(struct drm_i915_private *dev_priv, u32 pch_iir)cpt_serr_int_handler (dev_priv); } +static void xelpdp_pica_irq_handler (struct drm_i915_private *i915,u32 iir) +{ +enum hpd_pin pin; +u32 hotplug_trigger = iir & (XELPDP_DP_ALT_HOTPLUG_MASK |XELPDP_TBT_HOTPLUG_MASK ); +u32 trigger_aux = iir &XELPDP_AUX_TC_MASK ; +u32 pin_mask =0 , long_mask =0 ; + +for (pin =HPD_PORT_TC1 ; pin <=HPD_PORT_TC4 ; pin++) { +u32 val; + +if (!(i915->display.hotplug.hpd[pin] & hotplug_trigger)) +continue ; + + pin_mask |=BIT (pin); + + val =intel_de_read (i915,XELPDP_PORT_HOTPLUG_CTL (pin)); +intel_de_write (i915,XELPDP_PORT_HOTPLUG_CTL (pin), val); + +if (val & (XELPDP_DP_ALT_HPD_LONG_DETECT |XELPDP_TBT_HPD_LONG_DETECT )) + long_mask |=BIT (pin); + } + +if (pin_mask) { +drm_dbg (&i915->drm, +"pica hotplug event received, stat 0x%08x, pins 0x%08x, long 0x%08x\n" , + hotplug_trigger, pin_mask, long_mask); + +intel_hpd_irq_handler (i915, pin_mask, long_mask); + } + +if (trigger_aux) +dp_aux_irq_handler (i915); + +if (!pin_mask && !trigger_aux) +drm_err (&i915->drm, +"Unexpected DE HPD/AUX interrupt 0x%08x\n" , iir); +} +static void icp_irq_handler (struct drm_i915_private *dev_priv,u32 pch_iir) {u32 ddi_hotplug_trigger = pch_iir &SDE_DDI_HOTPLUG_MASK_ICP ;
@@ -2029,6 +2087,34 @@ u32 gen8_de_pipe_underrun_mask(struct drm_i915_private *dev_priv)return mask; } +static void gen8_read_and_ack_pch_irqs (struct drm_i915_private *i915,u32 *pch_iir,u32 *pica_iir) +{ +u32 pica_ier =0 ; + + *pica_iir =0 ; + *pch_iir =intel_de_read (i915,SDEIIR ); +if (!*pch_iir) +return ; + +/** +* PICA IER must be disabled/re-enabled around clearing PICA IIR and +* SDEIIR, to avoid losing PICA IRQs and to ensure that such IRQs set +* their flags both in the PICA and SDE IIR. +*/ +if (*pch_iir &SDE_PICAINTERRUPT ) { +drm_WARN_ON (&i915->drm,INTEL_PCH_TYPE (i915) <PCH_MTP ); + + pica_ier =intel_de_rmw (i915,PICAINTERRUPT_IER , ~0 ,0 ); + *pica_iir =intel_de_read (i915,PICAINTERRUPT_IIR ); +intel_de_write (i915,PICAINTERRUPT_IIR , *pica_iir); + } + +intel_de_write (i915,SDEIIR , *pch_iir); + +if (pica_ier) +intel_de_write (i915,PICAINTERRUPT_IER , pica_ier); +} +static irqreturn_t gen8_de_irq_handler (struct drm_i915_private *dev_priv,u32 master_ctl) {
@@ -2153,16 +2239,20 @@ gen8_de_irq_handler(struct drm_i915_private *dev_priv, u32 master_ctl)if (HAS_PCH_SPLIT (dev_priv) && !HAS_PCH_NOP (dev_priv) && master_ctl &GEN8_DE_PCH_IRQ ) { +u32 pica_iir; +/* * FIXME(BDW): Assume for now that the new interrupt handling * scheme also closed the SDE interrupt handling race we've seen * on older pch-split platforms. But this needs testing. */ - iir =intel_uncore_read (&dev_priv->uncore,SDEIIR ); +gen8_read_and_ack_pch_irqs (dev_priv, &iir, &pica_iir);if (iir) { -intel_uncore_write (&dev_priv->uncore,SDEIIR , iir); ret =IRQ_HANDLED ; +if (pica_iir) +xelpdp_pica_irq_handler (dev_priv, pica_iir); +if (INTEL_PCH_TYPE (dev_priv) >=PCH_ICP )icp_irq_handler (dev_priv, iir);else if (INTEL_PCH_TYPE (dev_priv) >=PCH_SPT )
@@ -2740,7 +2830,11 @@ static void gen11_display_irq_reset(struct drm_i915_private *dev_priv)GEN3_IRQ_RESET (uncore,GEN8_DE_PORT_ );GEN3_IRQ_RESET (uncore,GEN8_DE_MISC_ ); -GEN3_IRQ_RESET (uncore,GEN11_DE_HPD_ ); + +if (DISPLAY_VER (dev_priv) >=14 ) +GEN3_IRQ_RESET (uncore,PICAINTERRUPT_ ); +else +GEN3_IRQ_RESET (uncore,GEN11_DE_HPD_ );if (INTEL_PCH_TYPE (dev_priv) >=PCH_ICP )GEN3_IRQ_RESET (uncore,SDE );
@@ -3031,6 +3125,116 @@ static void gen11_hpd_irq_setup(struct drm_i915_private *dev_priv)icp_hpd_irq_setup (dev_priv); } +static u32 mtp_ddi_hotplug_enables (struct intel_encoder *encoder) +{ +switch (encoder->hpd_pin) { +case HPD_PORT_A : +case HPD_PORT_B : +return SHOTPLUG_CTL_DDI_HPD_ENABLE (encoder->hpd_pin); +default : +return 0 ; + } +} + +static u32 mtp_tc_hotplug_enables (struct intel_encoder *encoder) +{ +switch (encoder->hpd_pin) { +case HPD_PORT_TC1 : +case HPD_PORT_TC2 : +case HPD_PORT_TC3 : +case HPD_PORT_TC4 : +return ICP_TC_HPD_ENABLE (encoder->hpd_pin); +default : +return 0 ; + } +} + +static void mtp_ddi_hpd_detection_setup (struct drm_i915_private *i915) +{ +intel_de_rmw (i915,SHOTPLUG_CTL_DDI , + (SHOTPLUG_CTL_DDI_HPD_ENABLE (HPD_PORT_A ) | +SHOTPLUG_CTL_DDI_HPD_ENABLE (HPD_PORT_B )), +intel_hpd_hotplug_enables (i915, mtp_ddi_hotplug_enables)); +} + +static void mtp_tc_hpd_detection_setup (struct drm_i915_private *i915) +{ +intel_de_rmw (i915,SHOTPLUG_CTL_TC , + (ICP_TC_HPD_ENABLE (HPD_PORT_TC1 ) | +ICP_TC_HPD_ENABLE (HPD_PORT_TC2 ) | +ICP_TC_HPD_ENABLE (HPD_PORT_TC3 ) | +ICP_TC_HPD_ENABLE (HPD_PORT_TC4 )), +intel_hpd_hotplug_enables (i915, mtp_tc_hotplug_enables)); +} + +static void mtp_hpd_invert (struct drm_i915_private *i915) +{ +u32 val = (INVERT_DDIA_HPD | +INVERT_DDIB_HPD | +INVERT_DDIC_HPD | +INVERT_TC1_HPD | +INVERT_TC2_HPD | +INVERT_TC3_HPD | +INVERT_TC4_HPD | +INVERT_DDID_HPD_MTP | +INVERT_DDIE_HPD ); +intel_de_rmw (i915,SOUTH_CHICKEN1 ,0 , val); +} + +static void mtp_hpd_irq_setup (struct drm_i915_private *i915) +{ +u32 hotplug_irqs, enabled_irqs; + + enabled_irqs =intel_hpd_enabled_irqs (i915, i915->display.hotplug.pch_hpd); + hotplug_irqs =intel_hpd_hotplug_irqs (i915, i915->display.hotplug.pch_hpd); + +intel_de_write (i915,SHPD_FILTER_CNT ,SHPD_FILTER_CNT_500_ADJ ); + +mtp_hpd_invert (i915); +ibx_display_interrupt_update (i915, hotplug_irqs, enabled_irqs); + +mtp_ddi_hpd_detection_setup (i915); +mtp_tc_hpd_detection_setup (i915); +} + +static void xelpdp_pica_hpd_detection_setup (struct drm_i915_private *i915) +{ +struct intel_encoder *encoder; +enum hpd_pin pin; +u32 available_pins =0 ; + +BUILD_BUG_ON (BITS_PER_TYPE (available_pins) <HPD_NUM_PINS ); + +for_each_intel_encoder (&i915->drm, encoder) + available_pins |=BIT (encoder->hpd_pin); + +for (pin =HPD_PORT_TC1 ; pin <=HPD_PORT_TC4 ; pin++) { +u32 mask =XELPDP_TBT_HOTPLUG_ENABLE | +XELPDP_DP_ALT_HOTPLUG_ENABLE ; + +intel_de_rmw (i915,XELPDP_PORT_HOTPLUG_CTL (pin), + mask, + available_pins &BIT (pin) ? mask :0 ); + } +} + +static void xelpdp_hpd_irq_setup (struct drm_i915_private *i915) +{ +u32 hotplug_irqs, enabled_irqs; + + enabled_irqs =intel_hpd_enabled_irqs (i915, i915->display.hotplug.hpd); + hotplug_irqs =intel_hpd_hotplug_irqs (i915, i915->display.hotplug.hpd); + +intel_de_rmw (i915,PICAINTERRUPT_IMR , hotplug_irqs, + ~enabled_irqs & hotplug_irqs); +intel_uncore_posting_read (&i915->uncore,PICAINTERRUPT_IMR ); + +xelpdp_pica_hpd_detection_setup (i915); + +if (INTEL_PCH_TYPE (i915) >=PCH_MTP ) +mtp_hpd_irq_setup (i915); +} +static u32 spt_hotplug_enables (struct intel_encoder *encoder) {switch (encoder->hpd_pin) {
@@ -3363,7 +3567,7 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv)GEN3_IRQ_INIT (uncore,GEN8_DE_PORT_ , ~de_port_masked, de_port_enables);GEN3_IRQ_INIT (uncore,GEN8_DE_MISC_ , ~de_misc_masked, de_misc_masked); -if (DISPLAY_VER (dev_priv) >=11 ) { +if (IS_DISPLAY_VER (dev_priv,11 ,13 )) {u32 de_hpd_masked =0 ;u32 de_hpd_enables =GEN11_DE_TC_HOTPLUG_MASK |GEN11_DE_TBT_HOTPLUG_MASK ;
@@ -3373,6 +3577,20 @@ static void gen8_de_irq_postinstall(struct drm_i915_private *dev_priv) } } +static void mtp_irq_postinstall (struct drm_i915_private *i915) +{ +struct intel_uncore *uncore = &i915->uncore; +u32 sde_mask =SDE_GMBUS_ICP |SDE_PICAINTERRUPT ; +u32 de_hpd_mask =XELPDP_AUX_TC_MASK ; +u32 de_hpd_enables = de_hpd_mask |XELPDP_DP_ALT_HOTPLUG_MASK | +XELPDP_TBT_HOTPLUG_MASK ; + +GEN3_IRQ_INIT (uncore,PICAINTERRUPT_ , ~de_hpd_mask, + de_hpd_enables); + +GEN3_IRQ_INIT (uncore,SDE , ~sde_mask,0xffffffff ); +} +static void icp_irq_postinstall (struct drm_i915_private *dev_priv) {struct intel_uncore *uncore = &dev_priv->uncore;
@@ -3434,7 +3652,11 @@ static void dg1_irq_postinstall(struct drm_i915_private *dev_priv)GEN3_IRQ_INIT (uncore,GEN11_GU_MISC_ , ~gu_misc_masked, gu_misc_masked);if (HAS_DISPLAY (dev_priv)) { -icp_irq_postinstall (dev_priv); +if (DISPLAY_VER (dev_priv) >=14 ) +mtp_irq_postinstall (dev_priv); +else +icp_irq_postinstall (dev_priv); +gen8_de_irq_postinstall (dev_priv);intel_uncore_write (&dev_priv->uncore,GEN11_DISPLAY_INT_CTL ,GEN11_DISPLAY_IRQ_ENABLE );
@@ -3920,6 +4142,7 @@ static const struct intel_hotplug_funcs platform##_hpd_funcs = { \ }HPD_FUNCS (i915); +HPD_FUNCS (xelpdp);HPD_FUNCS (dg1);HPD_FUNCS (gen11);HPD_FUNCS (bxt);
@@ -3980,6 +4203,8 @@ void intel_irq_init(struct drm_i915_private *dev_priv) dev_priv->display.funcs.hotplug = &icp_hpd_funcs; else if (HAS_PCH_DG1(dev_priv)) dev_priv->display.funcs.hotplug = &dg1_hpd_funcs; + else if (DISPLAY_VER(dev_priv) >= 14) + dev_priv->display.funcs.hotplug = &xelpdp_hpd_funcs; else if (DISPLAY_VER(dev_priv) >= 11) dev_priv->display.funcs.hotplug = &gen11_hpd_funcs; else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv))
drivers/gpu/drm/i915/i915_reg.h +30 -1
@@ -4487,6 +4487,28 @@#define GEN11_HOTPLUG_CTL_SHORT_DETECT (hpd_pin) (1 << (_HPD_PIN_TC(hpd_pin) * 4))#define GEN11_HOTPLUG_CTL_NO_DETECT (hpd_pin) (0 << (_HPD_PIN_TC(hpd_pin) * 4)) +#define PICAINTERRUPT_ISR _MMIO(0x16FE50) +#define PICAINTERRUPT_IMR _MMIO(0x16FE54) +#define PICAINTERRUPT_IIR _MMIO(0x16FE58) +#define PICAINTERRUPT_IER _MMIO(0x16FE5C) + +#define XELPDP_DP_ALT_HOTPLUG (hpd_pin) REG_BIT(16 + _HPD_PIN_TC(hpd_pin)) +#define XELPDP_DP_ALT_HOTPLUG_MASK REG_GENMASK(19, 16) + +#define XELPDP_AUX_TC (hpd_pin) REG_BIT(8 + _HPD_PIN_TC(hpd_pin)) +#define XELPDP_AUX_TC_MASK REG_GENMASK(11, 8) + +#define XELPDP_TBT_HOTPLUG (hpd_pin) REG_BIT(_HPD_PIN_TC(hpd_pin)) +#define XELPDP_TBT_HOTPLUG_MASK REG_GENMASK(3, 0) + +#define XELPDP_PORT_HOTPLUG_CTL (hpd_pin) _MMIO(0x16F270 + (_HPD_PIN_TC(hpd_pin) * 0x200)) +#define XELPDP_TBT_HOTPLUG_ENABLE REG_BIT(6) +#define XELPDP_TBT_HPD_LONG_DETECT REG_BIT(5) +#define XELPDP_TBT_HPD_SHORT_DETECT REG_BIT(4) +#define XELPDP_DP_ALT_HOTPLUG_ENABLE REG_BIT(2) +#define XELPDP_DP_ALT_HPD_LONG_DETECT REG_BIT(1) +#define XELPDP_DP_ALT_HPD_SHORT_DETECT REG_BIT(0) +#define ILK_DISPLAY_CHICKEN2 _MMIO(0x42004)/* Required on all Ironlake and Sandybridge according to the B-Spec. */ #define ILK_ELPIN_409_SELECT (1 << 25)
@@ -4772,7 +4794,8 @@ SDE_FDI_RXB_CPT | \ SDE_FDI_RXA_CPT) -/* south display engine interrupt: ICP/TGP */ +/* south display engine interrupt: ICP/TGP/MTP */ +#define SDE_PICAINTERRUPT REG_BIT(31)#define SDE_GMBUS_ICP (1 << 23)#define SDE_TC_HOTPLUG_ICP (hpd_pin) REG_BIT(24 + _HPD_PIN_TC(hpd_pin))#define SDE_TC_HOTPLUG_DG2 (hpd_pin) REG_BIT(25 + _HPD_PIN_TC(hpd_pin))/* sigh */
@@ -5126,6 +5149,12 @@#define SOUTH_CHICKEN1 _MMIO(0xc2000)#define FDIA_PHASE_SYNC_SHIFT_OVR 19#define FDIA_PHASE_SYNC_SHIFT_EN 18 +#define INVERT_DDIE_HPD REG_BIT(28) +#define INVERT_DDID_HPD_MTP REG_BIT(27) +#define INVERT_TC4_HPD REG_BIT(26) +#define INVERT_TC3_HPD REG_BIT(25) +#define INVERT_TC2_HPD REG_BIT(24) +#define INVERT_TC1_HPD REG_BIT(23)#define INVERT_DDID_HPD (1 << 18)#define INVERT_DDIC_HPD (1 << 17)#define INVERT_DDIB_HPD (1 << 16)
Signature · 1 line
2.34.1
PATCH 6/9 drm/i915/mtl/display: Implement DisplayPort sequences
In reply to Radhakrishna SripadaFrom: José Roberto de Souza <[email protected]>
The differences between MTL and TGL DP sequences are big enough to MTL have its own functions.
Also it is much easier to follow MTL sequences against spec with its own functions.
One change worthy to mention is the move of 'intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain)'. This call is not necessary for MTL but we have _put() counter part in intel_ddi_post_disable_dp() that needs to balanced.
We could add a display version check on it but instead here it is moving it to intel_ddi_pre_enable_dp() so it is executed for all platforms in a single place and this will not cause any harm in MTL and newer platforms.
v2:
- Fix logic to wait for buf idle.
- Use the right register to wait for ddi active.(RK)
v3:
- Increase wait timeout for ddi buf active (Mika)
v4:
- Increase idle timeout for ddi buf idle (Mika)
BSpec: 65448 65505
--- .../gpu/drm/i915/display/intel_cx0_phy_regs.h | 8 + drivers/gpu/drm/i915/display/intel_ddi.c | 345 +++++++++++++++++- drivers/gpu/drm/i915/i915_reg.h | 5 + 3 files changed, 346 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h +8 -0
@@ -59,8 +59,16 @@ _XELPDP_PORT_BUF_CTL1_LN0_B, \ _XELPDP_PORT_BUF_CTL1_LN0_USBC1, \ _XELPDP_PORT_BUF_CTL1_LN0_USBC2)) +#define XELPDP_PORT_BUF_D2D_LINK_ENABLE REG_BIT(29) +#define XELPDP_PORT_BUF_D2D_LINK_STATE REG_BIT(28)#define XELPDP_PORT_BUF_SOC_PHY_READY REG_BIT(24) +#define XELPDP_PORT_BUF_PORT_DATA_WIDTH_MASK REG_GENMASK(19, 18) +#define XELPDP_PORT_BUF_PORT_DATA_10BIT REG_FIELD_PREP(XELPDP_PORT_BUF_PORT_DATA_WIDTH_MASK, 0) +#define XELPDP_PORT_BUF_PORT_DATA_20BIT REG_FIELD_PREP(XELPDP_PORT_BUF_PORT_DATA_WIDTH_MASK, 1) +#define XELPDP_PORT_BUF_PORT_DATA_40BIT REG_FIELD_PREP(XELPDP_PORT_BUF_PORT_DATA_WIDTH_MASK, 2)#define XELPDP_PORT_REVERSAL REG_BIT(16) +#define XELPDP_PORT_BUF_IO_SELECT_TBT REG_BIT(11) +#define XELPDP_PORT_BUF_PHY_IDLE REG_BIT(7)#define XELPDP_TC_PHY_OWNERSHIP REG_BIT(6)#define XELPDP_TCSS_POWER_REQUEST REG_BIT(5)#define XELPDP_TCSS_POWER_STATE REG_BIT(4)
drivers/gpu/drm/i915/display/intel_ddi.c +333 -12
445 lines not on this page · raw message
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -5655,11 +5655,16 @@ enum skl_power_gate {/* DDI Buffer Control */ #define _DDI_BUF_CTL_A 0x64000#define _DDI_BUF_CTL_B 0x64100 +/* Known as DDI_CTL_DE in MTL+ */ #define DDI_BUF_CTL (port) _MMIO_PORT(port, _DDI_BUF_CTL_A, _DDI_BUF_CTL_B)#define DDI_BUF_CTL_ENABLE (1 << 31)#define DDI_BUF_TRANS_SELECT (n) ((n) << 24)#define DDI_BUF_EMP_MASK (0xf << 24)#define DDI_BUF_PHY_LINK_RATE (r) ((r) << 20) +#define DDI_BUF_PORT_DATA_MASK REG_GENMASK(19, 18) +#define DDI_BUF_PORT_DATA_10BIT REG_FIELD_PREP(DDI_BUF_PORT_DATA_MASK, 0) +#define DDI_BUF_PORT_DATA_20BIT REG_FIELD_PREP(DDI_BUF_PORT_DATA_MASK, 1) +#define DDI_BUF_PORT_DATA_40BIT REG_FIELD_PREP(DDI_BUF_PORT_DATA_MASK, 2)#define DDI_BUF_PORT_REVERSAL (1 << 16)#define DDI_BUF_IS_IDLE (1 << 7)#define DDI_BUF_CTL_TC_PHY_OWNERSHIP REG_BIT(6)
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH 6/9] drm/i915/mtl/display: Implement DisplayPort sequences
Quoted 15 lines · Radhakrishna Sripada
[...]
drivers/gpu/drm/i915/display/intel_ddi.c +14
-0+static void mtl_disable_ddi_buf (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state) +{ +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum port port = encoder->port; +u32 val; + +/* 3.b Clear DDI_CTL_DE Enable to 0. */ + val =intel_de_read (dev_priv,DDI_BUF_CTL (port)); +if (val &DDI_BUF_CTL_ENABLE ) { + val &= ~DDI_BUF_CTL_ENABLE ; +intel_de_write (dev_priv,DDI_BUF_CTL (port), val); + +/* 3.c Poll for PORT_BUF_CTL Idle Status == 1, timeout after 100us */
drivers/gpu/drm/i915/display/intel_ddi.c static void intel_ddi_pre_enable(struct intel_atomic_state *state, · line 2846
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_ddi.c +10
-0+mtl_wait_ddi_buf_idle (dev_priv, port); + } + +/* 3.d Disable D2D Link */ +mtl_ddi_disable_d2d_link (encoder); + +/* 3.e Disable DP_TP_CTL */ +if (intel_crtc_has_dp_encoder (crtc_state)) { + val =intel_de_read (dev_priv,dp_tp_ctl_reg (encoder, crtc_state)); + val &= ~(DP_TP_CTL_ENABLE |DP_TP_CTL_LINK_TRAIN_MASK );
Only DP_TP_CTL_ENABLE should be cleared and could use intel_de_rmw().
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_ddi.c +3
-0+intel_de_write (dev_priv,dp_tp_ctl_reg (encoder, crtc_state), val); + } +}
PATCH 7/9 drm/i915/mtl: Initial DDI port setup
In reply to Radhakrishna SripadaFrom: Clint Taylor <[email protected]>
Initialization sequences and C10 phy are in place to be able to enable the first 2 ports of MTL. The other ports use C20 phy that still need to be properly added. Enable the first ports for now, keeping a TODO comment about the others.
--- drivers/gpu/drm/i915/display/intel_display.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +5 -1
@@ -7791,7 +7791,11 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)if (!HAS_DISPLAY (dev_priv))return ; -if (IS_DG2 (dev_priv)) { +if (IS_METEORLAKE (dev_priv)) { +/* TODO: initialize TC ports as well */ +intel_ddi_init (dev_priv,PORT_A ); +intel_ddi_init (dev_priv,PORT_B ); + }else if (IS_DG2 (dev_priv)) {intel_ddi_init (dev_priv,PORT_A );intel_ddi_init (dev_priv,PORT_B );intel_ddi_init (dev_priv,PORT_C );
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH 7/9] drm/i915/mtl: Initial DDI port setup
On Wed, Apr 12, 2023 at 03:49:23PM -0700, Radhakrishna Sripada wrote:
Could you move this to the end of the patchset?
Quoted 34 lines
From: Clint Taylor <[email protected]>
Initialization sequences and C10 phy are in place to be able to enable the first 2 ports of MTL. The other ports use C20 phy that still need to be properly added. Enable the first ports for now, keeping a TODO comment about the others.
Reviewed-by Lucas De Marchi <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>Signed-off-by Clint Taylor <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_display.c +5
-1@@ -7791,7 +7791,11 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)if (!HAS_DISPLAY (dev_priv))return ; -if (IS_DG2 (dev_priv)) { +if (IS_METEORLAKE (dev_priv)) { +/* TODO: initialize TC ports as well */ +intel_ddi_init (dev_priv,PORT_A ); +intel_ddi_init (dev_priv,PORT_B ); + }else if (IS_DG2 (dev_priv)) {intel_ddi_init (dev_priv,PORT_A );intel_ddi_init (dev_priv,PORT_B );intel_ddi_init (dev_priv,PORT_C );Signature · 1 line
2.34.1
PATCH 8/9 drm/i915/mtl: Add C10 phy programming for HDMI
In reply to Radhakrishna SripadaLike DG2, we still don't have a proper algorithm that can be used for calculating PHY settings, but we do have tables of register values for a handful of the more common link rates. Some support is better than none, so let's go ahead and add/use these tables when we can, and also add some logic to hdmi_port_clock_valid() to filter the modelist to just the modes we can actually support with these link rates.
Hopefully we'll have a proper / non-encumbered algorithm to calculate these registers by the time we upstream and we'll be able to replace this patch with something more general purpose.
Bspec: 64568
v2: Rebasing with Clint's HDMI C10 PLL tables (Mika)
--- drivers/gpu/drm/i915/display/intel_cx0_phy.c | 648 +++++++++++++++++- drivers/gpu/drm/i915/display/intel_cx0_phy.h | 1 + .../gpu/drm/i915/display/intel_cx0_phy_regs.h | 2 + drivers/gpu/drm/i915/display/intel_hdmi.c | 5 +- 4 files changed, 652 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_cx0_phy.c +645 -3
@@ -647,6 +647,630 @@ static const struct intel_c10pll_state * const mtl_c10_edp_tables[] = { NULL, }; +/* +* HDMI link rates with 38.4 MHz reference clock. +*/ + +static const struct intel_c10pll_state mtl_c10_hdmi_25_2 = { + .clock =25200 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x4 , + .pll[1 ] =0 , + .pll[2 ] =0xB2 , + .pll[3 ] =0 , + .pll[4 ] =0 , + .pll[5 ] =0 , + .pll[6 ] =0 , + .pll[7 ] =0 , + .pll[8 ] =0x20 , + .pll[9 ] =0x1 , + .pll[10 ] =0 , + .pll[11 ] =0 , + .pll[12 ] =0 , + .pll[13 ] =0 , + .pll[14 ] =0 , + .pll[15 ] =0xD , + .pll[16 ] =0x6 , + .pll[17 ] =0x8F , + .pll[18 ] =0x84 , + .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_27_0 = { + .clock =27000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , + .pll[1 ] =0 , + .pll[2 ] =0xC0 , + .pll[3 ] =0 , + .pll[4 ] =0 , + .pll[5 ] =0 , + .pll[6 ] =0 , + .pll[7 ] =0 , + .pll[8 ] =0x20 , + .pll[9 ] =0x1 , + .pll[10 ] =0 , + .pll[11 ] =0 , + .pll[12 ] =0x80 , + .pll[13 ] =0 , + .pll[14 ] =0 , + .pll[15 ] =0xD , + .pll[16 ] =0x6 , + .pll[17 ] =0xCF , + .pll[18 ] =0x84 , + .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_74_25 = { + .clock =74250 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , + .pll[1 ] =0 , + .pll[2 ] =0x7A , + .pll[3 ] =0 , + .pll[4 ] =0 , + .pll[5 ] =0 , + .pll[6 ] =0 , + .pll[7 ] =0 , + .pll[8 ] =0x20 , + .pll[9 ] =0x1 , + .pll[10 ] =0 , + .pll[11 ] =0 , + .pll[12 ] =0x58 , + .pll[13 ] =0 , + .pll[14 ] =0 , + .pll[15 ] =0xB , + .pll[16 ] =0x6 , + .pll[17 ] =0xF , + .pll[18 ] =0x85 , + .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_148_5 = { + .clock =148500 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , + .pll[1 ] =0 , + .pll[2 ] =0x7A , + .pll[3 ] =0 , + .pll[4 ] =0 , + .pll[5 ] =0 , + .pll[6 ] =0 , + .pll[7 ] =0 , + .pll[8 ] =0x20 , + .pll[9 ] =0x1 , + .pll[10 ] =0 , + .pll[11 ] =0 , + .pll[12 ] =0x58 , + .pll[13 ] =0 , + .pll[14 ] =0 , + .pll[15 ] =0xA , + .pll[16 ] =0x6 , + .pll[17 ] =0xF , + .pll[18 ] =0x85 , + .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_594 = { + .clock =594000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , + .pll[1 ] =0 , + .pll[2 ] =0x7A , + .pll[3 ] =0 , + .pll[4 ] =0 , + .pll[5 ] =0 , + .pll[6 ] =0 , + .pll[7 ] =0 , + .pll[8 ] =0x20 , + .pll[9 ] =0x1 , + .pll[10 ] =0 , + .pll[11 ] =0 , + .pll[12 ] =0x58 , + .pll[13 ] =0 , + .pll[14 ] =0 , + .pll[15 ] =0x8 , + .pll[16 ] =0x6 , + .pll[17 ] =0xF , + .pll[18 ] =0x85 , + .pll[19 ] =0x23 , +}; + +/* Precomputed C10 HDMI PLL tables */ +static const struct intel_c10pll_state mtl_c10_hdmi_25175 = { + .clock =25175 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , + .pll[1 ] =0x00 , + .pll[2 ] =0xB0 , + .pll[3 ] =0x00 , + .pll[4 ] =0x00 , + .pll[5 ] =0x00 , + .pll[6 ] =0x00 , + .pll[7 ] =0x00 , + .pll[8 ] =0x20 , + .pll[9 ] =0xFF , + .pll[10 ] =0xFF , + .pll[11 ] =0x55 , + .pll[12 ] =0xE5 , + .pll[13 ] =0x55 , + .pll[14 ] =0x55 , + .pll[15 ] =0x0D , + .pll[16 ] =0x09 , + .pll[17 ] =0x8F , + .pll[18 ] =0x84 , + .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_27027 = { + .clock =27027 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , .pll[1 ] =0x00 , .pll[2 ] =0xC0 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0xCC , .pll[12 ] =0x9C , .pll[13 ] =0xCB , .pll[14 ] =0xCC , + .pll[15 ] =0x0D , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_28320 = { + .clock =28320 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x04 , .pll[1 ] =0x00 , .pll[2 ] =0xCC , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x00 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0D , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_30240 = { + .clock =30240 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x04 , .pll[1 ] =0x00 , .pll[2 ] =0xDC , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x00 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0D , .pll[16 ] =0x08 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_31500 = { + .clock =31500 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x62 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0xA0 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0C , .pll[16 ] =0x09 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_36000 = { + .clock =36000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xC4 , .pll[1 ] =0x00 , .pll[2 ] =0x76 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x00 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0C , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_40000 = { + .clock =40000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xB4 , .pll[1 ] =0x00 , .pll[2 ] =0x86 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x55 , .pll[12 ] =0x55 , .pll[13 ] =0x55 , .pll[14 ] =0x55 , + .pll[15 ] =0x0C , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_49500 = { + .clock =49500 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x74 , .pll[1 ] =0x00 , .pll[2 ] =0xAE , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x20 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0C , .pll[16 ] =0x08 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_50000 = { + .clock =50000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x74 , .pll[1 ] =0x00 , .pll[2 ] =0xB0 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0xAA , .pll[12 ] =0x2A , .pll[13 ] =0xA9 , .pll[14 ] =0xAA , + .pll[15 ] =0x0C , .pll[16 ] =0x08 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_57284 = { + .clock =57284 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , .pll[1 ] =0x00 , .pll[2 ] =0xCE , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x77 , .pll[12 ] =0x57 , .pll[13 ] =0x77 , .pll[14 ] =0x77 , + .pll[15 ] =0x0C , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_58000 = { + .clock =58000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , .pll[1 ] =0x00 , .pll[2 ] =0xD0 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x55 , .pll[12 ] =0xD5 , .pll[13 ] =0x55 , .pll[14 ] =0x55 , + .pll[15 ] =0x0C , .pll[16 ] =0x08 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_65000 = { + .clock =65000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x66 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x55 , .pll[12 ] =0xB5 , .pll[13 ] =0x55 , .pll[14 ] =0x55 , + .pll[15 ] =0x0B , .pll[16 ] =0x09 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_71000 = { + .clock =71000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x72 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x55 , .pll[12 ] =0xF5 , .pll[13 ] =0x55 , .pll[14 ] =0x55 , + .pll[15 ] =0x0B , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_74176 = { + .clock =74176 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x7A , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x44 , .pll[12 ] =0x44 , .pll[13 ] =0x44 , .pll[14 ] =0x44 , + .pll[15 ] =0x0B , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_75000 = { + .clock =75000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x7C , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x20 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0B , .pll[16 ] =0x08 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_78750 = { + .clock =78750 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xB4 , .pll[1 ] =0x00 , .pll[2 ] =0x84 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x08 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0B , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_85500 = { + .clock =85500 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xB4 , .pll[1 ] =0x00 , .pll[2 ] =0x92 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x10 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0B , .pll[16 ] =0x08 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_88750 = { + .clock =88750 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x74 , .pll[1 ] =0x00 , .pll[2 ] =0x98 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0xAA , .pll[12 ] =0x72 , .pll[13 ] =0xA9 , .pll[14 ] =0xAA , + .pll[15 ] =0x0B , .pll[16 ] =0x09 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_106500 = { + .clock =106500 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , .pll[1 ] =0x00 , .pll[2 ] =0xBC , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0xF0 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0B , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_108000 = { + .clock =108000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , .pll[1 ] =0x00 , .pll[2 ] =0xC0 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x80 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0B , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_115500 = { + .clock =115500 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , .pll[1 ] =0x00 , .pll[2 ] =0xD0 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x50 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0B , .pll[16 ] =0x08 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_119000 = { + .clock =119000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , .pll[1 ] =0x00 , .pll[2 ] =0xD6 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x55 , .pll[12 ] =0xF5 , .pll[13 ] =0x55 , .pll[14 ] =0x55 , + .pll[15 ] =0x0B , .pll[16 ] =0x08 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_135000 = { + .clock =135000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x6C , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x50 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0A , .pll[16 ] =0x09 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_138500 = { + .clock =138500 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x70 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0xAA , .pll[12 ] =0x22 , .pll[13 ] =0xA9 , .pll[14 ] =0xAA , + .pll[15 ] =0x0A , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_147160 = { + .clock =147160 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x78 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x55 , .pll[12 ] =0xA5 , .pll[13 ] =0x55 , .pll[14 ] =0x55 , + .pll[15 ] =0x0A , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_148352 = { + .clock =148352 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x7A , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x44 , .pll[12 ] =0x44 , .pll[13 ] =0x44 , .pll[14 ] =0x44 , + .pll[15 ] =0x0A , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_154000 = { + .clock =154000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xB4 , .pll[1 ] =0x00 , .pll[2 ] =0x80 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x55 , .pll[12 ] =0x35 , .pll[13 ] =0x55 , .pll[14 ] =0x55 , + .pll[15 ] =0x0A , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_162000 = { + .clock =162000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xB4 , .pll[1 ] =0x00 , .pll[2 ] =0x88 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x60 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0A , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_167000 = { + .clock =167000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xB4 , .pll[1 ] =0x00 , .pll[2 ] =0x8C , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0xAA , .pll[12 ] =0xFA , .pll[13 ] =0xA9 , .pll[14 ] =0xAA , + .pll[15 ] =0x0A , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_197802 = { + .clock =197802 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x74 , .pll[1 ] =0x00 , .pll[2 ] =0xAE , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x99 , .pll[12 ] =0x05 , .pll[13 ] =0x98 , .pll[14 ] =0x99 , + .pll[15 ] =0x0A , .pll[16 ] =0x08 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_198000 = { + .clock =198000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x74 , .pll[1 ] =0x00 , .pll[2 ] =0xAE , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x20 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0A , .pll[16 ] =0x08 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_209800 = { + .clock =209800 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , .pll[1 ] =0x00 , .pll[2 ] =0xBA , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x55 , .pll[12 ] =0x45 , .pll[13 ] =0x55 , .pll[14 ] =0x55 , + .pll[15 ] =0x0A , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_241500 = { + .clock =241500 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , .pll[1 ] =0x00 , .pll[2 ] =0xDA , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0xC8 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x0A , .pll[16 ] =0x08 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_262750 = { + .clock =262750 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x68 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0xAA , .pll[12 ] =0x6C , .pll[13 ] =0xA9 , .pll[14 ] =0xAA , + .pll[15 ] =0x09 , .pll[16 ] =0x09 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_268500 = { + .clock =268500 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x6A , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0xEC , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x09 , .pll[16 ] =0x09 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_296703 = { + .clock =296703 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x7A , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x33 , .pll[12 ] =0x44 , .pll[13 ] =0x33 , .pll[14 ] =0x33 , + .pll[15 ] =0x09 , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_297000 = { + .clock =297000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x7A , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x00 , .pll[12 ] =0x58 , .pll[13 ] =0x00 , .pll[14 ] =0x00 , + .pll[15 ] =0x09 , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_319750 = { + .clock =319750 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xB4 , .pll[1 ] =0x00 , .pll[2 ] =0x86 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0xAA , .pll[12 ] =0x44 , .pll[13 ] =0xA9 , .pll[14 ] =0xAA , + .pll[15 ] =0x09 , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_497750 = { + .clock =497750 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , .pll[1 ] =0x00 , .pll[2 ] =0xE2 , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x55 , .pll[12 ] =0x9F , .pll[13 ] =0x55 , .pll[14 ] =0x55 , + .pll[15 ] =0x09 , .pll[16 ] =0x08 , .pll[17 ] =0xCF , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_592000 = { + .clock =592000 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x7A , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x55 , .pll[12 ] =0x15 , .pll[13 ] =0x55 , .pll[14 ] =0x55 , + .pll[15 ] =0x08 , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state mtl_c10_hdmi_593407 = { + .clock =593407 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0xF4 , .pll[1 ] =0x00 , .pll[2 ] =0x7A , .pll[3 ] =0x00 , .pll[4 ] =0x00 , + .pll[5 ] =0x00 , .pll[6 ] =0x00 , .pll[7 ] =0x00 , .pll[8 ] =0x20 , .pll[9 ] =0xFF , + .pll[10 ] =0xFF , .pll[11 ] =0x3B , .pll[12 ] =0x44 , .pll[13 ] =0xBA , .pll[14 ] =0xBB , + .pll[15 ] =0x08 , .pll[16 ] =0x08 , .pll[17 ] =0x8F , .pll[18 ] =0x84 , .pll[19 ] =0x23 , +}; + +static const struct intel_c10pll_state *const mtl_c10_hdmi_tables[] = { + &mtl_c10_hdmi_25175, + &mtl_c10_hdmi_25_2,/* Consolidated Table */ + &mtl_c10_hdmi_27_0,/* Consolidated Table */ + &mtl_c10_hdmi_27027, + &mtl_c10_hdmi_28320, + &mtl_c10_hdmi_30240, + &mtl_c10_hdmi_31500, + &mtl_c10_hdmi_36000, + &mtl_c10_hdmi_40000, + &mtl_c10_hdmi_49500, + &mtl_c10_hdmi_50000, + &mtl_c10_hdmi_57284, + &mtl_c10_hdmi_58000, + &mtl_c10_hdmi_65000, + &mtl_c10_hdmi_71000, + &mtl_c10_hdmi_74176, + &mtl_c10_hdmi_74_25,/* Consolidated Table */ + &mtl_c10_hdmi_75000, + &mtl_c10_hdmi_78750, + &mtl_c10_hdmi_85500, + &mtl_c10_hdmi_88750, + &mtl_c10_hdmi_106500, + &mtl_c10_hdmi_108000, + &mtl_c10_hdmi_115500, + &mtl_c10_hdmi_119000, + &mtl_c10_hdmi_135000, + &mtl_c10_hdmi_138500, + &mtl_c10_hdmi_147160, + &mtl_c10_hdmi_148352, + &mtl_c10_hdmi_148_5,/* Consolidated Table */ + &mtl_c10_hdmi_154000, + &mtl_c10_hdmi_162000, + &mtl_c10_hdmi_167000, + &mtl_c10_hdmi_197802, + &mtl_c10_hdmi_198000, + &mtl_c10_hdmi_209800, + &mtl_c10_hdmi_241500, + &mtl_c10_hdmi_262750, + &mtl_c10_hdmi_268500, + &mtl_c10_hdmi_296703, + &mtl_c10_hdmi_297000, + &mtl_c10_hdmi_319750, + &mtl_c10_hdmi_497750, + &mtl_c10_hdmi_592000, + &mtl_c10_hdmi_593407, + &mtl_c10_hdmi_594,/* Consolidated Table */ +NULL , +}; + +int intel_c10_phy_check_hdmi_link_rate (int clock) +{ +const struct intel_c10pll_state *const *tables = mtl_c10_hdmi_tables; +int i; + +for (i =0 ; tables[i]; i++) { +if (clock == tables[i]->clock) +return MODE_OK ; + } + +return MODE_CLOCK_RANGE ; +} +static const struct intel_c10pll_state *const *intel_c10pll_tables_get (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder)
@@ -656,9 +1280,10 @@ intel_c10pll_tables_get(struct intel_crtc_state *crtc_state,return mtl_c10_edp_tables; else return mtl_c10_dp_tables; + }else if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) { +return mtl_c10_hdmi_tables; } -/* TODO: Add HDMI Support */ MISSING_CASE (encoder->type);return NULL ; }
@@ -690,9 +1315,20 @@ static void intel_c10pll_update_pll(struct intel_crtc_state *crtc_state,static int intel_c10pll_calc_state (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder) { +struct drm_i915_private *i915 =to_i915 (encoder->base.dev);const struct intel_c10pll_state *const *tables; +enum phy phy =intel_port_to_phy (i915, encoder->port);int i; +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) { +if (intel_c10_phy_check_hdmi_link_rate (crtc_state->port_clock) + !=MODE_OK ) { +drm_dbg_kms (&i915->drm,"Can't support HDMI link rate %d on phy %c.\n" , + crtc_state->port_clock,phy_name (phy)); +return -EINVAL ; + } + } + tables =intel_c10pll_tables_get (crtc_state, encoder);if (!tables)return -EINVAL ;
@@ -758,6 +1394,7 @@ static void intel_c10_pll_program(struct drm_i915_private *i915,intel_cx0_rmw (i915, encoder->port,INTEL_CX0_BOTH_LANES ,PHY_C10_VDR_CONTROL (1 ),0 ,C10_VDR_CTRL_MSGBUS_ACCESS ,MB_WRITE_COMMITTED ); +/* Custom width needs to be programmed to 0 for both the phy lanes */ intel_cx0_rmw(i915, encoder->port, INTEL_CX0_BOTH_LANES, PHY_C10_VDR_CUSTOM_WIDTH, C10_VDR_CUSTOM_WIDTH_MASK, C10_VDR_CUSTOM_WIDTH_8_10,
@@ -820,7 +1457,8 @@ int intel_c10pll_calc_port_clock(struct intel_encoder *encoder, const struct intel_c10pll_state *pll_state) {unsigned int frac_quot =0 , frac_rem =0 , frac_den =1 ; -unsigned int multiplier, tx_clk_div, refclk =38400 ; +unsigned int multiplier, tx_clk_div, hdmi_div, refclk =38400 ; +int tmpclk =0 ;if (pll_state->pll[0 ] &C10_PLL0_FRACEN ) { frac_quot = pll_state->pll[12 ] <<8 | pll_state->pll[11 ];
@@ -832,10 +1470,14 @@ int intel_c10pll_calc_port_clock(struct intel_encoder *encoder, pll_state->pll[2]) / 2 + 16; tx_clk_div =REG_FIELD_GET8 (C10_PLL15_TXCLKDIV_MASK , pll_state->pll[15 ]); + hdmi_div =REG_FIELD_GET8 (C10_PLL15_HDMIDIV_MASK , pll_state->pll[15 ]); -return DIV_ROUND_CLOSEST_ULL (mul_u32_u32 (refclk, (multiplier <<16 ) + frac_quot) + + tmpclk =DIV_ROUND_CLOSEST_ULL (mul_u32_u32 (refclk, (multiplier <<16 ) + frac_quot) +DIV_ROUND_CLOSEST (refclk * frac_rem, frac_den),10 << (tx_clk_div +16 )); + tmpclk *= (hdmi_div ?2 :1 ); + +return tmpclk; } static void intel_program_port_clock_ctl(struct intel_encoder *encoder,
drivers/gpu/drm/i915/display/intel_cx0_phy.h +1 -0
@@ -32,5 +32,6 @@ void intel_c10pll_state_verify(struct intel_atomic_state *state, struct intel_crtc_state *new_crtc_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);#endif /* __INTEL_CX0_PHY_H__ */
drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h +2 -0
@@ -145,6 +145,8 @@#define C10_PLL0_FRACEN REG_BIT8(4)#define C10_PLL3_MULTIPLIERH_MASK REG_GENMASK8(3, 0)#define C10_PLL15_TXCLKDIV_MASK REG_GENMASK8(2, 0) +#define C10_PLL15_HDMIDIV_MASK REG_GENMASK8(5, 3) +#define PHY_C10_VDR_CMN (idx) (0xC20 + (idx))#define C10_CMN0_REF_RANGE REG_FIELD_PREP(REG_GENMASK(4, 0), 1)#define C10_CMN0_REF_CLK_MPLLB_DIV REG_FIELD_PREP(REG_GENMASK(7, 5), 1)
drivers/gpu/drm/i915/display/intel_hdmi.c +4 -1
@@ -45,6 +45,7 @@#include "intel_atomic.h" #include "intel_audio.h" #include "intel_connector.h" +#include "intel_cx0_phy.h" #include "intel_ddi.h" #include "intel_de.h" #include "intel_display_types.h"
@@ -1864,7 +1865,9 @@ 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_DG2 (dev_priv)) +if (IS_METEORLAKE (dev_priv)) +return intel_c10_phy_check_hdmi_link_rate (clock); +else if (IS_DG2 (dev_priv))return intel_snps_phy_check_hdmi_link_rate (clock);return MODE_OK ;
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH 8/9] drm/i915/mtl: Add C10 phy programming for HDMI
Quoted 17 lines · Radhakrishna Sripada
[...]
drivers/gpu/drm/i915/display/intel_cx0_phy.c +16
-0+/* Precomputed C10 HDMI PLL tables */ +static const struct intel_c10pll_state mtl_c10_hdmi_25175 = { + .clock =25175 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , + .pll[1 ] =0x00 , + .pll[2 ] =0xB0 , + .pll[3 ] =0x00 , + .pll[4 ] =0x00 , + .pll[5 ] =0x00 , + .pll[6 ] =0x00 , + .pll[7 ] =0x00 , + .pll[8 ] =0x20 , + .pll[9 ] =0xFF , + .pll[10 ] =0xFF ,
drivers/gpu/drm/i915/display/intel_cx0_phy.c static const struct intel_c10pll_state * const mtl_c10_edp_tables[] = { · line 809
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cx0_phy.c +10
-0+ .pll[11] = 0x55, + .pll[12] = 0xE5, + .pll[13] = 0x55, + .pll[14] = 0x55, + .pll[15] = 0x0D, + .pll[16] = 0x09, + .pll[17] = 0x8F, + .pll[18] = 0x84, + .pll[19] = 0x23, +};
Something off with the above table, intel_c10pll_calc_port_clock() calculates 25200 clock rate for it. So either .clock above needs to be the same rate, or the PLL params need to be corrected for the 25175 rate.
Quoted 8 lines
[...]
drivers/gpu/drm/i915/display/intel_cx0_phy.c +2
-0@@ -690,9 +1315,20 @@ static void intel_c10pll_update_pll(struct intel_crtc_state *crtc_state,static int intel_c10pll_calc_state (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder) { +struct drm_i915_private *i915 =to_i915 (encoder->base.dev);const struct intel_c10pll_state *const *tables; +enum phy phy =intel_port_to_phy (i915, encoder->port);
drivers/gpu/drm/i915/display/intel_cx0_phy.c static void intel_c10pll_update_pll(struct intel_crtc_state *crtc_state, · line 1330
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cx0_phy.c +8
-0int i; +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) { +if (intel_c10_phy_check_hdmi_link_rate (crtc_state->port_clock) + !=MODE_OK ) { +drm_dbg_kms (&i915->drm,"Can't support HDMI link rate %d on phy %c.\n" , + crtc_state->port_clock,phy_name (phy)); +return -EINVAL ; + } + }
The above check is not needed, covered already by the loop later in the function.
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_cx0_phy.c +1
-0+ tables =intel_c10pll_tables_get (crtc_state, encoder);if (!tables)return -EINVAL ;
Re: [Intel-gfx] [PATCH 8/9] drm/i915/mtl: Add C10 phy programming for HDMI
Quoted 34 lines
-----Original Message-----
From: Deak, Imre <[email protected]>
Sent: Thursday, April 13, 2023 9:37 AM
To: Sripada, Radhakrishna <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH 8/9] drm/i915/mtl: Add C10 phy programming for HDMIQuoted 24 lines · Radhakrishna Sripada
[...]
drivers/gpu/drm/i915/display/intel_cx0_phy.c +23
-0+/* Precomputed C10 HDMI PLL tables */ +static const struct intel_c10pll_state mtl_c10_hdmi_25175 = { + .clock =25175 , + .tx =0x10 , + .cmn =0x1 , + .pll[0 ] =0x34 , + .pll[1 ] =0x00 , + .pll[2 ] =0xB0 , + .pll[3 ] =0x00 , + .pll[4 ] =0x00 , + .pll[5 ] =0x00 , + .pll[6 ] =0x00 , + .pll[7 ] =0x00 , + .pll[8 ] =0x20 , + .pll[9 ] =0xFF , + .pll[10 ] =0xFF , + .pll[11 ] =0x55 , + .pll[12 ] =0xE5 , + .pll[13 ] =0x55 , + .pll[14 ] =0x55 , + .pll[15 ] =0x0D , + .pll[16 ] =0x09 , + .pll[17 ] =0x8F ,
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_cx0_phy.c static const struct intel_c10pll_state * const mtl_c10_edp_tables[] = { · line 678
Quoted 3 lines
drivers/gpu/drm/i915/display/intel_cx0_phy.c +3
-0+ .pll[18] = 0x84, + .pll[19] = 0x23, +};Something off with the above table,
intel_c10pll_calc_port_clock()calculates 25200 clock rate for it. So either .clock above needs to be the same rate, or the PLL params need to be corrected for the 25175 rate.
We do have a pre-computed table for 25200 clock which has different values. Do we skip this clock for now?
-RK
Quoted 29 lines
Review static void intel_c10pll_update_pll(struct
Quoted 3 lines
[...]
(quoted diff) +0
-0@@ -690,9 +1315,20 @@ static void intel_c10pll_update_pll(struct
intel_crtc_state*crtc_state,drivers/gpu/drm/i915/display/intel_cx0_phy.c static void intel_c10pll_update_pll(struct intel_crtc_state *crtc_state,
Quoted 12 lines
drivers/gpu/drm/i915/display/intel_cx0_phy.c +6
-0static int intel_c10pll_calc_state (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder) { +struct drm_i915_private *i915 =to_i915 (encoder->base.dev);const struct intel_c10pll_state *const *tables; +enum phy phy =intel_port_to_phy (i915, encoder->port);int i; +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) { +if (intel_c10_phy_check_hdmi_link_rate (crtc_state->port_clock) + !=MODE_OK ) { + drm_dbg_kms(&i915->drm, "Can't support HDMI linkrate %d on phy %c.\n",
drivers/gpu/drm/i915/display/intel_cx0_phy.c static void intel_c10pll_update_pll(struct intel_crtc_state *crtc_state, · line 1330
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_cx0_phy.c +4
-0+ crtc_state->port_clock, phy_name(phy)); +return -EINVAL ; + } + }The above check is not needed, covered already by the loop later in the function.
Quoted 4 lines
drivers/gpu/drm/i915/display/intel_cx0_phy.c +1
-0+ tables =intel_c10pll_tables_get (crtc_state, encoder);if (!tables)return -EINVAL ;
PATCH 9/9 drm/i915/display/mtl: Fill port width in DDI_BUF_/TRANS_DDI_FUNC_/PORT_BUF_CTL for HDMI
In reply to Radhakrishna SripadaFrom: Ankit Nautiyal <[email protected]>
MTL requires the PORT_CTL_WIDTH, TRANS_DDI_FUNC_CTL and DDI_BUF_CTL to be filled with 4 lanes for TMDS mode.
This patch enables D2D link and fills PORT_WIDTH in appropriate registers.
v2:
- Added fixes from Clint's Add HDMI implementation changes.
- Modified commit message.
v3:
- Use TRANS_DDI_PORT_WIDTH() instead of DDI_PORT_WIDTH() for the value of TRANS_DDI_FUNC_CTL_*. (Gustavo)
--- drivers/gpu/drm/i915/display/intel_ddi.c | 32 ++++++++++++++++++++++-- drivers/gpu/drm/i915/i915_reg.h | 2 ++ 2 files changed, 32 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +30 -2
@@ -541,6 +541,8 @@ intel_ddi_transcoder_func_reg_val_get(struct intel_encoder *encoder, temp |=TRANS_DDI_HDMI_SCRAMBLING ;if (crtc_state->hdmi_high_tmds_clock_ratio) temp |=TRANS_DDI_HIGH_TMDS_CHAR_RATE ; +if (DISPLAY_VER (dev_priv) >=14 ) + temp |=TRANS_DDI_PORT_WIDTH (crtc_state->lane_count); }else if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_ANALOG )) { temp |=TRANS_DDI_MODE_SELECT_FDI_OR_128B132B ; temp |= (crtc_state->fdi_lanes -1 ) <<1 ;
@@ -3158,6 +3160,10 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state,if (has_buf_trans_select (dev_priv))hsw_prepare_hdmi_ddi_buffers (encoder, crtc_state); +/* e. Enable D2D Link for C10/C20 Phy */ +if (DISPLAY_VER (dev_priv) >=14 ) +mtl_ddi_enable_d2d (encoder); + encoder->set_signal_levels (encoder, crtc_state);/* Display WA #1143: skl,kbl,cfl */
@@ -3203,12 +3209,30 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state,* * On ADL_P the PHY link rate and lane count must be programmed but * these are both 0 for HDMI. +* +* But MTL onwards HDMI2.1 is supported and in TMDS mode this +* is filled with lane count, already set in the crtc_state. +* The same is required to be filled in PORT_BUF_CTL for C10/20 Phy. */ buf_ctl = dig_port->saved_port_bits |DDI_BUF_CTL_ENABLE ; -if (IS_ALDERLAKE_P (dev_priv) &&intel_phy_is_tc (dev_priv, phy)) { +if (DISPLAY_VER (dev_priv) >=14 ) { +u8 lane_count =mtl_get_port_width (crtc_state->lane_count); +u32 port_buf =0 ; + + port_buf |=XELPDP_PORT_WIDTH (lane_count); + +if (dig_port->saved_port_bits &DDI_BUF_PORT_REVERSAL ) + port_buf |=XELPDP_PORT_REVERSAL ; + +intel_de_rmw (dev_priv,XELPDP_PORT_BUF_CTL1 (port), +XELPDP_PORT_WIDTH_MASK |XELPDP_PORT_REVERSAL , port_buf); + + buf_ctl |=DDI_PORT_WIDTH (lane_count); + }else if (IS_ALDERLAKE_P (dev_priv) &&intel_phy_is_tc (dev_priv, phy)) {drm_WARN_ON (&dev_priv->drm, !intel_tc_port_in_legacy_mode (dig_port)); buf_ctl |=DDI_BUF_CTL_TC_PHY_OWNERSHIP ; } +intel_de_write (dev_priv,DDI_BUF_CTL (port), buf_ctl);intel_wait_ddi_buf_active (dev_priv, port);
@@ -3669,7 +3693,11 @@ static void intel_ddi_read_func_ctl(struct intel_encoder *encoder, fallthrough;case TRANS_DDI_MODE_SELECT_DVI : pipe_config->output_types |=BIT (INTEL_OUTPUT_HDMI ); - pipe_config->lane_count =4 ; +if (DISPLAY_VER (dev_priv) >=14 ) + pipe_config->lane_count = + ((temp &DDI_PORT_WIDTH_MASK ) >>DDI_PORT_WIDTH_SHIFT ) +1 ; +else + pipe_config->lane_count =4 ;break ;case TRANS_DDI_MODE_SELECT_DP_SST :if (encoder->type ==INTEL_OUTPUT_EDP )
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -5596,6 +5596,8 @@ enum skl_power_gate {#define TRANS_DDI_HDCP_SELECT REG_BIT(5)#define TRANS_DDI_BFI_ENABLE (1 << 4)#define TRANS_DDI_HIGH_TMDS_CHAR_RATE (1 << 4) +#define TRANS_DDI_PORT_WIDTH_MASK REG_GENMASK(3, 1) +#define TRANS_DDI_PORT_WIDTH (width) REG_FIELD_PREP(TRANS_DDI_PORT_WIDTH_MASK, (width) - 1)#define TRANS_DDI_HDMI_SCRAMBLING (1 << 0)#define TRANS_DDI_HDMI_SCRAMBLING_MASK (TRANS_DDI_HDMI_SCRAMBLER_CTS_ENABLE \ | TRANS_DDI_HDMI_SCRAMBLER_RESET_FREQ \
Signature · 1 line
2.34.1
Re: [Intel-gfx] [PATCH 9/9] drm/i915/display/mtl: Fill port width in DDI_BUF_/TRANS_DDI_FUNC_/PORT_BUF_CTL for HDMI
Quoted 14 lines · Radhakrishna Sripada
From: Ankit Nautiyal <[email protected]>
MTL requires the
PORT_CTL_WIDTH,TRANS_DDI_FUNC_CTLandDDI_BUF_CTLto be filled with 4 lanes for TMDS mode.
This patch enables D2D link and fillsPORT_WIDTHin appropriate registers.v2:
- Added fixes from Clint's Add HDMI implementation changes.
- Modified commit message.
v3:
- UseTRANS_DDI_PORT_WIDTH()instead ofDDI_PORT_WIDTH()for the value of TRANS_DDI_FUNC_CTL_*. (Gustavo)
Quoted 4 lines
Cc Taylor, Clinton A <[email protected]>Signed-off-by Ankit Nautiyal <[email protected]>Signed-off-by Radhakrishna Sripada <[email protected]>Signed-off-by Mika Kahola <[email protected]>
Quoted 90 lines
--- drivers/gpu/drm/i915/display/intel_ddi.c | 32 ++++++++++++++++++++++-- drivers/gpu/drm/i915/i915_reg.h | 2 ++ 2 files changed, 32 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_ddi.c +30
-2@@ -541,6 +541,8 @@ intel_ddi_transcoder_func_reg_val_get(struct intel_encoder *encoder, temp |=TRANS_DDI_HDMI_SCRAMBLING ;if (crtc_state->hdmi_high_tmds_clock_ratio) temp |=TRANS_DDI_HIGH_TMDS_CHAR_RATE ; +if (DISPLAY_VER (dev_priv) >=14 ) + temp |=TRANS_DDI_PORT_WIDTH (crtc_state->lane_count); }else if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_ANALOG )) { temp |=TRANS_DDI_MODE_SELECT_FDI_OR_128B132B ; temp |= (crtc_state->fdi_lanes -1 ) <<1 ;@@ -3158,6 +3160,10 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state,if (has_buf_trans_select (dev_priv))hsw_prepare_hdmi_ddi_buffers (encoder, crtc_state); +/* e. Enable D2D Link for C10/C20 Phy */ +if (DISPLAY_VER (dev_priv) >=14 ) +mtl_ddi_enable_d2d (encoder); + encoder->set_signal_levels (encoder, crtc_state);/* Display WA #1143: skl,kbl,cfl */ @@ -3203,12 +3209,30 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state,* * On ADL_P the PHY link rate and lane count must be programmed but * these are both 0 for HDMI. +* +* But MTL onwards HDMI2.1 is supported and in TMDS mode this +* is filled with lane count, already set in the crtc_state. +* The same is required to be filled in PORT_BUF_CTL for C10/20 Phy. */ buf_ctl = dig_port->saved_port_bits |DDI_BUF_CTL_ENABLE ; -if (IS_ALDERLAKE_P (dev_priv) &&intel_phy_is_tc (dev_priv, phy)) { +if (DISPLAY_VER (dev_priv) >=14 ) { +u8 lane_count =mtl_get_port_width (crtc_state->lane_count); +u32 port_buf =0 ; + + port_buf |=XELPDP_PORT_WIDTH (lane_count); + +if (dig_port->saved_port_bits &DDI_BUF_PORT_REVERSAL ) + port_buf |=XELPDP_PORT_REVERSAL ; + +intel_de_rmw (dev_priv,XELPDP_PORT_BUF_CTL1 (port), +XELPDP_PORT_WIDTH_MASK |XELPDP_PORT_REVERSAL , port_buf); + + buf_ctl |=DDI_PORT_WIDTH (lane_count); + }else if (IS_ALDERLAKE_P (dev_priv) &&intel_phy_is_tc (dev_priv, phy)) {drm_WARN_ON (&dev_priv->drm, !intel_tc_port_in_legacy_mode (dig_port)); buf_ctl |=DDI_BUF_CTL_TC_PHY_OWNERSHIP ; } +intel_de_write (dev_priv,DDI_BUF_CTL (port), buf_ctl);intel_wait_ddi_buf_active (dev_priv, port);@@ -3669,7 +3693,11 @@ static void intel_ddi_read_func_ctl(struct intel_encoder *encoder, fallthrough;case TRANS_DDI_MODE_SELECT_DVI : pipe_config->output_types |=BIT (INTEL_OUTPUT_HDMI ); - pipe_config->lane_count =4 ; +if (DISPLAY_VER (dev_priv) >=14 ) + pipe_config->lane_count = + ((temp &DDI_PORT_WIDTH_MASK ) >>DDI_PORT_WIDTH_SHIFT ) +1 ; +else + pipe_config->lane_count =4 ;break ;case TRANS_DDI_MODE_SELECT_DP_SST :if (encoder->type ==INTEL_OUTPUT_EDP )drivers/gpu/drm/i915/i915_reg.h +2
-0@@ -5596,6 +5596,8 @@ enum skl_power_gate {#define TRANS_DDI_HDCP_SELECT REG_BIT(5)#define TRANS_DDI_BFI_ENABLE (1 << 4)#define TRANS_DDI_HIGH_TMDS_CHAR_RATE (1 << 4) +#define TRANS_DDI_PORT_WIDTH_MASK REG_GENMASK(3, 1) +#define TRANS_DDI_PORT_WIDTH (width) REG_FIELD_PREP(TRANS_DDI_PORT_WIDTH_MASK, (width) - 1)#define TRANS_DDI_HDMI_SCRAMBLING (1 << 0)#define TRANS_DDI_HDMI_SCRAMBLING_MASK (TRANS_DDI_HDMI_SCRAMBLER_CTS_ENABLE \ | TRANS_DDI_HDMI_SCRAMBLER_RESET_FREQ \Signature · 1 line
2.34.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/mtl: Add Support for C10 phy (rev2)
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: drm/i915/mtl: Add Support for C10 phy (rev2)
URL : https://patchwork.freedesktop.org/series/116191/
State : warning
== Summary ==
Error: dim checkpatch failed643cdd1a6fc0 drm/i915/mtl: Add DP ratesad8be772880d drm/i915/mtl: Create separate reg file for PICA registers
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:19: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #19:
new file mode 100644
-:39: WARNING:LONG_LINE: line length of 117 exceeds 100 columns #39: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:16:
+ _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_A, \
-:40: WARNING:LONG_LINE: line length of 117 exceeds 100 columns #40: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:17:
+ _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_B, \
-:41: WARNING:LONG_LINE: line length of 121 exceeds 100 columns #41: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:18:
+ _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_USBC1, \
-:42: WARNING:LONG_LINE: line length of 133 exceeds 100 columns #42: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:19:
+ _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_USBC2) + (lane) * 4)
-:45: WARNING:LONG_LINE: line length of 110 exceeds 100 columns #45: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:22:
+#define XELPDP_PORT_M2P_COMMAND_WRITE_UNCOMMITTED REG_FIELD_PREP(XELPDP_PORT_M2P_COMMAND_TYPE_MASK, 0x1)
-:46: WARNING:LONG_LINE: line length of 110 exceeds 100 columns #46: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:23:
+#define XELPDP_PORT_M2P_COMMAND_WRITE_COMMITTED REG_FIELD_PREP(XELPDP_PORT_M2P_COMMAND_TYPE_MASK, 0x2)
-:47: WARNING:LONG_LINE: line length of 110 exceeds 100 columns #47: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:24:
+#define XELPDP_PORT_M2P_COMMAND_READ REG_FIELD_PREP(XELPDP_PORT_M2P_COMMAND_TYPE_MASK, 0x3)
-:49: WARNING:LONG_LINE: line length of 102 exceeds 100 columns #49: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:26:
+#define XELPDP_PORT_M2P_DATA(val) REG_FIELD_PREP(XELPDP_PORT_M2P_DATA_MASK, val)
-:52: WARNING:LONG_LINE: line length of 105 exceeds 100 columns #52: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:29:
+#define XELPDP_PORT_M2P_ADDRESS(val) REG_FIELD_PREP(XELPDP_PORT_M2P_ADDRESS_MASK, val)
-:54: WARNING:LONG_LINE: line length of 117 exceeds 100 columns #54: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:31:
+ _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_A, \
-:55: WARNING:LONG_LINE: line length of 117 exceeds 100 columns #55: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:32:
+ _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_B, \
-:56: WARNING:LONG_LINE: line length of 121 exceeds 100 columns #56: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:33:
+ _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_USBC1, \
-:57: WARNING:LONG_LINE: line length of 137 exceeds 100 columns #57: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:34:
+ _XELPDP_PORT_M2P_MSGBUS_CTL_LN0_USBC2) + (lane) * 4 + 8)
-:63: WARNING:LONG_LINE: line length of 102 exceeds 100 columns #63: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:40:
+#define XELPDP_PORT_P2M_DATA(val) REG_FIELD_PREP(XELPDP_PORT_P2M_DATA_MASK, val)
-:81: WARNING:LONG_LINE: line length of 111 exceeds 100 columns #81: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:58:
+ _XELPDP_PORT_BUF_CTL1_LN0_A, \
-:82: WARNING:LONG_LINE: line length of 111 exceeds 100 columns #82: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:59:
+ _XELPDP_PORT_BUF_CTL1_LN0_B, \
-:83: WARNING:LONG_LINE: line length of 115 exceeds 100 columns #83: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:60:
+ _XELPDP_PORT_BUF_CTL1_LN0_USBC1, \
-:84: WARNING:LONG_LINE: line length of 114 exceeds 100 columns #84: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:61:
+ _XELPDP_PORT_BUF_CTL1_LN0_USBC2))
-:94: WARNING:LONG_LINE: line length of 111 exceeds 100 columns #94: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:71:
+ _XELPDP_PORT_BUF_CTL1_LN0_A, \
-:95: WARNING:LONG_LINE: line length of 111 exceeds 100 columns #95: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:72:
+ _XELPDP_PORT_BUF_CTL1_LN0_B, \
-:96: WARNING:LONG_LINE: line length of 115 exceeds 100 columns #96: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:73:
+ _XELPDP_PORT_BUF_CTL1_LN0_USBC1, \
-:97: WARNING:LONG_LINE: line length of 118 exceeds 100 columns #97: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:74:
+ _XELPDP_PORT_BUF_CTL1_LN0_USBC2) + 4)
-:103: WARNING:LONG_LINE: line length of 115 exceeds 100 columns #103: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:80:
+#define _XELPDP_LANE0_POWERDOWN_NEW_STATE(val) REG_FIELD_PREP(_XELPDP_LANE0_POWERDOWN_NEW_STATE_MASK, val)
-:105: WARNING:LONG_LINE: line length of 115 exceeds 100 columns #105: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:82:
+#define _XELPDP_LANE1_POWERDOWN_NEW_STATE(val) REG_FIELD_PREP(_XELPDP_LANE1_POWERDOWN_NEW_STATE_MASK, val)
-:106: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'val' - possible side-effects? #106: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:83:
+#define XELPDP_LANE_POWERDOWN_NEW_STATE(lane, val) _PICK(lane, \
+ _XELPDP_LANE0_POWERDOWN_NEW_STATE(val), \
+ _XELPDP_LANE1_POWERDOWN_NEW_STATE(val))
-:107: WARNING:LONG_LINE: line length of 103 exceeds 100 columns #107: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:84:
+ _XELPDP_LANE0_POWERDOWN_NEW_STATE(val), \
-:108: WARNING:LONG_LINE: line length of 101 exceeds 100 columns #108: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:85:
+ _XELPDP_LANE1_POWERDOWN_NEW_STATE(val))
-:111: WARNING:LONG_LINE: line length of 106 exceeds 100 columns #111: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:88:
+#define XELPDP_POWER_STATE_READY(val) REG_FIELD_PREP(XELPDP_POWER_STATE_READY_MASK, val)
-:114: WARNING:LONG_LINE: line length of 111 exceeds 100 columns #114: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:91:
+ _XELPDP_PORT_BUF_CTL1_LN0_A, \
-:115: WARNING:LONG_LINE: line length of 111 exceeds 100 columns #115: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:92:
+ _XELPDP_PORT_BUF_CTL1_LN0_B, \
-:116: WARNING:LONG_LINE: line length of 115 exceeds 100 columns #116: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:93:
+ _XELPDP_PORT_BUF_CTL1_LN0_USBC1, \
-:117: WARNING:LONG_LINE: line length of 118 exceeds 100 columns #117: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:94:
+ _XELPDP_PORT_BUF_CTL1_LN0_USBC2) + 8)
-:119: WARNING:LONG_LINE: line length of 114 exceeds 100 columns #119: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:96:
+#define XELPDP_PLL_LANE_STAGGERING_DELAY(val) REG_FIELD_PREP(XELPDP_PLL_LANE_STAGGERING_DELAY_MASK, val)
-:121: WARNING:LONG_LINE: line length of 107 exceeds 100 columns #121: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:98:
+#define XELPDP_POWER_STATE_ACTIVE(val) REG_FIELD_PREP(XELPDP_POWER_STATE_ACTIVE_MASK, val)
-:128: WARNING:LONG_LINE: line length of 108 exceeds 100 columns #128: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:105:
+ _XELPDP_PORT_CLOCK_CTL_A, \
-:129: WARNING:LONG_LINE: line length of 108 exceeds 100 columns #129: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:106:
+ _XELPDP_PORT_CLOCK_CTL_B, \
-:130: WARNING:LONG_LINE: line length of 112 exceeds 100 columns #130: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:107:
+ _XELPDP_PORT_CLOCK_CTL_USBC1, \
-:131: WARNING:LONG_LINE: line length of 111 exceeds 100 columns #131: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:108:
+ _XELPDP_PORT_CLOCK_CTL_USBC2))
-:143: WARNING:LONG_LINE: line length of 105 exceeds 100 columns #143: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:120:
+#define XELPDP_DDI_CLOCK_SELECT(val) REG_FIELD_PREP(XELPDP_DDI_CLOCK_SELECT_MASK, val)
total: 0 errors, 39 warnings, 1 checks, 133 lines checkedf222ea734769 drm/i915/mtl: Add Support for C10 PHY message bus and pll programming
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:24: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #24:
Move register definitions to a new file i.e. intel_cx0_reg_defs.h (Jani)
-:66: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #66:
new file mode 100644
-:89: CHECK:MACRO_ARG_REUSE: Macro argument reuse '__lane' - possible side-effects? #89: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:19:
+#define for_each_cx0_lane_in_mask(__lane_mask, __lane) \
+ for ((__lane) = 0; (__lane) < 2; (__lane)++) \
+ for_each_if((__lane_mask) & BIT(__lane))
-:99: CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'phy < PHY_C' #99: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:29:
+ if (IS_METEORLAKE(i915) && (phy < PHY_C))
-:188: WARNING:LONG_LINE: line length of 113 exceeds 100 columns #188: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:118:
+ drm_dbg_kms(&i915->drm, "PHY %c Error occurred during %s command. Status: 0x%x\n", phy_name(phy),
-:195: WARNING:LONG_LINE: line length of 106 exceeds 100 columns #195: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:125:
+ drm_dbg_kms(&i915->drm, "PHY %c Not a %s response. MSGBUS Status: 0x%x.\n", phy_name(phy),
-:215: WARNING:LONG_LINE: line length of 134 exceeds 100 columns #215: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:145:
+ "PHY %c Timeout waiting for previous transaction to complete. Reset the bus and retry.\n", phy_name(phy));
-:276: WARNING:LONG_LINE: line length of 128 exceeds 100 columns #276: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:206:
+ "PHY %c Timeout waiting for previous transaction to complete. Resetting the bus.\n", phy_name(phy));
-:292: WARNING:LONG_LINE: line length of 113 exceeds 100 columns #292: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:222:
+ "PHY %c Timeout waiting for write to complete. Resetting the bus.\n", phy_name(phy));
-:298: WARNING:LONG_LINE: line length of 108 exceeds 100 columns #298: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:228:
+ if (intel_cx0_wait_for_ack(i915, port, XELPDP_PORT_P2M_COMMAND_WRITE_ACK, lane, &val) < 0) {
-:752: WARNING:LONG_LINE: line length of 118 exceeds 100 columns #752: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:682:
+ intel_cx0_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C10_VDR_CMN(0), pll_state->cmn, MB_WRITE_COMMITTED);
-:753: WARNING:LONG_LINE: line length of 116 exceeds 100 columns #753: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:683:
+ intel_cx0_write(i915, encoder->port, INTEL_CX0_LANE0, PHY_C10_VDR_TX(0), pll_state->tx, MB_WRITE_COMMITTED);
-:875: WARNING:LONG_LINE: line length of 111 exceeds 100 columns #875: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.c:805:
+ intel_cx0_get_powerdown_state(INTEL_CX0_BOTH_LANES, XELPDP_LANE_POWERDOWN_NEW_STATE_MASK),
-:1284: WARNING:SPDX_LICENSE_TAG: Improper SPDX comment style for 'drivers/gpu/drm/i915/display/intel_cx0_phy.h', please use '/*' instead #1284: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.h:1:
+// SPDX-License-Identifier: MIT
-:1284: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #1284: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.h:1:
+// SPDX-License-Identifier: MIT
-:1308: WARNING:LONG_LINE: line length of 104 exceeds 100 columns
#1308: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy.h:25:
+void intel_c10pll_readout_hw_state(struct intel_encoder *encoder, struct intel_c10pll_state *pll_state);
-:1421: WARNING:LONG_LINE: line length of 102 exceeds 100 columns #1421: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:3502:
+ crtc_state->port_clock = intel_c10pll_calc_port_clock(encoder, &crtc_state->cx0pll_state.c10);
-:1503: WARNING:LONG_LINE: line length of 110 exceeds 100 columns #1503: FILE: drivers/gpu/drm/i915/display/intel_dpll.c:998:
+ crtc_state->port_clock = intel_c10pll_calc_port_clock(encoder, &crtc_state->cx0pll_state.c10);
-:1611: CHECK:MACRO_ARG_REUSE: Macro argument reuse '__n' - possible side-effects? #1611: FILE: drivers/gpu/drm/i915/i915_reg_defs.h:33:
+#define REG_BIT8(__n) \
+ ((u8)(BIT(__n) + \
+ BUILD_BUG_ON_ZERO(__is_constexpr(__n) && \
+ ((__n) < 0 || (__n) > 7))))
-:1632: CHECK:MACRO_ARG_REUSE: Macro argument reuse '__high' - possible side-effects? #1632: FILE: drivers/gpu/drm/i915/i915_reg_defs.h:77:
+#define REG_GENMASK8(__high, __low) \
+ ((u8)(GENMASK(__high, __low) + \
+ BUILD_BUG_ON_ZERO(__is_constexpr(__high) && \
+ __is_constexpr(__low) && \
+ ((__low) < 0 || (__high) > 7 || (__low) > (__high)))))
-:1632: CHECK:MACRO_ARG_REUSE: Macro argument reuse '__low' - possible side-effects? #1632: FILE: drivers/gpu/drm/i915/i915_reg_defs.h:77:
+#define REG_GENMASK8(__high, __low) \
+ ((u8)(GENMASK(__high, __low) + \
+ BUILD_BUG_ON_ZERO(__is_constexpr(__high) && \
+ __is_constexpr(__low) && \
+ ((__low) < 0 || (__high) > 7 || (__low) > (__high)))))
-:1655: CHECK:MACRO_ARG_REUSE: Macro argument reuse '__mask' - possible side-effects? #1655: FILE: drivers/gpu/drm/i915/i915_reg_defs.h:115:
+#define REG_FIELD_PREP8(__mask, __val) \
+ ((u8)((((typeof(__mask))(__val) << __bf_shf(__mask)) & (__mask)) + \
+ BUILD_BUG_ON_ZERO(!__is_constexpr(__mask)) + \ + BUILD_BUG_ON_ZERO((__mask) == 0 || (__mask) > U8_MAX) + \ + BUILD_BUG_ON_ZERO(!IS_POWER_OF_2((__mask) + (1ULL << __bf_shf(__mask)))) + \ + BUILD_BUG_ON_ZERO(__builtin_choose_expr(__is_constexpr(__val), (~((__mask) >> __bf_shf(__mask)) & (__val)), 0))))
-:1655: CHECK:MACRO_ARG_REUSE: Macro argument reuse '__val' - possible side-effects? #1655: FILE: drivers/gpu/drm/i915/i915_reg_defs.h:115:
+#define REG_FIELD_PREP8(__mask, __val) \
+ ((u8)((((typeof(__mask))(__val) << __bf_shf(__mask)) & (__mask)) + \
+ BUILD_BUG_ON_ZERO(!__is_constexpr(__mask)) + \ + BUILD_BUG_ON_ZERO((__mask) == 0 || (__mask) > U8_MAX) + \ + BUILD_BUG_ON_ZERO(!IS_POWER_OF_2((__mask) + (1ULL << __bf_shf(__mask)))) + \ + BUILD_BUG_ON_ZERO(__builtin_choose_expr(__is_constexpr(__val), (~((__mask) >> __bf_shf(__mask)) & (__val)), 0))))
-:1660: WARNING:LONG_LINE: line length of 128 exceeds 100 columns #1660: FILE: drivers/gpu/drm/i915/i915_reg_defs.h:120:
+ BUILD_BUG_ON_ZERO(__builtin_choose_expr(__is_constexpr(__val), (~((__mask) >> __bf_shf(__mask)) & (__val)), 0))))
total: 0 errors, 17 warnings, 7 checks, 1561 lines checked5736f1d0bee7 drm/i915/mtl: Add vswing programming for C10 phys
-:6: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #6:
C10 phys uses direct mapping internally for voltage and pre-emphasis levels.
total: 0 errors, 1 warnings, 0 checks, 217 lines checked e323843be2a2 drm/i915/mtl: MTL PICA hotplug detection 9e74b6f57a59 drm/i915/mtl/display: Implement DisplayPort sequences -:54: WARNING:LONG_LINE: line length of 111 exceeds 100 columns #54: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:66:
+#define XELPDP_PORT_BUF_PORT_DATA_10BIT REG_FIELD_PREP(XELPDP_PORT_BUF_PORT_DATA_WIDTH_MASK, 0)
-:55: WARNING:LONG_LINE: line length of 111 exceeds 100 columns #55: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:67:
+#define XELPDP_PORT_BUF_PORT_DATA_20BIT REG_FIELD_PREP(XELPDP_PORT_BUF_PORT_DATA_WIDTH_MASK, 1)
-:56: WARNING:LONG_LINE: line length of 111 exceeds 100 columns #56: FILE: drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h:68:
+#define XELPDP_PORT_BUF_PORT_DATA_40BIT REG_FIELD_PREP(XELPDP_PORT_BUF_PORT_DATA_WIDTH_MASK, 2)
-:112: WARNING:LONG_LINE: line length of 114 exceeds 100 columns #112: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:226:
+ ret = _wait_for(!(intel_de_read(dev_priv, XELPDP_PORT_BUF_CTL1(port)) & XELPDP_PORT_BUF_PHY_IDLE),
total: 0 errors, 4 warnings, 0 checks, 477 lines checked96837c53de30 drm/i915/mtl: Initial DDI port setupb8b1a8523b48 drm/i915/mtl: Add C10 phy programming for HDMI6aaaa4492c56 drm/i915/display/mtl: Fill port width in DDI_BUF_/TRANS_DDI_FUNC_/PORT_BUF_CTL for HDMI
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/mtl: Add Support for C10 phy (rev2)
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: drm/i915/mtl: Add Support for C10 phy (rev2)
URL : https://patchwork.freedesktop.org/series/116191/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/mtl: Add Support for C10 phy (rev2)
In reply to Radhakrishna Sripada== Series Details ==
== Series Details ==
Series: drm/i915/mtl: Add Support for C10 phy (rev2)
URL : https://patchwork.freedesktop.org/series/116191/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12997 -> Patchwork_116191v2
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_116191v2 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_116191v2, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/index.html
Participating hosts (37 -> 35)
------------------------------
Missing (2): fi-kbl-soraka fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_116191v2:
### IGT changes ###
#### Possible regressions ####
* igt@core_hotunplug@unbind-rebind:
- bat-atsm-1: [PASS][1] -> [SKIP][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@i915_selftest@live@slpc:
- bat-atsm-1: [PASS][3] -> [FAIL][4] +38 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@i915_selftest@[email protected]
Known issues
------------
Here are the changes found in Patchwork_116191v2 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_lmem_swapping@basic:
- bat-atsm-1: NOTRUN -> [SKIP][5] ([i915#5775]) +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@gem_sync@basic-each:
- bat-atsm-1: [PASS][6] -> [SKIP][7] ([i915#2575]) +38 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@gem_wait@busy:
- bat-atsm-1: NOTRUN -> [SKIP][8] ([i915#2575]) +11 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@i915_pm_rpm@basic-rte:
- bat-atsm-1: [PASS][9] -> [SKIP][10] ([i915#5174]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@i915_selftest@live@gt_pm:
- bat-adln-1: [PASS][11] -> [DMESG-FAIL][12] ([i915#4258])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-adln-1/igt@i915_selftest@live@gt_pm.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-adln-1/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@migrate:
- bat-adlp-6: [PASS][13] -> [DMESG-FAIL][14] ([i915#7699])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-adlp-6/igt@i915_selftest@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-adlp-6/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@requests:
- bat-rpls-2: [PASS][15] -> [ABORT][16] ([i915#4983] / [i915#7913])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-rpls-2/igt@i915_selftest@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-rpls-2/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@slpc:
- bat-rplp-1: [PASS][17] -> [DMESG-FAIL][18] ([i915#6367] / [i915#7913])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-rplp-1/igt@i915_selftest@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-rplp-1/igt@i915_selftest@[email protected]
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- fi-cfl-8700k: NOTRUN -> [SKIP][19] ([fdo#109271])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/fi-cfl-8700k/igt@[email protected]
- bat-rpls-1: NOTRUN -> [SKIP][20] ([i915#7828])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-rpls-1/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-c-dp-1:
- bat-dg2-8: [PASS][21] -> [FAIL][22] ([i915#7932]) +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
* igt@kms_pipe_crc_basic@read-crc:
- bat-adlp-9: NOTRUN -> [SKIP][23] ([i915#3546]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-adlp-9/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc:
- bat-rpls-1: NOTRUN -> [SKIP][24] ([i915#1845])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-rpls-1/igt@[email protected]
#### Possible fixes ####
* igt@fbdev@eof:
- bat-atsm-1: [SKIP][25] ([i915#2582]) -> [PASS][26] +4 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@gem_exec_suspend@basic-s3@smem:
- bat-rpls-1: [ABORT][27] ([i915#6687] / [i915#7978]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-rpls-1/igt@gem_exec_suspend@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-rpls-1/igt@gem_exec_suspend@[email protected]
* igt@i915_pm_rps@basic-api:
- bat-dg2-11: [FAIL][29] ([i915#8308]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-dg2-11/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-dg2-11/igt@[email protected]
* igt@i915_suspend@basic-s2idle-without-i915:
- fi-cfl-8700k: [ABORT][31] ([i915#8299]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/fi-cfl-8700k/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/fi-cfl-8700k/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1:
- bat-dg2-8: [FAIL][33] ([i915#7932]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
#### Warnings ####
* igt@gem_mmap@basic:
- bat-atsm-1: [SKIP][35] ([i915#4083]) -> [SKIP][36] ([i915#2575])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@gem_tiled_fence_blits@basic:
- bat-atsm-1: [SKIP][37] ([i915#4077]) -> [SKIP][38] ([i915#2575]) +2 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@gem_tiled_pread_basic:
- bat-atsm-1: [SKIP][39] ([i915#4079]) -> [SKIP][40] ([i915#2575]) +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@gem_tiled_pread_basic.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@gem_tiled_pread_basic.html
* igt@i915_selftest@live@slpc:
- bat-rpls-1: [DMESG-FAIL][41] ([i915#6997]) -> [DMESG-FAIL][42] ([i915#6367] / [i915#7996])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-rpls-1/igt@i915_selftest@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-rpls-1/igt@i915_selftest@[email protected]
* igt@kms_addfb_basic@size-max:
- bat-atsm-1: [SKIP][43] ([i915#6077]) -> [SKIP][44] ([i915#2575]) +36 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- bat-atsm-1: [SKIP][45] ([i915#6078]) -> [SKIP][46] ([i915#2575]) +19 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@kms_flip@basic-plain-flip:
- bat-atsm-1: [SKIP][47] ([i915#6166]) -> [SKIP][48] ([i915#2575]) +3 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@kms_force_connector_basic@prune-stale-modes:
- bat-atsm-1: [SKIP][49] ([i915#6093]) -> [SKIP][50] ([i915#2575]) +3 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@kms_pipe_crc_basic@hang-read-crc:
- bat-atsm-1: [SKIP][51] ([i915#1836]) -> [SKIP][52] ([i915#2575]) +6 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@kms_prop_blob@basic:
- bat-atsm-1: [SKIP][53] ([i915#7357]) -> [SKIP][54] ([i915#2575])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@kms_psr@sprite_plane_onoff:
- bat-atsm-1: [SKIP][55] ([i915#1072]) -> [SKIP][56] ([i915#2575]) +3 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@kms_psr@sprite_plane_onoff.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-atsm-1: [SKIP][57] ([i915#6094]) -> [SKIP][58] ([i915#2575])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- bat-atsm-1: [SKIP][59] ([fdo#109295] / [i915#6078]) -> [SKIP][60] ([i915#2575])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@prime_vgem@basic-fence-mmap:
- bat-atsm-1: [SKIP][61] ([fdo#109295] / [i915#4077]) -> [SKIP][62] ([i915#2575]) +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
* igt@prime_vgem@basic-write:
- bat-atsm-1: [SKIP][63] ([fdo#109295]) -> [SKIP][64] ([i915#2575]) +3 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12997/bat-atsm-1/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/bat-atsm-1/igt@[email protected]
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1836]: https://gitlab.freedesktop.org/drm/intel/issues/1836
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5174]: https://gitlab.freedesktop.org/drm/intel/issues/5174
[i915#5775]: https://gitlab.freedesktop.org/drm/intel/issues/5775
[i915#6077]: https://gitlab.freedesktop.org/drm/intel/issues/6077
[i915#6078]: https://gitlab.freedesktop.org/drm/intel/issues/6078
[i915#6093]: https://gitlab.freedesktop.org/drm/intel/issues/6093
[i915#6094]: https://gitlab.freedesktop.org/drm/intel/issues/6094
[i915#6166]: https://gitlab.freedesktop.org/drm/intel/issues/6166
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#6997]: https://gitlab.freedesktop.org/drm/intel/issues/6997
[i915#7357]: https://gitlab.freedesktop.org/drm/intel/issues/7357
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
[i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
[i915#7996]: https://gitlab.freedesktop.org/drm/intel/issues/7996
[i915#8299]: https://gitlab.freedesktop.org/drm/intel/issues/8299
[i915#8308]: https://gitlab.freedesktop.org/drm/intel/issues/8308
Build changes
-------------
* Linux: CI_DRM_12997 -> Patchwork_116191v2
CI-20190529: 20190529
CI_DRM_12997: afe31b57e95ebf86f5814fd01a030c2f9551acb4 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7253: 1a619e8dbc6ca887f2ae24b2d7f1ac536342f58c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_116191v2: afe31b57e95ebf86f5814fd01a030c2f9551acb4 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
95a0e22cbe55 drm/i915/display/mtl: Fill port width in DDI_BUF_/TRANS_DDI_FUNC_/PORT_BUF_CTL for HDMI f7550d1a1f6e drm/i915/mtl: Add C10 phy programming for HDMI2b1cd730aff4 drm/i915/mtl: Initial DDI port setup1df57933b918 drm/i915/mtl/display: Implement DisplayPort sequences9a6d56dc657c drm/i915/mtl: MTL PICA hotplug detectiondae9140a6dbc drm/i915/mtl: Add vswing programming for C10 physd21034b8cc71 drm/i915/mtl: Add Support for C10 PHY message bus and pll programming 4bf7565f3d29 drm/i915/mtl: Create separate reg file for PICA registersbf63f4c4c21c drm/i915/mtl: Add DP rates
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_116191v2/index.html