From nobody Mon Oct 6 19:09:14 2025 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF0F015A85A for ; Fri, 18 Jul 2025 07:01:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752822088; cv=none; b=Zs/haDeoAOnXxf0LkOBohTyudrIkvIR8kdYfSgI3rV6j7D0Su/ID4ex6FVtZI68ddpNZxKZoqOU/kO2joiWLjVrFODzYpUNyeVjnaW0O4wFxJtPHy2LAi+VS4zKlj/hTPDXT/U0luZnVDUT6TVKddRnCRsRFBIbVfZtnWucIeZs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752822088; c=relaxed/simple; bh=mQ/ZV1ANsqBuY30rjzb8odzJtP/sBL+uOlneYNgciEU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pEWhJCOo6UEdeYR01PmiSC6B0/g/9CYU13PZl5HqqTtXIfwfl8TAnBsHFP4l3/3OpdP14CjZ6ax2I27vqfpgGvxd8Z3/JOw/ISPA69Kp6ppJKd42IlXr1xFfBTaD/BkTPRhQmcHtsj/e6+3kCM1GJL9s7Gpsww2zbQ8JwZjBUnU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4bk0vR62dnz14Lq4; Fri, 18 Jul 2025 14:56:35 +0800 (CST) Received: from dggemv705-chm.china.huawei.com (unknown [10.3.19.32]) by mail.maildlp.com (Postfix) with ESMTPS id 7A3971402ED; Fri, 18 Jul 2025 15:01:23 +0800 (CST) Received: from kwepemq100007.china.huawei.com (7.202.195.175) by dggemv705-chm.china.huawei.com (10.3.19.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 18 Jul 2025 15:01:23 +0800 Received: from localhost.huawei.com (10.169.71.169) by kwepemq100007.china.huawei.com (7.202.195.175) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 18 Jul 2025 15:01:22 +0800 From: Yongbang Shi To: , , , , , , , , CC: , , , , , , , , , Subject: [PATCH v3 drm-dp 02/11] drm/hisilicon/hibmc: fix dp probabilistical detect errors after HPD irq Date: Fri, 18 Jul 2025 14:51:16 +0800 Message-ID: <20250718065125.2892404-3-shiyongbang@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20250718065125.2892404-1-shiyongbang@huawei.com> References: <20250718065125.2892404-1-shiyongbang@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems500001.china.huawei.com (7.221.188.70) To kwepemq100007.china.huawei.com (7.202.195.175) Content-Type: text/plain; charset="utf-8" From: Baihan Li The debouncing when HPD pulled out still remains sometimes, 200ms still can not ensure helper_detect() is correct. Add hibmc_dp_detect_link() in detect_ctx(), which is to try dp link training. Fixes: 3c7623fb5bb6 ("drm/hisilicon/hibmc: Enable this hot plug detect of i= rq feature") Signed-off-by: Baihan Li Signed-off-by: Yongbang Shi --- drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 27 +++++++++++++++---- drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 2 ++ .../gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 10 ++++--- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c b/drivers/gpu/drm/h= isilicon/hibmc/dp/dp_hw.c index 8f0daec7d174..2d2fb6e759c3 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c @@ -3,6 +3,7 @@ =20 #include #include +#include #include "dp_config.h" #include "dp_comm.h" #include "dp_reg.h" @@ -162,6 +163,8 @@ int hibmc_dp_hw_init(struct hibmc_dp *dp) =20 mutex_init(&dp_dev->lock); =20 + drmm_mutex_init(drm_dev, &dp->link_train_mutex); + dp->dp_dev =3D dp_dev; =20 dp_dev->dev =3D drm_dev; @@ -238,19 +241,33 @@ void hibmc_dp_display_en(struct hibmc_dp *dp, bool en= able) msleep(50); } =20 -int hibmc_dp_mode_set(struct hibmc_dp *dp, struct drm_display_mode *mode) +int hibmc_dp_detect_link(struct hibmc_dp *dp) { struct hibmc_dp_dev *dp_dev =3D dp->dp_dev; - int ret; + int ret =3D 0; + + mutex_lock(&dp->link_train_mutex); =20 if (!dp_dev->link.status.channel_equalized) { ret =3D hibmc_dp_link_training(dp_dev); - if (ret) { + if (ret) drm_err(dp->drm_dev, "dp link training failed, ret: %d\n", ret); - return ret; - } } =20 + mutex_unlock(&dp->link_train_mutex); + + return ret; +} + +int hibmc_dp_mode_set(struct hibmc_dp *dp, struct drm_display_mode *mode) +{ + struct hibmc_dp_dev *dp_dev =3D dp->dp_dev; + int ret; + + ret =3D hibmc_dp_detect_link(dp); + if (ret) + return ret; + hibmc_dp_display_en(dp, false); hibmc_dp_link_cfg(dp_dev, mode); =20 diff --git a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h b/drivers/gpu/drm/h= isilicon/hibmc/dp/dp_hw.h index 665f5b166dfb..9b45e88e47e4 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h +++ b/drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h @@ -50,9 +50,11 @@ struct hibmc_dp { struct drm_dp_aux aux; struct hibmc_dp_cbar_cfg cfg; u32 irq_status; + struct mutex link_train_mutex; /* link training mutex */ }; =20 int hibmc_dp_hw_init(struct hibmc_dp *dp); +int hibmc_dp_detect_link(struct hibmc_dp *dp); int hibmc_dp_mode_set(struct hibmc_dp *dp, struct drm_display_mode *mode); void hibmc_dp_display_en(struct hibmc_dp *dp, bool enable); void hibmc_dp_set_cbar(struct hibmc_dp *dp, const struct hibmc_dp_cbar_cfg= *cfg); diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c b/drivers/gpu/d= rm/hisilicon/hibmc/hibmc_drm_dp.c index d06832e62e96..354e18bb2998 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c @@ -34,9 +34,12 @@ static int hibmc_dp_connector_get_modes(struct drm_conne= ctor *connector) static int hibmc_dp_detect(struct drm_connector *connector, struct drm_modeset_acquire_ctx *ctx, bool force) { - mdelay(200); + struct hibmc_drm_private *priv =3D to_hibmc_drm_private(connector->dev); =20 - return drm_connector_helper_detect_from_ddc(connector, ctx, force); + if (!hibmc_dp_detect_link(&priv->dp)) + return connector_status_connected; + + return connector_status_disconnected; } =20 static const struct drm_connector_helper_funcs hibmc_dp_conn_helper_funcs = =3D { @@ -128,8 +131,7 @@ irqreturn_t hibmc_dp_hpd_isr(int irq, void *arg) hibmc_dp_reset_link(&priv->dp); } =20 - if (dev->registered) - drm_connector_helper_hpd_irq_event(&priv->dp.connector); + drm_connector_helper_hpd_irq_event(&priv->dp.connector); =20 drm_dev_exit(idx); =20 --=20 2.33.0