The Analogix DP controller provides two sets of interrupt sources for hotplug detection: HOTPLUG_CHG for any HPD level change, and the PLUG/HPD_LOST pair for connect/disconnect transitions respectively.
On Rockchip platforms, configure the HPD deglitch filter and use HOTPLUG_CHG interrupt for hotplug detection. Other platforms retain the original PLUG + HPD_LOST scheme with unchanged deglitch values. Move the HPD deglitch configuration into analogix_dp_reset() so that platform-specific values are set alongside the existing register defaults in a single location. Update the threaded IRQ handler to check the corresponding interrupt flag based on platform type. Signed-off-by: Damon Ding <[email protected]> --- Changes in v2: - Move ANALOGIX_DP_HPD_DEGLITCH_L/ANALOGIX_DP_HPD_DEGLITCH_H configs to analogix_dp_reset(). Changes in v3: - Modify the commit msg. - Replace macro HPD_IRQ with HPD_IRQ_ALL. --- .../drm/bridge/analogix/analogix_dp_core.c | 9 ++++++-- .../gpu/drm/bridge/analogix/analogix_dp_reg.c | 22 ++++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index f88e3263ba0e..287fc16125ef 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -714,13 +714,18 @@ static irqreturn_t analogix_dp_irq_thread(int irq, void *arg) { struct analogix_dp_device *dp = arg; u32 irq_type; + bool hpd_detected; irq_type = analogix_dp_get_irq_type(dp); if (irq_type) analogix_dp_clear_hotplug_interrupts(dp, irq_type); - if (irq_type & DP_IRQ_TYPE_HP_CABLE_IN || - irq_type & DP_IRQ_TYPE_HP_CABLE_OUT) { + if (!dp->hpd_gpiod && analogix_dp_is_rockchip(dp->plat_data->dev_type)) + hpd_detected = irq_type & DP_IRQ_TYPE_HP_CHANGE; + else + hpd_detected = (irq_type & DP_IRQ_TYPE_HP_CABLE_IN) || + (irq_type & DP_IRQ_TYPE_HP_CABLE_OUT); + if (hpd_detected) { dev_dbg(dp->dev, "Detected cable status changed!\n"); if (dp->drm_dev) drm_helper_hpd_irq_event(dp->drm_dev); diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c index 0f1406e4a5d3..025da25463a8 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -160,8 +160,13 @@ void analogix_dp_reset(struct analogix_dp_device *dp) writel(0x0, dp->reg_base + ANALOGIX_DP_PKT_SEND_CTL); writel(0x0, dp->reg_base + ANALOGIX_DP_HDCP_CTL); - writel(0x5e, dp->reg_base + ANALOGIX_DP_HPD_DEGLITCH_L); - writel(0x1a, dp->reg_base + ANALOGIX_DP_HPD_DEGLITCH_H); + if (analogix_dp_is_rockchip(dp->plat_data->dev_type)) { + writel(0x80, dp->reg_base + ANALOGIX_DP_HPD_DEGLITCH_L); + writel(0xbb, dp->reg_base + ANALOGIX_DP_HPD_DEGLITCH_H); + } else { + writel(0x5e, dp->reg_base + ANALOGIX_DP_HPD_DEGLITCH_L); + writel(0x1a, dp->reg_base + ANALOGIX_DP_HPD_DEGLITCH_H); + } writel(0x10, dp->reg_base + ANALOGIX_DP_LINK_DEBUG_CTL); @@ -188,7 +193,18 @@ void analogix_dp_config_interrupt(struct analogix_dp_device *dp) writel(0, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_2); writel(0, dp->reg_base + ANALOGIX_DP_COMMON_INT_MASK_3); - analogix_dp_unmute_hpd_interrupt(dp, HPD_IRQ_ALL); + /* + * Either HOTPLUG_CHG interrupt or PLUG + HPD_LOST interrupt + * pair can be used to implement hotplug detection. + * + * On Rockchip platforms, configuring HPD deglitch to 2ms and + * using HOTPLUG_CHG interrupt for hotplug detection is proven + * as a better solution via engineering verification. + */ + if (analogix_dp_is_rockchip(dp->plat_data->dev_type)) + analogix_dp_unmute_hpd_interrupt(dp, DP_IRQ_TYPE_HP_CHANGE); + else + analogix_dp_unmute_hpd_interrupt(dp, HPD_IRQ_ALL); } /* -- 2.34.1
