From nobody Sun Feb 8 12:37:39 2026 Received: from out-180.mta0.migadu.com (out-180.mta0.migadu.com [91.218.175.180]) (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 B3F391428E6 for ; Tue, 23 Apr 2024 17:19:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713892778; cv=none; b=X0yzexacEWFYo17E0W1eZoDhIfq/s3WofRcA6vKsxLJ3UC+BtPne5coKcFz2ImoZrXDWauCLuw4OKyuUCVInPDSG4m1h3soJ0DD/oUs/RQlsFEvtpcnVNhjUq2sMKtjaTcV2yJpkRUMPJzO374yUrXGnzXaBMqgLTdi1z+zvGPg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713892778; c=relaxed/simple; bh=14sT4ve1hf4VA7R7SLYTcJV6hUvEdx6n6tiFakm+v5Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a6Ih54HDzdnm17I9EUupxpMwJj6J4ht/H4HtLK87bilUYhIGjJT9NUZ7KeFGyIa5PmuqymE3787julxVZfg+oU9lPmchs2jsD4JNo627lPEPSIcYEK4l6IkwrAOVWBK7JW7uio7oOHGOvGOhnSqYJJurYjfsgCDPFX461ikSFYY= 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=K94Q1JsR; arc=none smtp.client-ip=91.218.175.180 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="K94Q1JsR" 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=1713892774; 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=CU8WVgLiJfT+zG1g0Gek4Quem8lI6e2UFlwZo7xAnnk=; b=K94Q1JsRsc16CDjbMOTGnJO/IDJukNvHLRVShoEAsPAwDvZYPLTBSFaqNmTrbNDbj1IPaR v+t+dAoVutySLiYRAl2mq6dKi0Wwfp8Ii9Zg2hVkZVLYYd4hdrdo2eeEJ8clz/Hy1OyDYY Gzgz92WydoYjW2lQgNu9HQAdrFbG7tY= From: Sean Anderson To: Laurent Pinchart , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org Cc: Daniel Vetter , linux-arm-kernel@lists.infradead.org, Michal Simek , linux-kernel@vger.kernel.org, David Airlie , Tomi Valkeinen , Sean Anderson Subject: [PATCH v4 12/13] drm: zynqmp_dp: Take dp->lock in zynqmp_dp_hpd_work_func Date: Tue, 23 Apr 2024 13:18:58 -0400 Message-Id: <20240423171859.3953024-13-sean.anderson@linux.dev> In-Reply-To: <20240423171859.3953024-1-sean.anderson@linux.dev> References: <20240423171859.3953024-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" Add a non-locking version of zynqmp_dp_bridge_detect and use it in zynqmp_dp_hpd_work_func so we can take the lock explicitly. This will make it easier to check for hpd_ignore when we add debugfs support. Signed-off-by: Sean Anderson --- (no changes since v3) Changes in v3: - New drivers/gpu/drm/xlnx/zynqmp_dp.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp= _dp.c index d5ee165046f8..fe002fef4662 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c @@ -1552,14 +1552,13 @@ static int zynqmp_dp_bridge_atomic_check(struct drm= _bridge *bridge, return 0; } =20 -static enum drm_connector_status zynqmp_dp_bridge_detect(struct drm_bridge= *bridge) +static enum drm_connector_status __zynqmp_dp_bridge_detect(struct zynqmp_d= p *dp) { - struct zynqmp_dp *dp =3D bridge_to_dp(bridge); struct zynqmp_dp_link_config *link_config =3D &dp->link_config; u32 state, i; int ret; =20 - mutex_lock(&dp->lock); + lockdep_assert_held(&dp->lock); =20 /* * This is from heuristic. It takes some delay (ex, 100 ~ 500 msec) to @@ -1588,16 +1587,26 @@ static enum drm_connector_status zynqmp_dp_bridge_d= etect(struct drm_bridge *brid dp->num_lanes); =20 dp->status =3D connector_status_connected; - mutex_unlock(&dp->lock); return connector_status_connected; } =20 disconnected: dp->status =3D connector_status_disconnected; - mutex_unlock(&dp->lock); return connector_status_disconnected; } =20 +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; + + mutex_lock(&dp->lock); + ret =3D __zynqmp_dp_bridge_detect(dp); + mutex_unlock(&dp->lock); + + return ret; +} + static const struct drm_edid *zynqmp_dp_bridge_edid_read(struct drm_bridge= *bridge, struct drm_connector *connector) { @@ -1651,7 +1660,10 @@ static void zynqmp_dp_hpd_work_func(struct work_stru= ct *work) struct zynqmp_dp *dp =3D container_of(work, struct zynqmp_dp, hpd_work); enum drm_connector_status status; =20 - status =3D zynqmp_dp_bridge_detect(&dp->bridge); + mutex_lock(&dp->lock); + status =3D __zynqmp_dp_bridge_detect(dp); + mutex_unlock(&dp->lock); + drm_bridge_hpd_notify(&dp->bridge, status); } =20 --=20 2.35.1.1320.gc452695387.dirty