intel_cx0pll_enable() silently continues when the PHY fails to come
out of SOC reset or the PLL fails to lock. When the CX0 PHY MSGBUS
is unresponsive, this causes all subsequent PLL register writes to be
silently dropped and the PLL lock request to time out, leaving the
display hardware in a broken state.
Return -ETIMEDOUT from intel_cx0_phy_lane_reset() when the PHY fails
to come out of SOC reset. Return -ETIMEDOUT from intel_cx0pll_enable()
when the PLL fails to lock. Propagate these errors through
intel_mtl_pll_enable() and mtl_pll_enable() to the shared DPLL
framework, which (as of the previous patch) will abort the CRTC
enable sequence rather than driving a pipe with a non-functional PLL.
Fixes: 51390cc0e00a ("drm/i915/mtl: Add Support for C10 PHY message bus and pll
programming")
Cc: [email protected]
Signed-off-by: Aaron Esau <[email protected]>
---
drivers/gpu/drm/i915/display/intel_cx0_phy.c | 47 ++++++++++++-------
drivers/gpu/drm/i915/display/intel_cx0_phy.h | 6 +--
drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 4 +-
3 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c
b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
index 4cacea802..f5c8444ef 100644
--- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c
+++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
@@ -3103,8 +3103,8 @@ static u32 intel_cx0_get_pclk_refclk_ack(u8 lane_mask)
return val;
}
-static void intel_cx0_phy_lane_reset(struct intel_encoder *encoder,
- bool lane_reversal)
+static int intel_cx0_phy_lane_reset(struct intel_encoder *encoder,
+ bool lane_reversal)
{
struct intel_display *display = to_intel_display(encoder);
enum port port = encoder->port;
@@ -3121,10 +3121,12 @@ static void intel_cx0_phy_lane_reset(struct
intel_encoder *encoder,
if (intel_de_wait_for_set_us(display, XELPDP_PORT_BUF_CTL1(display,
port),
XELPDP_PORT_BUF_SOC_PHY_READY,
- XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US))
- drm_warn(display->drm,
- "PHY %c failed to bring out of SOC reset\n",
- phy_name(phy));
+ XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US)) {
+ drm_err(display->drm,
+ "PHY %c failed to bring out of SOC reset\n",
+ phy_name(phy));
+ return -ETIMEDOUT;
+ }
intel_de_rmw(display, XELPDP_PORT_BUF_CTL2(display, port),
lane_pipe_reset,
lane_pipe_reset);
@@ -3160,6 +3162,8 @@ static void intel_cx0_phy_lane_reset(struct intel_encoder
*encoder,
drm_warn(display->drm,
"PHY %c failed to bring out of lane reset\n",
phy_name(phy));
+
+ return 0;
}
static void intel_cx0_program_phy_lane(struct intel_encoder *encoder, int
lane_count,
@@ -3220,17 +3224,18 @@ static u32 intel_cx0_get_pclk_pll_ack(u8 lane_mask)
return val;
}
-static void intel_cx0pll_enable(struct intel_encoder *encoder,
- const struct intel_cx0pll_state *pll_state)
+static int intel_cx0pll_enable(struct intel_encoder *encoder,
+ const struct intel_cx0pll_state *pll_state)
{
int port_clock = pll_state->use_c10 ? pll_state->c10.clock :
pll_state->c20.clock;
struct intel_display *display = to_intel_display(encoder);
enum phy phy = intel_encoder_to_phy(encoder);
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
+ struct ref_tracker *wakeref = intel_cx0_phy_transaction_begin(encoder);
bool lane_reversal = dig_port->lane_reversal;
u8 maxpclk_lane = lane_reversal ? INTEL_CX0_LANE1 :
INTEL_CX0_LANE0;
- struct ref_tracker *wakeref = intel_cx0_phy_transaction_begin(encoder);
+ int ret;
/*
* Lane reversal is never used in DP-alt mode, in that case the
@@ -3246,7 +3251,9 @@ static void intel_cx0pll_enable(struct intel_encoder
*encoder,
intel_program_port_clock_ctl(encoder, pll_state, port_clock,
lane_reversal);
/* 2. Bring PHY out of reset. */
- intel_cx0_phy_lane_reset(encoder, lane_reversal);
+ ret = intel_cx0_phy_lane_reset(encoder, lane_reversal);
+ if (ret)
+ goto out;
/*
* 3. Change Phy power state to Ready.
@@ -3296,9 +3303,12 @@ static void intel_cx0pll_enable(struct intel_encoder
*encoder,
if (intel_de_wait_us(display, XELPDP_PORT_CLOCK_CTL(display,
encoder->port),
intel_cx0_get_pclk_pll_ack(INTEL_CX0_BOTH_LANES),
intel_cx0_get_pclk_pll_ack(maxpclk_lane),
- XELPDP_PCLK_PLL_ENABLE_TIMEOUT_US, NULL))
- drm_warn(display->drm, "Port %c PLL not locked\n",
- phy_name(phy));
+ XELPDP_PCLK_PLL_ENABLE_TIMEOUT_US, NULL)) {
+ drm_err(display->drm, "Port %c PLL not locked\n",
+ phy_name(phy));
+ ret = -ETIMEDOUT;
+ goto out;
+ }
/*
* 11. Follow the Display Voltage Frequency Switching Sequence After
@@ -3320,7 +3330,10 @@ static void intel_cx0pll_enable(struct intel_encoder
*encoder,
XELPDP_P2_STATE_READY);
}
+out:
intel_cx0_phy_transaction_end(encoder, wakeref);
+
+ return ret;
}
void intel_mtl_tbt_pll_calc_state(struct intel_dpll_hw_state *hw_state)
@@ -3458,11 +3471,11 @@ void intel_mtl_tbt_pll_enable_clock(struct
intel_encoder *encoder, int port_cloc
port_clock);
}
-void intel_mtl_pll_enable(struct intel_encoder *encoder,
- struct intel_dpll *pll,
- const struct intel_dpll_hw_state *dpll_hw_state)
+int intel_mtl_pll_enable(struct intel_encoder *encoder,
+ struct intel_dpll *pll,
+ const struct intel_dpll_hw_state *dpll_hw_state)
{
- intel_cx0pll_enable(encoder, &dpll_hw_state->cx0pll);
+ return intel_cx0pll_enable(encoder, &dpll_hw_state->cx0pll);
}
void intel_mtl_pll_enable_clock(struct intel_encoder *encoder,
diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.h
b/drivers/gpu/drm/i915/display/intel_cx0_phy.h
index ae98ac23e..1d6cc32d7 100644
--- a/drivers/gpu/drm/i915/display/intel_cx0_phy.h
+++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.h
@@ -28,9 +28,9 @@ struct intel_hdmi;
void intel_clear_response_ready_flag(struct intel_encoder *encoder,
int lane);
bool intel_encoder_is_c10phy(struct intel_encoder *encoder);
-void intel_mtl_pll_enable(struct intel_encoder *encoder,
- struct intel_dpll *pll,
- const struct intel_dpll_hw_state *dpll_hw_state);
+int intel_mtl_pll_enable(struct intel_encoder *encoder,
+ struct intel_dpll *pll,
+ const struct intel_dpll_hw_state *dpll_hw_state);
void intel_mtl_pll_disable(struct intel_encoder *encoder);
enum icl_port_dpll_id
intel_mtl_port_pll_type(struct intel_encoder *encoder,
diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
index 78fd2e5f9..ce31deadc 100644
--- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c
@@ -4441,9 +4441,7 @@ static int mtl_pll_enable(struct intel_display *display,
if (drm_WARN_ON(display->drm, !encoder))
return -ENODEV;
- intel_mtl_pll_enable(encoder, pll, dpll_hw_state);
-
- return 0;
+ return intel_mtl_pll_enable(encoder, pll, dpll_hw_state);
}
static void mtl_pll_disable(struct intel_display *display,
--
2.54.0
