From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 7C0CC3921E9 for ; Thu, 20 Aug 2026 18:23:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787250211; cv=none; b=uw3iLUgT4VUlgoShzvnbqkwr1B871CrC2W6MlFhyLQRx9j3vOUbO6RGiSrjO7Fjtiucucfxt66voDX6cHk2g17QCmj/VtZRch5v3uNb82xmJyGuhAHhbFZFCGuihkX0wvPyZlkuI5x9Vf9Xre2qEvugXFQdxBWdvXpbI2z1rZww= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787250211; c=relaxed/simple; bh=vZXBjt3Fuoeqwtrnxnm/xTajTsbgsBlWfNGZiZ+mJ3A=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=B0zxr9lyvajtMTXH4ID23wRI/ANa7PKgX6RVQE4UwQvKtsbyZK6YoF14xD8wroZzqOiaQ9ZtsdhsE4IYPUYHkyDXN3x5qNMMfEEJk2os6A3p9fisJrAIDQ6XLZtwrxDDlOxoGHb0QyOuMh/a4FuvU6540LivP3Hov/HU1ajCJVc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=ioLn+UN8; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="ioLn+UN8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1787250206; bh=vZXBjt3Fuoeqwtrnxnm/xTajTsbgsBlWfNGZiZ+mJ3A=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=ioLn+UN86yM5Af2ne1bCjJrBktr38PrR6/ZDU1/otfzSqIwstDTdrjnkYMmJyAmoy ot+ZPf1vM7kyRW4DAzO/YnnOrqkj2RVaUtxD9rWeCmwM/vAAyLJnqwZsoj9Guv4C0J 9XN6YbjwgsSDtxnWw64JApMWArqYFsxU+5HPZyG8rbUdszEZW+PMHA6KOvz7rFR/nb m2sLZlh4LK5LXRknB4DeqhlsVzzpLusU5LPIdDTQpVgGlzwksjQnEU9P/0EVCPJH5p 8p4LZHpWhXZ6MqvjA5V9eN+x0izEppa156rezxvf4Jv/tiGUuyJAwOeGb6DuwRxDGV iXozIBTUd19zw== Received: from [100.64.0.241] (unknown [100.64.0.241]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id 8517A17E038D; Thu, 20 Aug 2026 20:23:25 +0200 (CEST) Message-ID: <4a2c5754-56f3-42d5-863b-bc29452f8eb2@collabora.com> Date: Thu, 20 Aug 2026 21:23:25 +0300 Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v10 43/69] drm/vc4: hdmi: Propagate -EDEADLK to the top level To: Maxime Ripard Cc: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Chen-Yu Tsai , Samuel Holland , Dave Stevenson , =?UTF-8?Q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Sandy Huang , =?UTF-8?Q?Heiko_St=C3=BCbner?= , Andy Yan , Algea Cao , Daniel Stone , Liu Ying , Phong LE , kernel@collabora.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-rockchip@lists.infradead.org References: <20260731-dw-hdmi-qp-scramb-v10-0-294364b2cf15@collabora.com> <20260731-dw-hdmi-qp-scramb-v10-43-294364b2cf15@collabora.com> <20260820-sceptical-friendly-panther-6cdfd4@houat> Content-Language: en-US From: Cristian Ciocaltea In-Reply-To: <20260820-sceptical-friendly-panther-6cdfd4@houat> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 8/20/26 11:55 AM, Maxime Ripard wrote: > On Fri, Jul 31, 2026 at 07:19:50PM +0300, Cristian Ciocaltea wrote: >> drm_connector_helper_funcs.detect_ctx() is expected to propagate >> -EDEADLK so that context owners, e.g. drm_helper_probe_detect_ctx(), can >> perform the required backoff and retry. >> >> vc4_hdmi_handle_hotplug() instead runs its own retry loop and calls >> drm_modeset_backoff() on an acquire context it does not own. This drops >> all locks in the context, including connection_mutex held by the core. >> >> Drop the local retry logic and propagate -EDEADLK to the caller instead. >> This aligns VC4 with the expected detect_ctx() semantics. >> >> Signed-off-by: Cristian Ciocaltea >> --- >> drivers/gpu/drm/vc4/vc4_hdmi.c | 23 +++++++---------------- >> 1 file changed, 7 insertions(+), 16 deletions(-) >> >> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c >> index ba16e7944cf3..72042fad04c5 100644 >> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c >> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c >> @@ -344,12 +344,11 @@ static int vc4_hdmi_reset_link(struct drm_connector *connector, >> return drm_atomic_helper_reset_crtc(crtc, ctx); >> } >> >> -static void vc4_hdmi_handle_hotplug(struct vc4_hdmi *vc4_hdmi, >> - struct drm_modeset_acquire_ctx *ctx, >> - enum drm_connector_status status) >> +static int vc4_hdmi_handle_hotplug(struct vc4_hdmi *vc4_hdmi, >> + struct drm_modeset_acquire_ctx *ctx, >> + enum drm_connector_status status) >> { >> struct drm_connector *connector = &vc4_hdmi->connector; >> - int ret; >> >> /* >> * NOTE: This function should really be called with vc4_hdmi->mutex >> @@ -368,17 +367,9 @@ static void vc4_hdmi_handle_hotplug(struct vc4_hdmi *vc4_hdmi, >> drm_atomic_helper_connector_hdmi_hotplug(connector, ctx, status); >> >> if (status != connector_status_connected) >> - return; >> + return 0; >> >> - for (;;) { >> - ret = vc4_hdmi_reset_link(connector, ctx); >> - if (ret == -EDEADLK) { >> - drm_modeset_backoff(ctx); >> - continue; >> - } >> - >> - break; >> - } >> + return vc4_hdmi_reset_link(connector, ctx); >> } >> >> static int vc4_hdmi_connector_detect_ctx(struct drm_connector *connector, >> @@ -416,10 +407,10 @@ static int vc4_hdmi_connector_detect_ctx(struct drm_connector *connector, >> status = connector_status_connected; >> } >> >> - vc4_hdmi_handle_hotplug(vc4_hdmi, ctx, status); >> + ret = vc4_hdmi_handle_hotplug(vc4_hdmi, ctx, status); >> pm_runtime_put(&vc4_hdmi->pdev->dev); >> >> - return status; >> + return ret == -EDEADLK ? ret : status; > > Don't we mask any error that isn't EDEADLK here? Yes, per .detect_ctx() doc, implementation should return either a drm_connector_status or -EDEADLK. This matches what the probe helpers expect, and prevents ending up with connector_status_unknown, which would be wrong, since the detection was successful: int drm_helper_probe_single_connector_modes() { [...] ret = drm_helper_probe_detect(connector, &ctx, true); if (ret == -EDEADLK) { drm_modeset_backoff(&ctx); goto retry; } else if (WARN(ret < 0, "Invalid return value %i for connector detection\n", ret)) ret = connector_status_unknown; connector->status = ret; [...] } drm_helper_probe_detect_ctx(struct drm_connector *connector, bool force) { [...] ret = drm_modeset_lock(&connector->dev->mode_config.connection_mutex, &ctx); if (!ret) ret = detect_connector_status(connector, &ctx, force); if (ret == -EDEADLK) { drm_modeset_backoff(&ctx); goto retry; } if (WARN_ON(ret < 0)) ret = connector_status_unknown; [...] }