On Wed, 05 Nov 2025, Ville Syrjala <[email protected]> wrote: > From: Ville Syrjälä <[email protected]> > > XELPDP_MSGBUS_TIMEOUT_FAST_US looks to be just a obfuscated version
*an > of the default 2 microsecond fast timeout used by > intel_wait_for_register(). get rid of it to make it clear what's going > on here. *Get Moreover, I don't like timeouts being defined along with what are supposed to be register *content* descriptions. Reviewed-by: Jani Nikula <[email protected]> > > Signed-off-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_cx0_phy.c | 3 +-- > drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 1 - > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > index e7fe974129fe..6f57ad751c9e 100644 > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c > @@ -168,8 +168,7 @@ int intel_cx0_wait_for_ack(struct intel_encoder *encoder, > XELPDP_PORT_P2M_MSGBUS_STATUS(display, port, > lane), > XELPDP_PORT_P2M_RESPONSE_READY, > XELPDP_PORT_P2M_RESPONSE_READY, > - XELPDP_MSGBUS_TIMEOUT_FAST_US, > - XELPDP_MSGBUS_TIMEOUT_SLOW, val)) { > + 2, XELPDP_MSGBUS_TIMEOUT_SLOW, val)) { > drm_dbg_kms(display->drm, > "PHY %c Timeout waiting for message ACK. Status: > 0x%x\n", > phy_name(phy), *val); > 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 635b35669348..67c6f06ab9a2 100644 > --- a/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h > +++ b/drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h > @@ -75,7 +75,6 @@ > #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 -- Jani Nikula, Intel
