drm/i915/cx0: Get rid of XELPDP_MSGBUS_TIMEOUT_FAST_US

XELPDP_MSGBUS_TIMEOUT_FAST_US looks to be just an obfuscated version
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.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20251106152049.21115-6-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
index e8a96a60fdd651daa3bf2ba29726e3c24df10f65..ddcfdf45bd38cb69395fe6fd05deda0b342a4b8d 100644 (file)
--- 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 62db0fd99f4a525af280832a01fd68a4db2d9c13..f031de40f6c6c2947ae129a99bbf8cccc6633ee7 100644 (file)
--- 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