From nobody Tue Dec 16 07:25:27 2025 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) (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 4169123C8AF for ; Fri, 7 Feb 2025 16:26:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738945562; cv=none; b=ACMEpRyZuyYz8XRToL8ErudU9zb916cspHwnteFvHGEL74HqegV5QEoxTZ9gW0xfaIa5NSa6AXHbAbFK8NEUhNHa1DQjU3EkrTMcAiBjV1AW6c5ZvrazxXYrQr4cOFXQ8NLB4kOuBeT4RSdtUMh5AJnop7Mjp2LMSRh9BXM1W8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738945562; c=relaxed/simple; bh=lITkNCku0X7B4kDxLhLsKS7n7DFR/ohW5Eu7ptL8iIs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=t9MeqCYNqq424W6VFVFgecEWkhePP3X7BmZTshWO0yZF4mXbXkaO75NWDwvRQ6Fs9isJaTqGmNVV6CmbcX9ePESRN5Kf2u5WiB11ABO/+9LLN1N55s73WQmB+4LqTb9rdkP83wGGLmWd3LiXdAiw2vCVay24CTBvkKJhjtFQdr0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=IsbGU1an; arc=none smtp.client-ip=95.215.58.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="IsbGU1an" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1738945558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Sn0a84LV83FbtYgNJ4zSoh8nNRElw7Uji670f7zb7LM=; b=IsbGU1anshlM1CRTqZjHlSwaUX9IGhKzANB7px9fpOzmqY/osEQc8c2J4gKNuJQx8/vSx0 ZVgRfZU61uhr4PISnxgcqNmgq6++91s8N09mxoJmiXTcYDc4ElzeXwRqoUX3TKK9xP84YW Xpr+4G4PddsdlaV3phQQK+jvN0OE/C0= From: Sean Anderson To: Laurent Pinchart , Tomi Valkeinen , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR XILINX) Cc: Maarten Lankhorst , David Airlie , Simona Vetter , Michal Simek , Maxime Ripard , linux-kernel@vger.kernel.org (open list), Thomas Zimmermann , Bart Van Assche , Dan Carpenter , linux-arm-kernel@lists.infradead.org (moderated list:ARM/ZYNQ ARCHITECTURE), Sean Anderson Subject: [PATCH v2 1/2] drm: zynqmp_dp: Fix a deadlock in zynqmp_dp_ignore_hpd_set() Date: Fri, 7 Feb 2025 11:25:27 -0500 Message-Id: <20250207162528.1651426-2-sean.anderson@linux.dev> In-Reply-To: <20250207162528.1651426-1-sean.anderson@linux.dev> References: <20250207162528.1651426-1-sean.anderson@linux.dev> 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-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Bart Van Assche Instead of attempting the same mutex twice, lock and unlock it. This bug has been detected by the Clang thread-safety analyzer. Cc: Sean Anderson Cc: Tomi Valkeinen Fixes: 28edaacb821c ("drm: zynqmp_dp: Add debugfs interface for compliance = testing") Signed-off-by: Bart Van Assche Reviewed-by: Sean Anderson Signed-off-by: Sean Anderson Reviewed-by: Laurent Pinchart --- (no changes since v1) drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp= _dp.c index 979f6d3239ba..189a08cdc73c 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c @@ -2295,7 +2295,7 @@ static int zynqmp_dp_ignore_hpd_set(void *data, u64 v= al) =20 mutex_lock(&dp->lock); dp->ignore_hpd =3D val; - mutex_lock(&dp->lock); + mutex_unlock(&dp->lock); return 0; } =20 --=20 2.35.1.1320.gc452695387.dirty From nobody Tue Dec 16 07:25:27 2025 Received: from out-174.mta1.migadu.com (out-174.mta1.migadu.com [95.215.58.174]) (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 763D418B47E for ; Fri, 7 Feb 2025 16:26:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738945564; cv=none; b=BxZqdv1ucX8WfCFbfukgB1NVDa6GSIE1v0nX3onhpYeGE1OAyHfPJE2ra+j8DUXaDC9NBAeQv80gVNP17e4vjbXrQqai0DeyGGhl/+ww6lrIFFRiVAzy3i0pQ98nqOSCFMDu8pSlPneNH4DLq71ED2o3FckCD+uEqcPSmfluBtg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738945564; c=relaxed/simple; bh=NQjt0MzrF12nHV8ReYoFlt2rOITbjZoPTgZX2fmICdM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WC7YRMqLBfgpYcdT+oq1UgVYvNnotpZyaH/crJtONDl3UnZzopUSzDuECBxT6h/t8tPPs1UxoBef6m6c6FIkIIrwaF0XQcQNF9PTo4dXfcqf02UCpdk3mhHaubRxRQRmt3NIq8AFejwxrNF2GxJzchmzLkTd9ZB8/f5cD7WpyWY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=TdlVb8sr; arc=none smtp.client-ip=95.215.58.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="TdlVb8sr" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1738945560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gtrrAUnVhr2/npIcNNgeOcdn36r2FvvJ+8p041cLvbU=; b=TdlVb8srJ1IBtTLD8Mw013xldVQpZUb7Va0U4+UpH1tVlVo61rtubJenxx9zFX1boowCE2 9+oRBuywu9LzrJP0s+5jCNfEC++TPNfImThVOU9e2NNqFFe4o2H+M3GZoCDUQtvLM19hDI cmjEXE+BTG2tamEI4GiM4WvSPkw15GA= From: Sean Anderson To: Laurent Pinchart , Tomi Valkeinen , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR XILINX) Cc: Maarten Lankhorst , David Airlie , Simona Vetter , Michal Simek , Maxime Ripard , linux-kernel@vger.kernel.org (open list), Thomas Zimmermann , Bart Van Assche , Dan Carpenter , linux-arm-kernel@lists.infradead.org (moderated list:ARM/ZYNQ ARCHITECTURE), Sean Anderson Subject: [PATCH v2 2/2] drm: zynqmp_dp: Use scope-based mutex helpers Date: Fri, 7 Feb 2025 11:25:28 -0500 Message-Id: <20250207162528.1651426-3-sean.anderson@linux.dev> In-Reply-To: <20250207162528.1651426-1-sean.anderson@linux.dev> References: <20250207162528.1651426-1-sean.anderson@linux.dev> 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-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Convert most mutex_(un)lock calls to use (scoped_)guard instead. This generally reduces line count and prevents bugs like forgetting to unlock the mutex. I've left traditional calls in a few places where scoped helpers would be more verbose. This mostly happens where debugfs_file_put needs to be called regardless. I looked into defining a CLASS for debugfs_file, but it seems like more effort than it's worth since debugfs_file_get can fail. Signed-off-by: Sean Anderson Reviewed-by: Laurent Pinchart --- Changes in v2: - Convert some conditional return statements to returns of ternary expressions. - Remove unnecessary whitespace change drivers/gpu/drm/xlnx/zynqmp_dp.c | 147 +++++++++++-------------------- 1 file changed, 50 insertions(+), 97 deletions(-) diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp= _dp.c index 189a08cdc73c..63842f657836 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c @@ -1534,10 +1534,10 @@ zynqmp_dp_bridge_mode_valid(struct drm_bridge *brid= ge, } =20 /* Check with link rate and lane count */ - mutex_lock(&dp->lock); - rate =3D zynqmp_dp_max_rate(dp->link_config.max_rate, - dp->link_config.max_lanes, dp->config.bpp); - mutex_unlock(&dp->lock); + scoped_guard(mutex, &dp->lock) + rate =3D zynqmp_dp_max_rate(dp->link_config.max_rate, + dp->link_config.max_lanes, + dp->config.bpp); if (mode->clock > rate) { dev_dbg(dp->dev, "filtered mode %s for high pixel rate\n", mode->name); @@ -1722,13 +1722,9 @@ static enum drm_connector_status __zynqmp_dp_bridge_= detect(struct zynqmp_dp *dp) static enum drm_connector_status zynqmp_dp_bridge_detect(struct drm_bridge= *bridge) { struct zynqmp_dp *dp =3D bridge_to_dp(bridge); - enum drm_connector_status ret; =20 - mutex_lock(&dp->lock); - ret =3D __zynqmp_dp_bridge_detect(dp); - mutex_unlock(&dp->lock); - - return ret; + guard(mutex)(&dp->lock); + return __zynqmp_dp_bridge_detect(dp); } =20 static const struct drm_edid *zynqmp_dp_bridge_edid_read(struct drm_bridge= *bridge, @@ -1881,10 +1877,9 @@ static ssize_t zynqmp_dp_pattern_read(struct file *f= ile, char __user *user_buf, if (unlikely(ret)) return ret; =20 - mutex_lock(&dp->lock); - ret =3D snprintf(buf, sizeof(buf), "%s\n", - test_pattern_str[dp->test.pattern]); - mutex_unlock(&dp->lock); + scoped_guard(mutex, &dp->lock) + ret =3D snprintf(buf, sizeof(buf), "%s\n", + test_pattern_str[dp->test.pattern]); =20 debugfs_file_put(dentry); return simple_read_from_buffer(user_buf, count, ppos, buf, ret); @@ -1939,24 +1934,18 @@ static int zynqmp_dp_enhanced_get(void *data, u64 *= val) { struct zynqmp_dp *dp =3D data; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); *val =3D dp->test.enhanced; - mutex_unlock(&dp->lock); return 0; } =20 static int zynqmp_dp_enhanced_set(void *data, u64 val) { struct zynqmp_dp *dp =3D data; - int ret =3D 0; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); dp->test.enhanced =3D val; - if (dp->test.active) - ret =3D zynqmp_dp_test_setup(dp); - mutex_unlock(&dp->lock); - - return ret; + return dp->test.active ? zynqmp_dp_test_setup(dp) : 0; } =20 DEFINE_DEBUGFS_ATTRIBUTE(fops_zynqmp_dp_enhanced, zynqmp_dp_enhanced_get, @@ -1966,24 +1955,19 @@ static int zynqmp_dp_downspread_get(void *data, u64= *val) { struct zynqmp_dp *dp =3D data; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); *val =3D dp->test.downspread; - mutex_unlock(&dp->lock); return 0; } =20 static int zynqmp_dp_downspread_set(void *data, u64 val) { struct zynqmp_dp *dp =3D data; - int ret =3D 0; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); dp->test.downspread =3D val; - if (dp->test.active) - ret =3D zynqmp_dp_test_setup(dp); - mutex_unlock(&dp->lock); =20 - return ret; + return dp->test.active ? zynqmp_dp_test_setup(dp) : 0; } =20 DEFINE_DEBUGFS_ATTRIBUTE(fops_zynqmp_dp_downspread, zynqmp_dp_downspread_g= et, @@ -1993,33 +1977,32 @@ static int zynqmp_dp_active_get(void *data, u64 *va= l) { struct zynqmp_dp *dp =3D data; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); *val =3D dp->test.active; - mutex_unlock(&dp->lock); return 0; } =20 static int zynqmp_dp_active_set(void *data, u64 val) { struct zynqmp_dp *dp =3D data; - int ret =3D 0; + int ret; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); if (val) { if (val < 2) { ret =3D zynqmp_dp_test_setup(dp); if (ret) - goto out; + return ret; } =20 ret =3D zynqmp_dp_set_test_pattern(dp, dp->test.pattern, dp->test.custom); if (ret) - goto out; + return ret; =20 ret =3D zynqmp_dp_update_vs_emph(dp, dp->test.train_set); if (ret) - goto out; + return ret; =20 dp->test.active =3D true; } else { @@ -2032,10 +2015,8 @@ static int zynqmp_dp_active_set(void *data, u64 val) err); zynqmp_dp_train_loop(dp); } -out: - mutex_unlock(&dp->lock); =20 - return ret; + return 0; } =20 DEFINE_DEBUGFS_ATTRIBUTE(fops_zynqmp_dp_active, zynqmp_dp_active_get, @@ -2102,9 +2083,8 @@ static int zynqmp_dp_swing_get(void *data, u64 *val) struct zynqmp_dp_train_set_priv *priv =3D data; struct zynqmp_dp *dp =3D priv->dp; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); *val =3D dp->test.train_set[priv->lane] & DP_TRAIN_VOLTAGE_SWING_MASK; - mutex_unlock(&dp->lock); return 0; } =20 @@ -2113,12 +2093,11 @@ static int zynqmp_dp_swing_set(void *data, u64 val) struct zynqmp_dp_train_set_priv *priv =3D data; struct zynqmp_dp *dp =3D priv->dp; u8 *train_set =3D &dp->test.train_set[priv->lane]; - int ret =3D 0; =20 if (val > 3) return -EINVAL; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); *train_set &=3D ~(DP_TRAIN_MAX_SWING_REACHED | DP_TRAIN_VOLTAGE_SWING_MASK); *train_set |=3D val; @@ -2126,10 +2105,9 @@ static int zynqmp_dp_swing_set(void *data, u64 val) *train_set |=3D DP_TRAIN_MAX_SWING_REACHED; =20 if (dp->test.active) - ret =3D zynqmp_dp_update_vs_emph(dp, dp->test.train_set); - mutex_unlock(&dp->lock); + return zynqmp_dp_update_vs_emph(dp, dp->test.train_set); =20 - return ret; + return 0; } =20 DEFINE_DEBUGFS_ATTRIBUTE(fops_zynqmp_dp_swing, zynqmp_dp_swing_get, @@ -2140,10 +2118,9 @@ static int zynqmp_dp_preemphasis_get(void *data, u64= *val) struct zynqmp_dp_train_set_priv *priv =3D data; struct zynqmp_dp *dp =3D priv->dp; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); *val =3D FIELD_GET(DP_TRAIN_PRE_EMPHASIS_MASK, dp->test.train_set[priv->lane]); - mutex_unlock(&dp->lock); return 0; } =20 @@ -2152,12 +2129,11 @@ static int zynqmp_dp_preemphasis_set(void *data, u6= 4 val) struct zynqmp_dp_train_set_priv *priv =3D data; struct zynqmp_dp *dp =3D priv->dp; u8 *train_set =3D &dp->test.train_set[priv->lane]; - int ret =3D 0; =20 if (val > 2) return -EINVAL; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); *train_set &=3D ~(DP_TRAIN_MAX_PRE_EMPHASIS_REACHED | DP_TRAIN_PRE_EMPHASIS_MASK); *train_set |=3D val; @@ -2165,10 +2141,9 @@ static int zynqmp_dp_preemphasis_set(void *data, u64= val) *train_set |=3D DP_TRAIN_MAX_PRE_EMPHASIS_REACHED; =20 if (dp->test.active) - ret =3D zynqmp_dp_update_vs_emph(dp, dp->test.train_set); - mutex_unlock(&dp->lock); + return zynqmp_dp_update_vs_emph(dp, dp->test.train_set); =20 - return ret; + return 0; } =20 DEFINE_DEBUGFS_ATTRIBUTE(fops_zynqmp_dp_preemphasis, zynqmp_dp_preemphasis= _get, @@ -2178,31 +2153,24 @@ static int zynqmp_dp_lanes_get(void *data, u64 *val) { struct zynqmp_dp *dp =3D data; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); *val =3D dp->test.link_cnt; - mutex_unlock(&dp->lock); return 0; } =20 static int zynqmp_dp_lanes_set(void *data, u64 val) { struct zynqmp_dp *dp =3D data; - int ret =3D 0; =20 if (val > ZYNQMP_DP_MAX_LANES) return -EINVAL; =20 - mutex_lock(&dp->lock); - if (val > dp->num_lanes) { - ret =3D -EINVAL; - } else { - dp->test.link_cnt =3D val; - if (dp->test.active) - ret =3D zynqmp_dp_test_setup(dp); - } - mutex_unlock(&dp->lock); + guard(mutex)(&dp->lock); + if (val > dp->num_lanes) + return -EINVAL; =20 - return ret; + dp->test.link_cnt =3D val; + return dp->test.active ? zynqmp_dp_test_setup(dp) : 0; } =20 DEFINE_DEBUGFS_ATTRIBUTE(fops_zynqmp_dp_lanes, zynqmp_dp_lanes_get, @@ -2212,9 +2180,8 @@ static int zynqmp_dp_rate_get(void *data, u64 *val) { struct zynqmp_dp *dp =3D data; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); *val =3D drm_dp_bw_code_to_link_rate(dp->test.bw_code) * 10000ULL; - mutex_unlock(&dp->lock); return 0; } =20 @@ -2222,7 +2189,6 @@ static int zynqmp_dp_rate_set(void *data, u64 val) { struct zynqmp_dp *dp =3D data; int link_rate; - int ret =3D 0; u8 bw_code; =20 if (do_div(val, 10000)) @@ -2237,13 +2203,9 @@ static int zynqmp_dp_rate_set(void *data, u64 val) bw_code !=3D DP_LINK_BW_5_4) return -EINVAL; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); dp->test.bw_code =3D bw_code; - if (dp->test.active) - ret =3D zynqmp_dp_test_setup(dp); - mutex_unlock(&dp->lock); - - return ret; + return dp->test.active ? zynqmp_dp_test_setup(dp) : 0; } =20 DEFINE_DEBUGFS_ATTRIBUTE(fops_zynqmp_dp_rate, zynqmp_dp_rate_get, @@ -2253,9 +2215,8 @@ static int zynqmp_dp_ignore_aux_errors_get(void *data= , u64 *val) { struct zynqmp_dp *dp =3D data; =20 - mutex_lock(&dp->aux.hw_mutex); + guard(mutex)(&dp->lock); *val =3D dp->ignore_aux_errors; - mutex_unlock(&dp->aux.hw_mutex); return 0; } =20 @@ -2266,9 +2227,8 @@ static int zynqmp_dp_ignore_aux_errors_set(void *data= , u64 val) if (val !=3D !!val) return -EINVAL; =20 - mutex_lock(&dp->aux.hw_mutex); + guard(mutex)(&dp->lock); dp->ignore_aux_errors =3D val; - mutex_unlock(&dp->aux.hw_mutex); return 0; } =20 @@ -2280,9 +2240,8 @@ static int zynqmp_dp_ignore_hpd_get(void *data, u64 *= val) { struct zynqmp_dp *dp =3D data; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); *val =3D dp->ignore_hpd; - mutex_unlock(&dp->lock); return 0; } =20 @@ -2293,9 +2252,8 @@ static int zynqmp_dp_ignore_hpd_set(void *data, u64 v= al) if (val !=3D !!val) return -EINVAL; =20 - mutex_lock(&dp->lock); + guard(mutex)(&dp->lock); dp->ignore_hpd =3D val; - mutex_unlock(&dp->lock); return 0; } =20 @@ -2391,14 +2349,12 @@ static void zynqmp_dp_hpd_work_func(struct work_str= uct *work) struct zynqmp_dp *dp =3D container_of(work, struct zynqmp_dp, hpd_work); enum drm_connector_status status; =20 - mutex_lock(&dp->lock); - if (dp->ignore_hpd) { - mutex_unlock(&dp->lock); - return; - } + scoped_guard(mutex, &dp->lock) { + if (dp->ignore_hpd) + return; =20 - status =3D __zynqmp_dp_bridge_detect(dp); - mutex_unlock(&dp->lock); + status =3D __zynqmp_dp_bridge_detect(dp); + } =20 drm_bridge_hpd_notify(&dp->bridge, status); } @@ -2410,11 +2366,9 @@ static void zynqmp_dp_hpd_irq_work_func(struct work_= struct *work) u8 status[DP_LINK_STATUS_SIZE + 2]; int err; =20 - mutex_lock(&dp->lock); - if (dp->ignore_hpd) { - mutex_unlock(&dp->lock); + guard(mutex)(&dp->lock); + if (dp->ignore_hpd) return; - } =20 err =3D drm_dp_dpcd_read(&dp->aux, DP_SINK_COUNT, status, DP_LINK_STATUS_SIZE + 2); @@ -2428,7 +2382,6 @@ static void zynqmp_dp_hpd_irq_work_func(struct work_s= truct *work) zynqmp_dp_train_loop(dp); } } - mutex_unlock(&dp->lock); } =20 static irqreturn_t zynqmp_dp_irq_handler(int irq, void *data) --=20 2.35.1.1320.gc452695387.dirty