From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D9871C5DF81 for ; Thu, 20 Aug 2026 19:23:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=teUf03cIwm/7Pvp7VN2NDan+Y5kEAU4dljdTOaWPG/Q=; b=JgR2XNTOIA88JP nCEf2jI2yNNaFPD7nsHABwxDBrzydscNoTARVFcGswSETyNnpF/zBMtkqmF2JGx8rKkWEekjfkKxV LcuHoXv9hYt+98TqlPZzAHCPMOpkoeRQbPuyiZD8hDqIVz7Nh1c1XeYry+MZ4UVXxKUnaOhNiLzuU pilnXVzxJx40rwdce/FBij6nGVesDGHvTq1dGBeAticIwMua69rAxMG2h6E8VAq7zOjSsk9pG7QeK udBmWeIICRV1vsLOs3zXPNFVaXOHtMEzCZRWtCAhXdmzmjB1R1aZej6IZaRRsMC6NFKmEeoE5DrRE BmHM9Eor9ZMfM1UIqvWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wx8M1-0000000C6hG-1VpT; Thu, 20 Aug 2026 19:23:09 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wx8Ly-0000000C6gd-0KU4; Thu, 20 Aug 2026 19:23:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1787253782; bh=netGS3826OfdBhOGaochUMtFJf0sQLAIeCCeC64zFy4=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=Z/lECfkjbFToU3JpZ1gC29GwO0usnrecHWmwGezXDirrKDcXGevoy3GV4i64Ukya9 9PG7VNrZ2nJ8EOhReTgMvEoJsc37vG4X2yEsuLdpzmG1YAHchxwGknkCOS3laEnDdH GbT9SV5XwdQVr0KET+ok6bfPZms9H0iBaoA4stHbkawB7yC1XdnseCMHcR4q4nD/3D J0Va1mGs57pnQHVkQgDxvAHlvnfAzZ/ptDfR7Y1jnf7CQpxmIZR1CtICGW2YeeX/xg cNKlUP8bVXa5+k2jL1cI91WoBK4aWmUUcMUv/3ot36ECMMdQS/0ZQfVdpxeAkyQAOP QcMj6NvMpvxzQ== 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 0371217E0829; Thu, 20 Aug 2026 21:23:01 +0200 (CEST) Message-ID: Date: Thu, 20 Aug 2026 22:23:01 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v10 45/69] drm/vc4: hdmi: Convert to common HDMI 2.0 scrambling infrastructure 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-45-294364b2cf15@collabora.com> <20260820-tan-spoonbill-of-action-82269e@houat> Content-Language: en-US From: Cristian Ciocaltea In-Reply-To: <20260820-tan-spoonbill-of-action-82269e@houat> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260820_122306_295921_DF239D7B X-CRM114-Status: GOOD ( 13.89 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org On 8/20/26 2:24 PM, Maxime Ripard wrote: > On Fri, Jul 31, 2026 at 07:19:52PM +0300, Cristian Ciocaltea wrote: >> Replace driver local scrambling logic with the newly introduced common >> HDMI 2.0 scrambling support: >> >> - Advertise source-side scrambling capability by setting supported HDMI >> version based on the variant's max_pixel_clock. >> >> - Provide minimal .scrambler_{enable,disable} connector callbacks that >> only toggle the VC5 HDMI_SCRAMBLER_CTL register, while delegating >> sink-side SCDC programming and periodic status monitoring to >> drm_connector_hdmi_{enable,disable}_scrambling(). >> >> - Drop vc4_hdmi_reset_link() and vc4_hdmi_handle_hotplug(), switching >> the .detect_ctx() path to drm_atomic_helper_connector_hdmi_hotplug() >> which internally calls drm_connector_hdmi_sync_scdc() to trigger a >> CRTC reset on reconnection. >> >> - Drop the local scrambling_work delayed workqueue and scdc_enabled >> flag, now tracked by the common drm_connector_hdmi layer, as well as >> the now unused output_{bpc,color_format} driver data members. >> >> No functional change intended. >> >> Signed-off-by: Cristian Ciocaltea >> --- [...] >> +static int vc4_hdmi_scrambler_enable(struct drm_connector *connector) >> { >> - struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); >> - struct drm_connector *connector = &vc4_hdmi->connector; >> + struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector); >> struct drm_device *drm = connector->dev; >> - const struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode; >> unsigned long flags; >> int idx; >> >> - lockdep_assert_held(&vc4_hdmi->mutex); >> - >> - if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) >> - return; >> - >> - if (!drm_hdmi_mode_needs_scrambling(mode, >> - vc4_hdmi->output_bpc, >> - vc4_hdmi->output_format)) >> - return; >> - >> if (!drm_dev_enter(drm, &idx)) >> - return; >> - >> - drm_scdc_set_high_tmds_clock_ratio(connector, true); >> - drm_scdc_set_scrambling(connector, true); >> + return -ENODEV; > > Not being able to acquire the device isn't an error, it's something we should ignore. Ack, will return 0 in both cases. > >> >> spin_lock_irqsave(&vc4_hdmi->hw_lock, flags); >> HDMI_WRITE(HDMI_SCRAMBLER_CTL, HDMI_READ(HDMI_SCRAMBLER_CTL) | >> @@ -793,59 +659,27 @@ static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder) >> >> drm_dev_exit(idx); >> >> - vc4_hdmi->scdc_enabled = true; >> - >> - queue_delayed_work(system_percpu_wq, &vc4_hdmi->scrambling_work, >> - msecs_to_jiffies(SCRAMBLING_POLLING_DELAY_MS)); >> + return 0; >> } >> >> -static void vc4_hdmi_disable_scrambling(struct drm_encoder *encoder) >> +static int vc4_hdmi_scrambler_disable(struct drm_connector *connector) >> { >> - struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); >> - struct drm_connector *connector = &vc4_hdmi->connector; >> + struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector); >> struct drm_device *drm = connector->dev; >> unsigned long flags; >> int idx; >> >> - lockdep_assert_held(&vc4_hdmi->mutex); >> - >> - if (!vc4_hdmi->scdc_enabled) >> - return; >> - >> - vc4_hdmi->scdc_enabled = false; >> - >> - if (delayed_work_pending(&vc4_hdmi->scrambling_work)) >> - cancel_delayed_work_sync(&vc4_hdmi->scrambling_work); >> - >> if (!drm_dev_enter(drm, &idx)) >> - return; >> + return -ENODEV; > > Ditto > > Maxime _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E0531C5DF89 for ; Thu, 20 Aug 2026 19:23:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=FM6vcgpFnfz7iIxxGNxBaMBik3/U7ndwrf92exk2vNM=; b=Kmz9lMKG65KF7rfCk1bv9p6B3v pseFUFGqQn6ERPQiFo5s3rU07oFbH+WwiK4O8O09AZhCcXvziZFiWFDeXWjmcLlsv/eMOfGswdk4I NaO9oOBXgkHmQLh7sMSvvpOZuY4hGoibTWqfIuMlnXDLMdUHTcxEhw5C8er1VDC79eyjtw1a4eUYj 2ojdAaPRKHBeWuN+j4S9z7HemualTLvjBe5m6m05T+LP7v80ouW2YTiJF0CgaJ2axC13KOGXIwjAV AnyIh733hlj0828DHlUbGHh7IgoeOFybEqlidKWRGcrDhJPRrap+ib/v20D8MbrqmvogkrrxtrUnC d8WUoQcA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wx8M1-0000000C6hC-168V; Thu, 20 Aug 2026 19:23:09 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wx8Ly-0000000C6gd-0KU4; Thu, 20 Aug 2026 19:23:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1787253782; bh=netGS3826OfdBhOGaochUMtFJf0sQLAIeCCeC64zFy4=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=Z/lECfkjbFToU3JpZ1gC29GwO0usnrecHWmwGezXDirrKDcXGevoy3GV4i64Ukya9 9PG7VNrZ2nJ8EOhReTgMvEoJsc37vG4X2yEsuLdpzmG1YAHchxwGknkCOS3laEnDdH GbT9SV5XwdQVr0KET+ok6bfPZms9H0iBaoA4stHbkawB7yC1XdnseCMHcR4q4nD/3D J0Va1mGs57pnQHVkQgDxvAHlvnfAzZ/ptDfR7Y1jnf7CQpxmIZR1CtICGW2YeeX/xg cNKlUP8bVXa5+k2jL1cI91WoBK4aWmUUcMUv/3ot36ECMMdQS/0ZQfVdpxeAkyQAOP QcMj6NvMpvxzQ== 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 0371217E0829; Thu, 20 Aug 2026 21:23:01 +0200 (CEST) Message-ID: Date: Thu, 20 Aug 2026 22:23:01 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v10 45/69] drm/vc4: hdmi: Convert to common HDMI 2.0 scrambling infrastructure 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-45-294364b2cf15@collabora.com> <20260820-tan-spoonbill-of-action-82269e@houat> Content-Language: en-US From: Cristian Ciocaltea In-Reply-To: <20260820-tan-spoonbill-of-action-82269e@houat> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260820_122306_295921_DF239D7B X-CRM114-Status: GOOD ( 13.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 8/20/26 2:24 PM, Maxime Ripard wrote: > On Fri, Jul 31, 2026 at 07:19:52PM +0300, Cristian Ciocaltea wrote: >> Replace driver local scrambling logic with the newly introduced common >> HDMI 2.0 scrambling support: >> >> - Advertise source-side scrambling capability by setting supported HDMI >> version based on the variant's max_pixel_clock. >> >> - Provide minimal .scrambler_{enable,disable} connector callbacks that >> only toggle the VC5 HDMI_SCRAMBLER_CTL register, while delegating >> sink-side SCDC programming and periodic status monitoring to >> drm_connector_hdmi_{enable,disable}_scrambling(). >> >> - Drop vc4_hdmi_reset_link() and vc4_hdmi_handle_hotplug(), switching >> the .detect_ctx() path to drm_atomic_helper_connector_hdmi_hotplug() >> which internally calls drm_connector_hdmi_sync_scdc() to trigger a >> CRTC reset on reconnection. >> >> - Drop the local scrambling_work delayed workqueue and scdc_enabled >> flag, now tracked by the common drm_connector_hdmi layer, as well as >> the now unused output_{bpc,color_format} driver data members. >> >> No functional change intended. >> >> Signed-off-by: Cristian Ciocaltea >> --- [...] >> +static int vc4_hdmi_scrambler_enable(struct drm_connector *connector) >> { >> - struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); >> - struct drm_connector *connector = &vc4_hdmi->connector; >> + struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector); >> struct drm_device *drm = connector->dev; >> - const struct drm_display_mode *mode = &vc4_hdmi->saved_adjusted_mode; >> unsigned long flags; >> int idx; >> >> - lockdep_assert_held(&vc4_hdmi->mutex); >> - >> - if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) >> - return; >> - >> - if (!drm_hdmi_mode_needs_scrambling(mode, >> - vc4_hdmi->output_bpc, >> - vc4_hdmi->output_format)) >> - return; >> - >> if (!drm_dev_enter(drm, &idx)) >> - return; >> - >> - drm_scdc_set_high_tmds_clock_ratio(connector, true); >> - drm_scdc_set_scrambling(connector, true); >> + return -ENODEV; > > Not being able to acquire the device isn't an error, it's something we should ignore. Ack, will return 0 in both cases. > >> >> spin_lock_irqsave(&vc4_hdmi->hw_lock, flags); >> HDMI_WRITE(HDMI_SCRAMBLER_CTL, HDMI_READ(HDMI_SCRAMBLER_CTL) | >> @@ -793,59 +659,27 @@ static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder) >> >> drm_dev_exit(idx); >> >> - vc4_hdmi->scdc_enabled = true; >> - >> - queue_delayed_work(system_percpu_wq, &vc4_hdmi->scrambling_work, >> - msecs_to_jiffies(SCRAMBLING_POLLING_DELAY_MS)); >> + return 0; >> } >> >> -static void vc4_hdmi_disable_scrambling(struct drm_encoder *encoder) >> +static int vc4_hdmi_scrambler_disable(struct drm_connector *connector) >> { >> - struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); >> - struct drm_connector *connector = &vc4_hdmi->connector; >> + struct vc4_hdmi *vc4_hdmi = connector_to_vc4_hdmi(connector); >> struct drm_device *drm = connector->dev; >> unsigned long flags; >> int idx; >> >> - lockdep_assert_held(&vc4_hdmi->mutex); >> - >> - if (!vc4_hdmi->scdc_enabled) >> - return; >> - >> - vc4_hdmi->scdc_enabled = false; >> - >> - if (delayed_work_pending(&vc4_hdmi->scrambling_work)) >> - cancel_delayed_work_sync(&vc4_hdmi->scrambling_work); >> - >> if (!drm_dev_enter(drm, &idx)) >> - return; >> + return -ENODEV; > > Ditto > > Maxime