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 BE1B1477E40 for ; Mon, 12 Oct 2026 22:38: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=1791844710; cv=none; b=fhQcni3DFsOyR9bqR/t+JMxVLjeYZ44QsUEMJzs2EDIakliDowB8m4wRD/lOMq2g24geesi05UPLapYBfsip7s8FZiua/mv1V82V5olJUv7cMg5WjesdL2X8jswGDOpgckh7ZMh26TkcgaZydiYQmpVMwi+64LKcDXezV0qbIjg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791844710; c=relaxed/simple; bh=jDidYoOUFS4b/LIyjavaBdXQusepb/47uBSH3WmhCBs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=u5FzxO3f5bJSfwS+4XkttAl6Bw3PXCN9kR+ov4JJsqgX/hcyMTFnb2P+07Dri7Gv4AeaeaESkm+3Kod9A3AwxWmWg1SQVAgNJO21ScbsIF6mPReDUEqEKfZmFuSDrWIYixGdVkTy5fGbu4fnLF8WT0w/AjU1l5tEqDbDqJU4qlU= 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=hPAZpnC3; 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="hPAZpnC3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1791844700; bh=jDidYoOUFS4b/LIyjavaBdXQusepb/47uBSH3WmhCBs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hPAZpnC3QQy/O/ZMrlUMy9YuXwghEkaVExAZGmhI0JBzmWdwgrVehTNqZ9qpU+4XR 3TbNMzeQbGX66xke2zTcLIVgjhR3K0bjjxt2j+ilwzcWJXcFPDOXBPrYwE22OfsVDL n/j0rohhzlvmHkRC2orF3imSCfcoqYtPm1n1Pshibz6UEs01AHj3Tlgn4ORgj3aUJo 0w3n23rNdl4JeY7OYzOVYJVq4j9T/u4m+K3If9+jUFvK+lRo2c0kGixaB+B3Ep6hKy MaM9POauk9qaI/H032vJ+/PNO3YRJ+6hf63ilbwSbM5q1OgPZARFVTpzPxqtC3lgq5 1UF9HBMltXhgQ== 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 BCEF217E0943; Tue, 13 Oct 2026 00:38:20 +0200 (CEST) From: Cristian Ciocaltea Date: Tue, 13 Oct 2026 01:37:43 +0300 Subject: [PATCH v2 3/8] drm/vc4: hdmi: Switch to drm_hdmi_mode_needs_scrambling() 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: 7bit Message-Id: <20261013-vc4-common-scramb-v2-3-a41d15e131ad@collabora.com> References: <20261013-vc4-common-scramb-v2-0-a41d15e131ad@collabora.com> In-Reply-To: <20261013-vc4-common-scramb-v2-0-a41d15e131ad@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 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 e61f1b694dbe..60c2c655b2e9 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -130,15 +130,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; @@ -313,7 +304,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) { @@ -443,7 +434,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."); } @@ -803,7 +795,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