From nobody Fri Apr 3 19:09:35 2026 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 DE7C23CA4BF for ; Mon, 23 Mar 2026 17:46:30 +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=1774287992; cv=none; b=A08efqSCd+4OByi44pIDVzQG6N6spmt9oqyWnWGaUMapmsQvEhdSIt+5LgYPoTE4RDF8Z2ZVqfjJ4lP6mVBVqcTxm8t5+v24WJDsuWFrBHZhpKYVaKrYvbIODxpQyKeWUpf0Bba3dAlfNST0IAk8qdYOsY3NFy+WhPmpqRTH4lY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774287992; c=relaxed/simple; bh=AN6INEBfPyO6s+XgcEZep4nYTl5pMwRVWu9DVH/ap2Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BUYU9/Y/RynnmtgU0f49KaxUgnpEEXfRjVLp/xxs2RLM5uLVep8/JJiZq7tJqJz1T+789b2074Vp2t/Q2abWGQv03vWfl1tOR7TJ8lqlI76kymetjj+P53AzefUBlZTRXSADPPy5Ax9caPYDzoeoCIHGTH1TFwCWw21g+8zdF5w= 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=O1O8dy7L; 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="O1O8dy7L" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1774287989; bh=AN6INEBfPyO6s+XgcEZep4nYTl5pMwRVWu9DVH/ap2Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=O1O8dy7LUUe4Amc/E7b7qCSFj2B6X0Gl+D/R50YfYtcAEoMe2M25reScKkyVjofcq w1ZOES9vCH8tGEJ7eaSBO3DW2O9JK6aS+O4oJqAEtqcOUu1RMVoRUPLOnIZQ4GITEx sInEWE2qKeUUkYD7nuYCwFH8WIdMy47iAsRGp/txrPCvwcsMhcjwpVm8oFZ1wsc/wV NTcbq1P7ue7s90IZwlZM/9ZlKLL/rfFHW7pizVeqFS1zRFnYyLvhHkhms9NTzJfyus B2/ZZeSIA45Ws1GaSR6doPiZ+CE5EiJk7ezZ/cJk0VyveWSq3O1v8ce3pcjODZDbXu UebdtsuUGza3g== Received: from localhost (unknown [86.123.23.225]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id 4864517E3F19; Mon, 23 Mar 2026 18:46:29 +0100 (CET) From: Cristian Ciocaltea Date: Mon, 23 Mar 2026 19:45:28 +0200 Subject: [PATCH RESEND v4 2/4] drm/bridge-connector: Switch to using ->detect_ctx hook 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: quoted-printable Message-Id: <20260323-dw-hdmi-qp-scramb-v4-2-1d99df84883e@collabora.com> References: <20260323-dw-hdmi-qp-scramb-v4-0-1d99df84883e@collabora.com> In-Reply-To: <20260323-dw-hdmi-qp-scramb-v4-0-1d99df84883e@collabora.com> To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Diederik de Haas , Maud Spierings X-Mailer: b4 0.14.3 In preparation to allow bridge drivers relying on the HDMI connector framework to provide HDMI 2.0 support, make use of the atomic version of drm_connector_funcs.detect() hook and invoke the newly introduced drm_bridge_detect_ctx() helper. In particular, this is going to be used for triggering an empty modeset in drm_bridge_funcs.detect_ctx() callback, in order to manage SCDC status lost on sink disconnects. Tested-by: Diederik de Haas Tested-by: Maud Spierings Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/display/drm_bridge_connector.c | 73 ++++++++++++++--------= ---- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/d= rm/display/drm_bridge_connector.c index f686aa5c0ed9..626f15aba5d5 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -208,39 +208,6 @@ static void drm_bridge_connector_disable_hpd(struct dr= m_connector *connector) * Bridge Connector Functions */ =20 -static enum drm_connector_status -drm_bridge_connector_detect(struct drm_connector *connector, bool force) -{ - struct drm_bridge_connector *bridge_connector =3D - to_drm_bridge_connector(connector); - struct drm_bridge *detect =3D bridge_connector->bridge_detect; - struct drm_bridge *hdmi =3D bridge_connector->bridge_hdmi; - enum drm_connector_status status; - - if (detect) { - status =3D detect->funcs->detect(detect, connector); - - if (hdmi) - drm_atomic_helper_connector_hdmi_hotplug(connector, status); - - drm_bridge_connector_hpd_notify(connector, status); - } else { - switch (connector->connector_type) { - case DRM_MODE_CONNECTOR_DPI: - case DRM_MODE_CONNECTOR_LVDS: - case DRM_MODE_CONNECTOR_DSI: - case DRM_MODE_CONNECTOR_eDP: - status =3D connector_status_connected; - break; - default: - status =3D connector_status_unknown; - break; - } - } - - return status; -} - static void drm_bridge_connector_force(struct drm_connector *connector) { struct drm_bridge_connector *bridge_connector =3D @@ -278,7 +245,6 @@ static void drm_bridge_connector_reset(struct drm_conne= ctor *connector) =20 static const struct drm_connector_funcs drm_bridge_connector_funcs =3D { .reset =3D drm_bridge_connector_reset, - .detect =3D drm_bridge_connector_detect, .force =3D drm_bridge_connector_force, .fill_modes =3D drm_helper_probe_single_connector_modes, .atomic_duplicate_state =3D drm_atomic_helper_connector_duplicate_state, @@ -291,6 +257,42 @@ static const struct drm_connector_funcs drm_bridge_con= nector_funcs =3D { * Bridge Connector Helper Functions */ =20 +static int drm_bridge_connector_detect_ctx(struct drm_connector *connector, + struct drm_modeset_acquire_ctx *ctx, + bool force) +{ + struct drm_bridge_connector *bridge_connector =3D + to_drm_bridge_connector(connector); + struct drm_bridge *detect =3D bridge_connector->bridge_detect; + struct drm_bridge *hdmi =3D bridge_connector->bridge_hdmi; + int ret; + + if (detect) { + ret =3D drm_bridge_detect_ctx(detect, connector, ctx); + if (ret < 0) + return ret; + + if (hdmi) + drm_atomic_helper_connector_hdmi_hotplug(connector, ret); + + drm_bridge_connector_hpd_notify(connector, ret); + } else { + switch (connector->connector_type) { + case DRM_MODE_CONNECTOR_DPI: + case DRM_MODE_CONNECTOR_LVDS: + case DRM_MODE_CONNECTOR_DSI: + case DRM_MODE_CONNECTOR_eDP: + ret =3D connector_status_connected; + break; + default: + ret =3D connector_status_unknown; + break; + } + } + + return ret; +} + static int drm_bridge_connector_get_modes_edid(struct drm_connector *conne= ctor, struct drm_bridge *bridge) { @@ -298,7 +300,7 @@ static int drm_bridge_connector_get_modes_edid(struct d= rm_connector *connector, const struct drm_edid *drm_edid; int n; =20 - status =3D drm_bridge_connector_detect(connector, false); + status =3D drm_bridge_connector_detect_ctx(connector, NULL, false); if (status !=3D connector_status_connected) goto no_edid; =20 @@ -384,6 +386,7 @@ static int drm_bridge_connector_atomic_check(struct drm= _connector *connector, =20 static const struct drm_connector_helper_funcs drm_bridge_connector_helper= _funcs =3D { .get_modes =3D drm_bridge_connector_get_modes, + .detect_ctx =3D drm_bridge_connector_detect_ctx, .mode_valid =3D drm_bridge_connector_mode_valid, .enable_hpd =3D drm_bridge_connector_enable_hpd, .disable_hpd =3D drm_bridge_connector_disable_hpd, --=20 2.52.0