diff mbox series

[25/30] drm/sun4i: ui_scaler: drop sanity checks

Message ID	20251012192330.6903-26-jernej.skrabec@gmail.com (mailing list archive)
State	New
Headers	From: Jernej Skrabec <jernej.skrabec@gmail.com> To: mripard@kernel.org, wens@csie.org Cc: maarten.lankhorst@linux.intel.com, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, samuel@sholland.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Jernej Skrabec <jernej.skrabec@gmail.com> Subject: [PATCH 25/30] drm/sun4i: ui_scaler: drop sanity checks Date: Sun, 12 Oct 2025 21:23:25 +0200 Message-ID: <20251012192330.6903-26-jernej.skrabec@gmail.com> In-Reply-To: <20251012192330.6903-1-jernej.skrabec@gmail.com> References: <20251012192330.6903-1-jernej.skrabec@gmail.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Status: O
Series	drm/sun4i: Refactor layer code for proper DE33 support \| [00/30] drm/sun4i: Refactor layer code for proper DE33 support [01/30] drm/sun4i: mixer: Fix up DE33 channel macros [02/30] drm/sun4i: mixer: Remove ccsc cfg for >= DE3 [03/30] drm/sun4i: de2: Initialize layer fields earlier [04/30] drm/sun4i: ui_layer: Move check from update to check callback [05/30] drm/sun4i: vi_layer: Move check from update to check callback [06/30] drm/sun4i: layers: Make atomic commit functions void [07/30] drm/sun4i: Move blender config from layers to mixer [08/30] drm/sun4i: ui layer: Write attributes in one go [09/30] drm/sun4i: vi layer: Write attributes in one go [10/30] drm/sun4i: mixer: Remove setting layer enable bit [11/30] drm/sun4i: de2/de3: Simplify CSC config interface [12/30] drm/sun4i: csc: Simplify arguments with taking plane state [13/30] drm/sun4i: de2/de3: Move plane type determination to mixer [14/30] drm/sun4i: ui_layer: Change index meaning [15/30] drm/sun4i: layer: move num of planes calc out of layer code [16/30] drm/sun4i: ui_layer: use layer struct instead of multiple args [17/30] drm/sun4i: vi_layer: use layer struct instead of multiple args [18/30] drm/sun4i: ui_scaler: use layer instead of mixer for args [19/30] drm/sun4i: vi_scaler: use layer instead of mixer for args [20/30] drm/sun4i: layers: Make regmap for layers configurable [21/30] drm/sun4i: csc: use layer arg instead of mixer [22/30] drm/sun4i: layers: add physical index arg [23/30] drm/sun4i: vi_scaler: Update DE33 base calculation [24/30] drm/sun4i: mixer: Convert heuristics to quirk [25/30] drm/sun4i: ui_scaler: drop sanity checks [26/30] drm/sun4i: mixer: Add quirk for number of VI scalers [27/30] drm/sun4i: mixer: split out layer config [28/30] drm/sun4i: layer: replace mixer with layer struct [29/30] drm/sun4i: vi_scaler: Find mixer from crtc [30/30] drm/sun4i: Nuke mixer pointer from layer code

Commit Message

Jernej Skrabec Oct. 12, 2025, 7:23 p.m. UTC

They can't be triggered if mixer configuration is properly specified in
quirks. Additionally, number of VI channels won't be available in future
due to rework for DE33 support.

Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
 drivers/gpu/drm/sun4i/sun8i_ui_scaler.c | 6 ------
 1 file changed, 6 deletions(-)

diff mbox series

Patch

diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_scaler.c b/drivers/gpu/drm/sun4i/sun8i_ui_scaler.c
index 2fc54dc20307..c0947ccf675b 100644
--- a/drivers/gpu/drm/sun4i/sun8i_ui_scaler.c
+++ b/drivers/gpu/drm/sun4i/sun8i_ui_scaler.c
@@ -132,9 +132,6 @@  void sun8i_ui_scaler_enable(struct sun8i_layer *layer, bool enable)
 	struct sun8i_mixer *mixer = layer->mixer;
 	u32 val, base;
 
-	if (WARN_ON(layer->channel < mixer->cfg->vi_num))
-		return;
-
 	base = sun8i_ui_scaler_base(mixer, layer->channel);
 
 	if (enable)
@@ -155,9 +152,6 @@  void sun8i_ui_scaler_setup(struct sun8i_layer *layer,
 	int i, offset;
 	u32 base;
 
-	if (WARN_ON(layer->channel < mixer->cfg->vi_num))
-		return;
-
 	base = sun8i_ui_scaler_base(mixer, layer->channel);
 
 	hphase <<= SUN8I_UI_SCALER_PHASE_FRAC - 16;