From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 64FCB325483 for ; Thu, 28 May 2026 07:10:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779952256; cv=none; b=Ztu3L10u6+Qmej+X8njU8P/Z8J93+hB479EBBGQyA04TEoIym5rG7NGWUxcEN1/g21pidghXmJ63CBNz80FrfImn8g/bu57z3ibKQblbKJmdUS+tN7bFCqsG0ll9ioghuNly4tPOfMheymZoDdMzjUliJRN4x6zyFwxjnsY9OGo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779952256; c=relaxed/simple; bh=phX0hoWrp4DgbArchKl0E80WtBWi5e+YAzu85nwWVGM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WP0PfG1BCOfb832ii0cQCj9XwwZtJ+WOT266yE8PqCgOHiwLG2yB4FrHnfOvO3gp7iiekcaWRJ88KjRpZcvsvyt2rEP9C76l5E5XeXemJJpph5+dYjfZTe9qt85rq3MJYyQwOQ+6pHsp6GOSCM7R0WEuOSKcXKjTWh5FShKyxqs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=MBQpi9Xj; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Vbak8uph; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="MBQpi9Xj"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Vbak8uph" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64S7AaRI1975743 for ; Thu, 28 May 2026 07:10:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= z4WR6er5Of2+cYSqZtXfmLTmM3uBh8TuLkr2F/P1cso=; b=MBQpi9XjJL5i/Sh7 DlRy4uBomLJLCvH38w9I3bOuYEI8S+R4WpMIB42ynTP1a5O6BSfZlkhJZcJSv8Ev 71spqNLw8Iuj5Uk6D5quNFE1vbwP51vKStWFRXudDAfWBi3NdteXZzB23n9u3cUp nT4cPnN0WyAos4j9TPk3kbL70EzA9rlfUCyLZL0q9HY//Oj1m6sbWWqhBuvTI1e5 jczzRJzmieSfTEBQAXZTQtbLibE8+v2R8RDN4qw+TvgbLIukXsh8o6edBLSEw/i6 7L9e+wDjMC1yFeVViD9XOGjl+Cj8QhfclBJyM8UGpy9W0Ox2ax0TcbFqT90OBMFk OlNAjA== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ee7y3sqjx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 28 May 2026 07:10:54 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-516d4a9e852so111204531cf.0 for ; Thu, 28 May 2026 00:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779952254; x=1780557054; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=z4WR6er5Of2+cYSqZtXfmLTmM3uBh8TuLkr2F/P1cso=; b=Vbak8uphKmkdYuo1X3zuOeK6WfxZe2SNwseje94KfzfgsK8asouuSMiGoOql9yBVEv ecnpP01VOnbKgZ13YzgKF1fhgh6wWTB0PwT4hVDRf0bI3ZjZstIpoEyyhdvFOk8bpcXO s/MO9mAkDGuHcqz79657CzfWVPW0ayHZhTfvIt3f+iAV8Hc+Z+J/6ozaWBqkGrYWboqo 9uKE5KrvMw35DOgkmY2KA9Ifr4/r6Bl6+lJq5RLMDgTAg9WSbORJOCIF/iLhgnxkAd1x 0hQ2WAi8X4PrMa478uZt3fLuttHEvhysU12ku6xNZFPLykR//yk832o6jZ7WY/bujQ6Y ynKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779952254; x=1780557054; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=z4WR6er5Of2+cYSqZtXfmLTmM3uBh8TuLkr2F/P1cso=; b=fxpWczj5Krrhc6KxdtBrLfxayNgepvMZBZODXIPpyfPkXFLxbVdtoSBW2oVFq39/p9 KYmUbq4uK9zWmWQtzxLSonZggeEC3HLtTeYlw8ubxLv7lRDX0Mkp7CqinPshpu4wNWTE 7aAkQ3CGyzk/EhBdiLqsQoxN/wnuSyKtpzsEWB5qPRU83kw2zztgvArd2va0ZlcJqXIV 6+rEhF+qOPD1tlzCwIwVvaJst8gcgXo5FA3pbFPkkiJjf67E2fNw+MBEZPGofQyE8ts9 QnTxCCCSCB8Pd/emeGbt3qQGCla63nNWDegtpcgusPxi0PQ7WNpL+FMpUfBFOKwOZwEl u0Zg== X-Forwarded-Encrypted: i=1; AFNElJ/FESAbaWztxXy4ViryWQ0bacOoms9CTfXOF7aqGOSpHDQQAXH2mNVSGxuIiL1eiv6E5F48ophiuMvei/M=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2/AGv4RUrM3IMeGHRzVyMscudxKET7RQ2p1J42Pjln1gN5KLm 8NIz14eCbdMhjhTW7/Lv4HZSHe81wPGLfz3ZPIV8R6r4DcxQm+hqfn14hwyFIKG1b7KgmMZ0Soy AmttLjEzLgJG1DZffL6T5/g3cw3SaKCUO0QyEi/qpzxiAKxm5bVmGXd/M4k98i4shVrQ= X-Gm-Gg: Acq92OHn0RnLfxgLJWtapUIXne9P2hVFaus/U8CSYq+jSxDjnKm7TvMyFFEMA2y9V8F pAN05DjE4Bt/JYIG4CXYQe9f7p7Sl6PPI3vWtxLmjBcItE5GqMuDOKGVsgkqTrJszufUK0V7+j3 04n2spuIYshanJeY4mwQJRaOszNI+77tfoYJuMKLvAooL9Tu9FoFy1YAF/mnUh/XIfVNgl39cyg DDSXjGNuL30r1bfZxIx43wHqwYL41X/+I9LNqvMrsMfIzy6pkSnO6ymiJXZXPE8ynI9kHQkMWhA eE8Jnv8aLTXZEZV5PAJNeJFwVimJ9vWkcLb6ngtsATEmhbtMzqaJDGS0M7+wuyJPZuqUX1Ysddx 7On2WRA2JBXKWlu3wVdfKdITrx5lscTsc9fstoWokxOEyvXDEQSONs8fllInh0cPkxV8pXhWXHe pTEg7eDYC+fgMMvY35Nlr8FJhzG0jJn0uISWCsRUN3dGBe1A== X-Received: by 2002:a05:622a:4887:b0:516:e033:f5ae with SMTP id d75a77b69052e-516e033f8cemr321262521cf.44.1779952253581; Thu, 28 May 2026 00:10:53 -0700 (PDT) X-Received: by 2002:a05:622a:4887:b0:516:e033:f5ae with SMTP id d75a77b69052e-516e033f8cemr321262171cf.44.1779952253158; Thu, 28 May 2026 00:10:53 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-395dcc0a54fsm37416161fa.20.2026.05.28.00.10.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2026 00:10:52 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 28 May 2026 10:10:48 +0300 Subject: [PATCH v3 1/3] drm/bridge: split hpd_mutex into two mutexes Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260528-dp-connector-hpd-v3-1-d656eb1079b7@oss.qualcomm.com> References: <20260528-dp-connector-hpd-v3-0-d656eb1079b7@oss.qualcomm.com> In-Reply-To: <20260528-dp-connector-hpd-v3-0-d656eb1079b7@oss.qualcomm.com> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Tomi Valkeinen , Boris Brezillon , Sam Ravnborg , Sebastian Reichel , Yongxing Mou , Jonas Karlman Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3574; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=phX0hoWrp4DgbArchKl0E80WtBWi5e+YAzu85nwWVGM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqF+p5IJ+rnEcMiFWwgBOxHfygnrnynCeaYG3Mr zSc4VYPIB6JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCahfqeQAKCRCLPIo+Aiko 1cM5B/4kBpZwfdyjUejj1x1kNZzAO6PqH6cI4EpA/WLFkKgdvJipSUyL+6eLSW51xBKjFndorDX O4b0moLZ2v4VgzEMUppDl4UUsoqhE8+XoIMJ71CPiEBz2rSfug2Mj5ljJv72CoPh9pYgb8P5Vdl 3Xz7G6t8ACnzfSkBj1tpeqc75xZ3ESISh72Pks+XmEH0+FQthTSgGKAhs8OELrJMGjhn+Cup1q8 nEpKOH9n6PL+uqUWHYN5pYmqWF3gYN1XvpaH3ol65wojWIBuuAlJLwVOkNqmWNIi3T/WlHcLZ3C 4+O9dd0lmzq/97lYHye6RfAUDOH1azKM/D+YC/PQFqyFmxR2 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: G3Wsv7DMeiDREaykOn_tMxZFIQ0x6brN X-Authority-Analysis: v=2.4 cv=JMYLdcKb c=1 sm=1 tr=0 ts=6a17ea7e cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=VwQbUJbxAAAA:8 a=c92rfblmAAAA:8 a=EUspDBNiAAAA:8 a=TrWYt3Gvp2KaBVO9iIIA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=GvGzcOZaWPEFPQC_NcjD:22 X-Proofpoint-GUID: G3Wsv7DMeiDREaykOn_tMxZFIQ0x6brN X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI4MDA2OSBTYWx0ZWRfX7ReJ1h8BpGEA q9RA7HLEGUVwdo60HRvTnHVU5UKAN2Sz/W57eDwHdnj1XKLwEA0YzJrjH9rWvJjRsOJv/oDb7CQ ssCRYTNDeaJ16T/187VMvW4RQ2zPIG5SeJjh0YRCLJQn/ulM4z61A7KPXfcOlGN1iT9W4zUARlw ncNbG6tF8A1o8znHn/HFHKlGdMDBavHRPKlY2bHkBf3YsEy7m4IbLdzpj2E0yr6DhAFQr9SUdyI 3oxEBwhuJAdzoTr2HusgBnBrLiLbBhOTJ9+l7yVaNFXlPrHp0BDHTLgof83B/bP8n4/XCMW3tAQ xhTVqOaYqSngQEOb7f0ZI6RbtaG8J4GiXW2p3jQ+WSTyOYRqIeaILAI2y/PxqkekbouyfFWL4/v o5BIw7Rv9xrRfFAFMT66xBUV6tHjVRx7Ajd74zGowMiICCclCYbq/AiHGNrBwz9wHyfPJigs8M7 i2Uc/Db43zACKZThTYw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-28_02,2026-05-26_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 adultscore=0 phishscore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2605280069 Currently almost all bridge drivers which implement hpd_enable / hpd_disable callbacks simply toggle the hardware registers generating the interrupt. However, as pointed out by Jonas Karlman and Sashiko bot, using those callbacks for enable_irq() / disable_irq() calls or scheduling and cancelling the work can cause a AB-BA deadlock (between hpd_mutex lock and the corresponding lock). Split the hpd_mutex into two locks: one simply making sure that hpd_cb / hpd_data are consistent and another one, hpd_state_mutex, making sure that concurrent drm_bridge_hpd_enable() / drm_bridge_hpd_disable() calls can't end up with inconsistency between hpd_cb/_data and bridge's internal state. Link: https://lore.kernel.org/dri-devel/9aa4bd35-bff6-4009-a959-ce31010c7b35@kwiboo.se Link: https://sashiko.dev/#/patchset/20260513-dp-connector-hpd-v2-0-42f757bfcbf9%40oss.qualcomm.com Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/drm_bridge.c | 16 +++++++++++++--- include/drm/drm_bridge.h | 4 ++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index 687b36eea0c7..9a185032a3bd 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -417,6 +417,7 @@ void drm_bridge_add(struct drm_bridge *bridge) if (!list_empty(&bridge->list)) list_del_init(&bridge->list); + mutex_init(&bridge->hpd_state_mutex); mutex_init(&bridge->hpd_mutex); if (bridge->ops & DRM_BRIDGE_OP_HDMI) @@ -469,6 +470,7 @@ void drm_bridge_remove(struct drm_bridge *bridge) mutex_unlock(&bridge_lock); mutex_destroy(&bridge->hpd_mutex); + mutex_destroy(&bridge->hpd_state_mutex); drm_bridge_put(bridge); } @@ -1451,19 +1453,25 @@ void drm_bridge_hpd_enable(struct drm_bridge *bridge, if (!(bridge->ops & DRM_BRIDGE_OP_HPD)) return; + mutex_lock(&bridge->hpd_state_mutex); + mutex_lock(&bridge->hpd_mutex); - if (WARN(bridge->hpd_cb, "Hot plug detection already enabled\n")) + if (WARN(bridge->hpd_cb, "Hot plug detection already enabled\n")) { + mutex_unlock(&bridge->hpd_mutex); goto unlock; + } bridge->hpd_cb = cb; bridge->hpd_data = data; + mutex_unlock(&bridge->hpd_mutex); + if (bridge->funcs->hpd_enable) bridge->funcs->hpd_enable(bridge); unlock: - mutex_unlock(&bridge->hpd_mutex); + mutex_unlock(&bridge->hpd_state_mutex); } EXPORT_SYMBOL_GPL(drm_bridge_hpd_enable); @@ -1484,13 +1492,15 @@ void drm_bridge_hpd_disable(struct drm_bridge *bridge) if (!(bridge->ops & DRM_BRIDGE_OP_HPD)) return; - mutex_lock(&bridge->hpd_mutex); + mutex_lock(&bridge->hpd_state_mutex); if (bridge->funcs->hpd_disable) bridge->funcs->hpd_disable(bridge); + mutex_lock(&bridge->hpd_mutex); bridge->hpd_cb = NULL; bridge->hpd_data = NULL; mutex_unlock(&bridge->hpd_mutex); + mutex_unlock(&bridge->hpd_state_mutex); } EXPORT_SYMBOL_GPL(drm_bridge_hpd_disable); diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 4ba3a5deef9a..00a95f927e34 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -1256,6 +1256,10 @@ struct drm_bridge { * @hpd_mutex: Protects the @hpd_cb and @hpd_data fields. */ struct mutex hpd_mutex; + /** + * @hpd_state_mutex: Protects the HPD en/disablement state for the bridge. + */ + struct mutex hpd_state_mutex; /** * @hpd_cb: Hot plug detection callback, registered with * drm_bridge_hpd_enable(). -- 2.47.3