From nobody Sun Feb 8 10:49:06 2026 Received: from out-184.mta1.migadu.com (out-184.mta1.migadu.com [95.215.58.184]) (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 E4D131598ED for ; Fri, 3 May 2024 19:29:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714764591; cv=none; b=nELRVes7JIBaqxEQWAJoXNKbFtke22UhullHsQyd6Ih/KcMIXrk7xhjhlZdeNgtpULZDrkHQgXAsfAwG78TeETdomjXbbJ3ozLlkYgkw0hH3ljxjrQfWuqxJAZu6I+8gO/dBt7CbmX6t6Gx0w4+GLRTyUgrJGSRrx6oayFxv1Cc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714764591; c=relaxed/simple; bh=aSjAhdSR9LarmwINb9KQ4scksGVrnsC32oUhBbn0efQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=q36n53bwrSKAHMXsb7MQvy8JevEKT/BbaPGLTQetpel7sB4CDs3YajzH37d8bmvcKHN1nQVvq0eOM9TSy7sD06UxcuapOZbDoI6q3qy0G0yTdp5+v14VEDw+YKzog71wAGuqjmqzjXdKwMPEHuZwezbIc36vvOgdxvfcf0W2rPc= 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=P9GeCfZQ; arc=none smtp.client-ip=95.215.58.184 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="P9GeCfZQ" 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=1714764588; 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=DMD5RVBwkMYmGCgYVDFRWe+ej+oru7pO54GULnyHuDg=; b=P9GeCfZQ+aq6eQwIwiuL8gqD9ILBdbJs76oSjeSbPeEcrAEr7aEzmHlYqKkXkKpaJVVXxy qLawkl4pev9Px3WUOiK+FLs3cb1W+vTm9nHRDmIqsxxQl44ewLBQIg4Mix4lfSInVo+Pbx Y/oMkNMtEf1rMsO9cqlPWe05E8BAaHc= From: Sean Anderson To: Laurent Pinchart , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org Cc: linux-arm-kernel@lists.infradead.org, David Airlie , linux-kernel@vger.kernel.org, Daniel Vetter , Tomi Valkeinen , Michal Simek , Sean Anderson Subject: [PATCH v5 09/10] drm: zynqmp_dp: Take dp->lock in zynqmp_dp_hpd_work_func Date: Fri, 3 May 2024 15:29:21 -0400 Message-Id: <20240503192922.2172314-10-sean.anderson@linux.dev> In-Reply-To: <20240503192922.2172314-1-sean.anderson@linux.dev> References: <20240503192922.2172314-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 91767ddbe1ce..6f3792dcac28 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c @@ -1567,14 +1567,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 @@ -1603,16 +1602,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) { @@ -1696,7 +1705,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