On Thu, 06 Nov 2025, Ville Syrjala <[email protected]> wrote: > From: Ville Syrjälä <[email protected]> > > Include the units the in the define name for XELPDP_PORT_RESET_END_TIMEOUT > to make it match all its other counterparts. > > Reviewed-by: Jani Nikula <[email protected]> > Signed-off-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_cx0_phy.c | 2 +- > drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > index dd1429fa5028..b51075143cf5 100644 > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > @@ -2926,7 +2926,7 @@ static void intel_cx0_phy_lane_reset(struct > intel_encoder *encoder, > > if (intel_de_wait_for_clear(display, XELPDP_PORT_BUF_CTL2(display, > port), > lane_phy_current_status, > - XELPDP_PORT_RESET_END_TIMEOUT)) > + XELPDP_PORT_RESET_END_TIMEOUT_US))
Oops, this one's actually _MS. > drm_warn(display->drm, > "PHY %c failed to bring out of lane reset\n", > phy_name(phy)); > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h > b/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h > index 715ca004516a..f0bfb0ac1816 100644 > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h > @@ -80,7 +80,7 @@ > #define XELPDP_PORT_BUF_SOC_READY_TIMEOUT_US 100 > #define XELPDP_PORT_RESET_START_TIMEOUT_US 5 > #define XELPDP_PORT_POWERDOWN_UPDATE_TIMEOUT_MS 2 > -#define XELPDP_PORT_RESET_END_TIMEOUT 15 > +#define XELPDP_PORT_RESET_END_TIMEOUT_US 15 > #define XELPDP_REFCLK_ENABLE_TIMEOUT_US 1 > > #define _XELPDP_PORT_BUF_CTL1_LN0_A 0x64004 -- Jani Nikula, Intel
