From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=148.251.105.195 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794269624; b=sAKR8SsbR5yZaa/lh8X3MWypOi3ya9U7wNnOVmaaLbc7KzfMvXj8XaphTAr66ofI5WMd HdMgci4tfCXarJeiOX+noxW9YV7Ievh/HGCZ3KNgnF36XHcmHUbuyjwJr6894vSuNaLPg W0XpJdboB0nF+IIBD9oAihDxNu74K9ie4MHmmEK0J3RzgAufUr5fNbNft+tw3fHVJkHxL 9paGIPzhCFzytbgAWwq8hJzsfbZaAEy39WA2oaEO8LfYh9KLWnm3iAb2WUVqhiiS5kyCl f3muRknHIrxTZhdRzP20fV0l4va3iy8QB3yWNPnbzGITtFIB6ZSJedpvQlicI/xXeKQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794269624; h=DMARC-Filter:DKIM-Signature:Received:From:Date:Subject:MIME-Version: Content-Type:Content-Transfer-Encoding:Message-Id:References: In-Reply-To:To:Cc:X-Mailer; bh=yrGclO4/aoEe927BbVMTUA4tFEEdMcd1zZBu4QwOF9c=; b=WgvRuTYhg0kOrXDwVefwxtj862HRe1eN5pBxg1iVewcCP85zBhZ4VZsW1Ij1pCz74Iu5 /mBfgHMFV+CaSowa9yZekBlXy6On3BMB7nqLkvBbbWaW7+LuQ1GqtiegasuApD8HrsBuI eSr1l43d5qiQXJJaOFvLIdx6LjNUZaL3O0CyLfxpVlVb0/+TtSocC5lDV5oT4oIKhClUZ pu+xacbeOeoTmDrwb5wLnUnWJLHRR3v3gj4l0leSUXk8ZeUjQek8kr3ztTTGZA7CgY/eE IH7xUFHnKlsAM+TLq7IWWggr0oXJiR5wYzJYrlWzu04Srt6svesGp7hZz0UnqMx3B+g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass header.d=collabora.com header.i=@collabora.com header.a=rsa-sha256 header.s=mail header.b=jFUiKDm6; arc=none smtp.remote-ip=148.251.105.195 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 767FB606A334 for ; Tue, 10 Nov 2026 00:13:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 767FB606A334 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.a=rsa-sha256 header.s=mail header.b=jFUiKDm6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1794269621; bh=t0o7CEzI07tAoH2hLqfIQRg+o6LZrPzh4NSjQxogkOo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=jFUiKDm65jEPBGJqIZoqdHOpkCx1rKgH34HYCCoslIgFy4uzdb4t6/BePZJfYyOOt 2U31rifTzkTGvRnzTR0cc9OeixTZSQ+QohdAHJ0pOUTP97QYc8RvmGiev1qIeARiNj p0ZBQ42Ay7Gru3osjS4FRhUh8+cvuyuGSfRX0n6nD7HvQfrASK0PNganI4YsfumnxQ LlmzJ3zsZGPs/W2eE258USk3uy0V37YPvtLgFgbiXz+ZEftwu3EuW/43YGqtFdSIZl dUwX+Xc43haUBBSj+MRMNzq7vrH20mWXJ5A0Gv+VXtmwiu48c+nKJ+Whfzt1odXPLW a7fHgGQYPzsKg== Received: from localhost (unknown [100.64.0.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange secp256r1 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by bali.collaboradmins.com (Postfix) with ESMTPSA id B5D6F17E04B4; Tue, 10 Nov 2026 01:13:41 +0100 (CET) From: Cristian Ciocaltea Date: Tue, 10 Nov 2026 02:13:39 +0200 Subject: [PATCH v4 2/9] drm/vc4: hdmi: Switch to drm_hdmi_mode_needs_scrambling() X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261110-vc4-common-scramb-v4-2-eaa141a0da0f@collabora.com> References: <20261110-vc4-common-scramb-v4-0-eaa141a0da0f@collabora.com> In-Reply-To: <20261110-vc4-common-scramb-v4-0-eaa141a0da0f@collabora.com> To: Maxime Ripard , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance , Maarten Lankhorst , Thomas Zimmermann , David Airlie , Simona Vetter Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Lucas Tanure X-Mailer: b4 0.15.2 The VC4 HDMI driver has a local helper to check whether a mode requires scrambling. It is equivalent to drm_hdmi_mode_needs_scrambling(), so use the common helper instead. No functional change intended. Acked-by: Maxime Ripard Signed-off-by: Cristian Ciocaltea --- drivers/gpu/drm/vc4/vc4_hdmi.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 22533f1c6207..d9383af60906 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -129,15 +129,6 @@ static bool vc4_hdmi_supports_scrambling(struct vc4_hdmi *vc4_hdmi) return true; } -static bool vc4_hdmi_mode_needs_scrambling(const struct drm_display_mode *mode, - unsigned int bpc, - enum drm_output_color_format fmt) -{ - unsigned long long clock = drm_hdmi_compute_mode_clock(mode, bpc, fmt); - - return clock > HDMI_1_3_TMDS_CHAR_RATE_MAX_HZ; -} - static int vc4_hdmi_debugfs_regs(struct seq_file *m, void *unused) { struct drm_debugfs_entry *entry = m->private; @@ -312,7 +303,7 @@ static int vc4_hdmi_reset_link(struct drm_connector *connector, return 0; } - scrambling_needed = vc4_hdmi_mode_needs_scrambling(&vc4_hdmi->saved_adjusted_mode, + scrambling_needed = drm_hdmi_mode_needs_scrambling(&vc4_hdmi->saved_adjusted_mode, vc4_hdmi->output_bpc, vc4_hdmi->output_format); if (!scrambling_needed) { @@ -442,7 +433,8 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector) const struct drm_display_mode *mode; list_for_each_entry(mode, &connector->probed_modes, head) { - if (vc4_hdmi_mode_needs_scrambling(mode, 8, DRM_OUTPUT_COLOR_FORMAT_RGB444)) { + if (drm_hdmi_mode_needs_scrambling(mode, 8, + DRM_OUTPUT_COLOR_FORMAT_RGB444)) { drm_warn_once(drm, "The core clock cannot reach frequencies high enough to support 4k @ 60Hz."); drm_warn_once(drm, "Please change your config.txt file to add hdmi_enable_4kp60."); } @@ -819,7 +811,7 @@ static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder) if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) return; - if (!vc4_hdmi_mode_needs_scrambling(mode, + if (!drm_hdmi_mode_needs_scrambling(mode, vc4_hdmi->output_bpc, vc4_hdmi->output_format)) return; -- 2.55.0