@@ -105,6 +105,8 @@ struct mtk_dp {
bool enabled;
struct drm_connector *conn;
+ bool need_debounce;
+ struct timer_list debounce_timer;
};
static struct regmap_config mtk_dp_regmap_config = {
@@ -1551,7 +1553,11 @@ static irqreturn_t mtk_dp_hpd_event_thread(int hpd, void *dev)
if (event < 0)
return IRQ_HANDLED;
+ if (mtk_dp->need_debounce && mtk_dp->train_info.cable_plugged_in)
+ msleep(100);
+
dev_dbg(mtk_dp->dev, "drm_helper_hpd_irq_event\n");
+
drm_helper_hpd_irq_event(mtk_dp->bridge.dev);
if (mtk_dp->train_info.cable_state_change) {
@@ -1614,6 +1620,12 @@ static irqreturn_t mtk_dp_hpd_isr_handler(struct mtk_dp *mtk_dp)
train_info->cable_state_change = true;
+ if (!train_info->cable_plugged_in) {
+ mod_timer(&mtk_dp->debounce_timer,
+ jiffies + msecs_to_jiffies(100) - 1);
+ mtk_dp->need_debounce = false;
+ }
+
return IRQ_WAKE_THREAD;
}
@@ -2058,6 +2070,13 @@ static const struct drm_bridge_funcs mtk_dp_bridge_funcs = {
.detect = mtk_dp_bdg_detect,
};
+static void mtk_dp_debounce_timer(struct timer_list *t)
+{
+ struct mtk_dp *mtk_dp = from_timer(mtk_dp, t, debounce_timer);
+
+ mtk_dp->need_debounce = true;
+}
+
static int mtk_dp_probe(struct platform_device *pdev)
{
struct mtk_dp *mtk_dp;
@@ -2135,6 +2154,9 @@ static int mtk_dp_probe(struct platform_device *pdev)
drm_bridge_add(&mtk_dp->bridge);
+ mtk_dp->need_debounce = true;
+ timer_setup(&mtk_dp->debounce_timer, mtk_dp_debounce_timer, 0);
+
pm_runtime_enable(dev);
pm_runtime_get_sync(dev);
@@ -2147,6 +2169,7 @@ static int mtk_dp_remove(struct platform_device *pdev)
platform_device_unregister(mtk_dp->phy_dev);
mtk_dp_video_mute(mtk_dp, true);
+ del_timer_sync(&mtk_dp->debounce_timer);
pm_runtime_disable(&pdev->dev);