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 A05A927380A for ; Fri, 12 Jun 2026 20:42:09 +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=1781296931; cv=none; b=A5FhmzX4FQaESG7IR1L6aiULhjWPcjp/gZH75MfqHyYel0oUXC/9qJ+iH9DXV2wDIQlyiAOxvZLUSt4iuJzb7nSOnP0eGK2YlpETAB5Y8oOw6/Y+Ozvk3TZhbZZkp5QFi9XZn0onsL9XLm8w7OwZOvAiXqigMsYZoHvJpchkT90= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781296931; c=relaxed/simple; bh=EwJnim2UySXl/C8gGWgVbYK2jiPjZuEGJl0kKvx+JJQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=GSm0hvVo1+U+W2jiRSDGzBF7fwUiknWOD0p55Wpve7TVqzn5LRAkMTz6WyeMFLHfUql2h+wPcYbvs6iBRwYcRK5pL5nMdjzs7TAjLeW8UJSZuDingbVzOFdndCxtBb7/1fk5Nkhh80bwgI2ZemJoS7ZJm7TFfzgwcjVZzNXUNoY= 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=jJWzVQuR; 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="jJWzVQuR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1781296927; bh=EwJnim2UySXl/C8gGWgVbYK2jiPjZuEGJl0kKvx+JJQ=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=jJWzVQuRji0oWgxnebSLfoQRnObVZavrZh4J1bnyxVeYBDwKTJ+Hp1hFy6PJtV/8J n0DCJQEtId+w0/MRGmPfPBGYYip+crbavyBzp8vo3aXyXcCAyHJk7IAQhNOIvkFgIG GahQ/csYaccDz1y7/V99iAYRa0t9BCIFeSBKvQnb4L1pKZUo1Gy2yEShSB3J0eiR3Q Z8D97yKABYROKzZV+hUT/ong/MpjaSqxKrepBm9ZjTD8Is7ZYrIk9oazCHHwfLbQMX 9fXZU8vBVOjzN/YahJhPFk0J12CJ3jNPRY73c//o/kapbTUvMuI8jvPsygJpl84XNp It4MArU596hhw== 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 F0BD717E03D7; Fri, 12 Jun 2026 22:42:06 +0200 (CEST) Message-ID: Date: Fri, 12 Jun 2026 23:42:06 +0300 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 11/30] drm/display: bridge_connector: Wire up HDMI 2.0 scrambler callbacks To: Maxime Ripard Cc: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Sandy Huang , =?UTF-8?Q?Heiko_St=C3=BCbner?= , Andy Yan , Daniel Stone , Dave Stevenson , =?UTF-8?Q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org References: <20260602-dw-hdmi-qp-scramb-v7-0-445eb54ee1ed@collabora.com> <20260602-dw-hdmi-qp-scramb-v7-11-445eb54ee1ed@collabora.com> <20260612-attractive-dashing-mule-309598@houat> Content-Language: en-US From: Cristian Ciocaltea In-Reply-To: <20260612-attractive-dashing-mule-309598@houat> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 6/12/26 11:52 AM, Maxime Ripard wrote: > On Tue, Jun 02, 2026 at 01:44:11AM +0300, Cristian Ciocaltea wrote: >> Connect the bridge connector's .scrambler_{enable|disable} callbacks to >> the underlying bridge's .hdmi_scrambler_{enable|disable} funcs when >> DRM_BRIDGE_OP_HDMI_SCRAMBLER is advertised. >> >> This completes the bridge connector plumbing so that the SCDC >> scrambling helpers can control source-side scrambling through the >> bridge chain. >> >> Signed-off-by: Cristian Ciocaltea >> --- >> drivers/gpu/drm/display/drm_bridge_connector.c | 41 +++++++++++++++++++++++++- >> 1 file changed, 40 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c >> index 9d21b1b57b0d..d048ab49eade 100644 >> --- a/drivers/gpu/drm/display/drm_bridge_connector.c >> +++ b/drivers/gpu/drm/display/drm_bridge_connector.c >> @@ -555,6 +555,32 @@ static int drm_bridge_connector_write_spd_infoframe(struct drm_connector *connec >> return bridge->funcs->hdmi_write_spd_infoframe(bridge, buffer, len); >> } >> >> +static int drm_bridge_connector_scrambler_enable(struct drm_connector *connector) >> +{ >> + struct drm_bridge_connector *bridge_connector = >> + to_drm_bridge_connector(connector); >> + struct drm_bridge *bridge; >> + >> + bridge = bridge_connector->bridge_hdmi; >> + if (!bridge) >> + return -EINVAL; >> + >> + return bridge->funcs->hdmi_scrambler_enable(bridge); >> +} >> + >> +static int drm_bridge_connector_scrambler_disable(struct drm_connector *connector) >> +{ >> + struct drm_bridge_connector *bridge_connector = >> + to_drm_bridge_connector(connector); >> + struct drm_bridge *bridge; >> + >> + bridge = bridge_connector->bridge_hdmi; >> + if (!bridge) >> + return -EINVAL; >> + >> + return bridge->funcs->hdmi_scrambler_disable(bridge); >> +} >> + >> static const struct drm_edid * >> drm_bridge_connector_read_edid(struct drm_connector *connector) >> { >> @@ -580,7 +606,7 @@ static const struct drm_connector_hdmi_funcs drm_bridge_connector_hdmi_funcs = { >> .clear_infoframe = drm_bridge_connector_clear_hdmi_infoframe, >> .write_infoframe = drm_bridge_connector_write_hdmi_infoframe, >> }, >> - /* audio, hdr_drm and spd are set dynamically during init */ >> + /* scrambler, audio, hdr_drm and spd are set dynamically during init */ >> }; >> >> static const struct drm_connector_infoframe_funcs drm_bridge_connector_hdmi_audio_infoframe = { >> @@ -886,6 +912,11 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, >> !bridge->funcs->hdmi_clear_spd_infoframe)) >> return ERR_PTR(-EINVAL); >> >> + if (bridge->ops & DRM_BRIDGE_OP_HDMI_SCRAMBLER && >> + (!bridge->funcs->hdmi_scrambler_enable || >> + !bridge->funcs->hdmi_scrambler_disable)) >> + return ERR_PTR(-EINVAL); >> + >> bridge_connector->bridge_hdmi = drm_bridge_get(bridge); >> >> if (bridge->supported_formats) >> @@ -990,6 +1021,14 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm, >> bridge_connector->hdmi_funcs.spd = >> drm_bridge_connector_hdmi_spd_infoframe; >> >> + if (bridge_connector->bridge_hdmi->ops & DRM_BRIDGE_OP_HDMI_SCRAMBLER) { >> + bridge_connector->hdmi_funcs.scrambler_enable = >> + drm_bridge_connector_scrambler_enable; >> + bridge_connector->hdmi_funcs.scrambler_disable = >> + drm_bridge_connector_scrambler_disable; >> + connector->hdmi.scrambler_supported = true; >> + } >> + > > I think we're taking this backwards. The scrambler support isn't > optional: either the controller supports HDMI < 2.0, and then it doesn't > exist, or it supports >= 2.0 and then it's mandatory. > > You're considering it optional here, when it's never actually optional > (unlike YUV420 for example) > > I still think we should list, somehow, the capabilities of the > controller to the helpers, like max tmds rate supported, formats, etc. > We've so far put everything as an argument to drmm_connector_hdmi_init > but it becomes a bit overloaded, and I wonder if introducing a callback > wouldn't solve this, kind of like what we have for planes and formats. What about introducing something like: struct drm_connector_hdmi_caps { ... unsigned int supported_formats; enum hdmi_version supported_hdmi_ver; }; struct drm_connector_hdmi_funcs { ... int (*get_caps)(struct drm_connector *connector, struct drm_connector_hdmi_caps *caps); ... }; int drmm_connector_hdmi_init(struct drm_device *dev, ...) { ... if (hdmi_funcs->get_caps) { struct drm_connector_hdmi_caps caps = { }; ret = hdmi_funcs->get_caps(connector, &caps); if (ret) return ret; connector->hdmi.supported_formats = caps.supported_formats; ... if (caps.supported_hdmi_ver > HDMI_2_0) connector->hdmi.frl_supported = true; else if (caps.supported_hdmi_ver == HDMI_2_0) connector->hdmi.scrambler_supported = true; } ... } Not sure if max_tmds_char_rate should be listed as a capability, as we already have the .tmds_char_rate_valid() callback. Cristian