Hotplug detection can be implemented either via HOTPLUG_CHG interrupt, or the combination of PLUG and HPD_LOST interrupts.
For Rockchip platforms, configure HPD deglitch to 2ms and rely on HOTPLUG_CHG interrupt for hotplug events, which is verified as the optimal solution through engineering tests. Other platforms continue using PLUG + HPD_LOST pair. Adjust analogix_dp_config_interrupt() to apply platform-specific interrupt masking and deglitch settings. Update threaded irq handler to check corresponding interrupt flags according to 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(). --- .../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 603abd940a7c..d207cc864bdc 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -717,13 +717,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 42463e18f392..fa8e2f104d6c 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -149,8 +149,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); @@ -177,7 +182,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); + /* + * 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); } void analogix_dp_mute_hpd_interrupt(struct analogix_dp_device *dp, u32 irq_type) -- 2.34.1
