From nobody Fri Dec 19 15:32:06 2025 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6717E2F7AB9 for ; Sun, 12 Oct 2025 19:23:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760297038; cv=none; b=CXuaDyE3VAfH9nhZEgcUc2B5GerMLTF3FZWk79apkyNyZPaBDKOTkienodE1O8YFGfDURyOVnYlGJDlmH/v4lug5LIIA4sxUl0G5SOZEg/QZmVKujMJtioqfMuM4SPrA4pZNqbfyyFh8luXOCdol8U9n++4p2zHquWN9Sv4oYHk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760297038; c=relaxed/simple; bh=cQ3BDWz3+BQP/wtA4CRUpOhEhzqT72tIcXggJtG7sus=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NAaxZ9v6YI41jtFWlggCpScgaKq9/kl8vjUmE6IVssSo/1Xv50+i99RZKjh6BZGnuM7Mn5QJQjbYKQ2DvanPdMZqo2mzoKJSWn8FH83T/JJLMNDm51OWfZJBwSMXLUslFC+XdiajlYFXHl+EJiRLWtxSlWu02FqQqh6CwoiUxFc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AHZannk2; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AHZannk2" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-b3b27b50090so653289766b.0 for ; Sun, 12 Oct 2025 12:23:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1760297035; x=1760901835; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qN9JZUnTMzqv0Kva4/oSm7+m7qLCjBjh91j5rj1nu0o=; b=AHZannk2km0RJ/HXbAoCM3lnUY3qUQwkf960BxKon20kZx2/IyDIHokM0KuQiZQH78 A5WUR2+U3wsvjzgeIuy/01f6Ywl3mFUMDQk6YyUFD5ZhlqHGZ/CybNLZvHUV2CUY1zq2 Zo0M92yGYipSOklQdah46XLKbbEzVGNBgvPei872PiVTPOOwBT9RUrz0/7v7O7o+iCed gKBUSoCpkLNzUyNXEx5JHUYbR7z7Vt20sNKRzCwJvRJBePJkmK1fqD8dkGgJIyWUZMmF zOoSgW7KMWhR/aj++O25jFp1P4G1sdCWdHstEo6hn3L0C3a1L1TCcs1uzr4+9mERfl4u 8xIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760297035; x=1760901835; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qN9JZUnTMzqv0Kva4/oSm7+m7qLCjBjh91j5rj1nu0o=; b=wNO4URR11efA13Hh1vXWZZBB/PJfqmGIvL7gJ3PaFl0SPhaw2ROQ95lCNd0aDpcaXM dpyAXFvlXxP30SDc4AxESOMOOat25tBtGA61Bhkw3yf7nviAFnTOEX+cAbwGAHl2GUDr CIQrQqL8Xyk4xPCTQrN6qdOj9m2we8DfwmQrbNsOenuZZQK6BGphVIekr8XvOqM3iO16 AEZFQuKp5tpA+w50LMQ5G1r0yXqdDVew6binoMoB05AU7B//MKoovjZhsyHMmFHLYF+s mS4sv5v5qG7AFQRrki5KNHw0LGVg1oWeuoJfSBCkEpnVVrEsoCvGOkbBcQBBXYo47Q3D TIkw== X-Forwarded-Encrypted: i=1; AJvYcCUHLfpKSF3rRFktqtzhJNYReQ1k+3hjD3lquLBGsrSkdTi+JhFHDwIs/twpi0SLj7/AW8TRYJ9Aa52C2kc=@vger.kernel.org X-Gm-Message-State: AOJu0YwMLFWPbpQ/YmiTrqu+HSjNi1VC7BNw88AQ/Axl31QjBPzxzcSd 1N+wnsuoxrfeMwB9U4AJKMPS24dfLjXuGYC/5eWQo7Y21Nq9wMEBhI/W X-Gm-Gg: ASbGncsHZ41BRlLa+2aT+TBX8Wq9RNQk/E5kz+ES85PyRkcni5LfxyruU6TsyGlVqnu LMLeWMlvIEJ8/WK63y1zDOZ0Qludn9cW7Sz5l6EyOVJnKUc437lI1r3qN/grZfMobpJ3nZGCat1 JBClsNXUDjAA/JanttDtmhrvpxKDj2BbWwC1YaQ1NZJ4njSuTXRJSyDAjU619yZsnxwMs5xfj5g uEeliF2j5aC/oOgyhaIDl2c+9TcWVoxsriUUAJcyJ676OVVGFLOe8IFUDSx037+Wku9Jvc2UJ56 16CYT17D96+nb7RKAVwlPtxLcsXAGMS2s08Dj9J1nkuZyU6zz/0EqnqAJ8EjqeNy737U6UzwfTv xMAWbl/1nr2t/hdGuUVZsfZdubT2JRhdJ7RPTZRsxt81kiJyP6JAWKYameERHIYk4dY39+/qHc5 3mfcZnvvSgv6hUKXaaSTLS X-Google-Smtp-Source: AGHT+IEtEdBabmTMqnIubXcrSPakmD6rKWlEr2K1/L9cKjSZtJR06uujVWalB21YsUjTI/XrkX/8/g== X-Received: by 2002:a17:906:dc8d:b0:b4e:b7ee:deea with SMTP id a640c23a62f3a-b50aae98206mr2123778566b.27.1760297034667; Sun, 12 Oct 2025 12:23:54 -0700 (PDT) Received: from jernej-laptop (178-79-73-218.dynamic.telemach.net. [178.79.73.218]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b55d67d8283sm760176466b.38.2025.10.12.12.23.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Oct 2025 12:23:54 -0700 (PDT) From: Jernej Skrabec 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 Subject: [PATCH 12/30] drm/sun4i: csc: Simplify arguments with taking plane state Date: Sun, 12 Oct 2025 21:23:12 +0200 Message-ID: <20251012192330.6903-13-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251012192330.6903-1-jernej.skrabec@gmail.com> References: <20251012192330.6903-1-jernej.skrabec@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Taking plane state directly reduces number of arguments, avoids copying values and allows making additional decisions. For example, when plane is disabled, CSC should be turned off. This is also cleanup for later patches which will move call to another place. Signed-off-by: Jernej Skrabec Reviewed-by: Chen-Yu Tsai --- drivers/gpu/drm/sun4i/sun8i_csc.c | 42 +++++++++++++++++++++++--- drivers/gpu/drm/sun4i/sun8i_csc.h | 11 ++----- drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 33 +------------------- 3 files changed, 40 insertions(+), 46 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.c b/drivers/gpu/drm/sun4i/sun8= i_csc.c index cf0c5121661b..ac7b62adc7df 100644 --- a/drivers/gpu/drm/sun4i/sun8i_csc.c +++ b/drivers/gpu/drm/sun4i/sun8i_csc.c @@ -3,11 +3,20 @@ * Copyright (C) Jernej Skrabec */ =20 +#include +#include +#include #include =20 #include "sun8i_csc.h" #include "sun8i_mixer.h" =20 +enum sun8i_csc_mode { + SUN8I_CSC_MODE_OFF, + SUN8I_CSC_MODE_YUV2RGB, + SUN8I_CSC_MODE_YVU2RGB, +}; + static const u32 ccsc_base[][2] =3D { [CCSC_MIXER0_LAYOUT] =3D {CCSC00_OFFSET, CCSC01_OFFSET}, [CCSC_MIXER1_LAYOUT] =3D {CCSC10_OFFSET, CCSC11_OFFSET}, @@ -196,21 +205,44 @@ static void sun8i_de3_ccsc_setup(struct regmap *map, = int layer, mask, val); } =20 +static u32 sun8i_csc_get_mode(struct drm_plane_state *state) +{ + const struct drm_format_info *format; + + if (!state->crtc || !state->visible) + return SUN8I_CSC_MODE_OFF; + + format =3D state->fb->format; + if (!format->is_yuv) + return SUN8I_CSC_MODE_OFF; + + switch (format->format) { + case DRM_FORMAT_YVU411: + case DRM_FORMAT_YVU420: + case DRM_FORMAT_YVU422: + case DRM_FORMAT_YVU444: + return SUN8I_CSC_MODE_YVU2RGB; + default: + return SUN8I_CSC_MODE_YUV2RGB; + } +} + void sun8i_csc_config(struct sun8i_mixer *mixer, int layer, - enum sun8i_csc_mode mode, - enum drm_color_encoding encoding, - enum drm_color_range range) + struct drm_plane_state *state) { + u32 mode =3D sun8i_csc_get_mode(state); u32 base; =20 if (mixer->cfg->de_type =3D=3D SUN8I_MIXER_DE3) { sun8i_de3_ccsc_setup(mixer->engine.regs, layer, - mode, encoding, range); + mode, state->color_encoding, + state->color_range); return; } =20 base =3D ccsc_base[mixer->cfg->ccsc][layer]; =20 sun8i_csc_setup(mixer->engine.regs, base, - mode, encoding, range); + mode, state->color_encoding, + state->color_range); } diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.h b/drivers/gpu/drm/sun4i/sun8= i_csc.h index 27b6807fc786..ce921521aaca 100644 --- a/drivers/gpu/drm/sun4i/sun8i_csc.h +++ b/drivers/gpu/drm/sun4i/sun8i_csc.h @@ -8,6 +8,7 @@ =20 #include =20 +struct drm_plane_state; struct sun8i_mixer; =20 /* VI channel CSC units offsets */ @@ -22,15 +23,7 @@ struct sun8i_mixer; =20 #define SUN8I_CSC_CTRL_EN BIT(0) =20 -enum sun8i_csc_mode { - SUN8I_CSC_MODE_OFF, - SUN8I_CSC_MODE_YUV2RGB, - SUN8I_CSC_MODE_YVU2RGB, -}; - void sun8i_csc_config(struct sun8i_mixer *mixer, int layer, - enum sun8i_csc_mode mode, - enum drm_color_encoding encoding, - enum drm_color_range range); + struct drm_plane_state *state); =20 #endif diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i= /sun8i_vi_layer.c index adcd05acba1b..cf83f7ce6c78 100644 --- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c @@ -188,36 +188,6 @@ static void sun8i_vi_layer_update_coord(struct sun8i_m= ixer *mixer, int channel, SUN8I_MIXER_CHAN_VI_DS_M(vm)); } =20 -static u32 sun8i_vi_layer_get_csc_mode(const struct drm_format_info *forma= t) -{ - if (!format->is_yuv) - return SUN8I_CSC_MODE_OFF; - - switch (format->format) { - case DRM_FORMAT_YVU411: - case DRM_FORMAT_YVU420: - case DRM_FORMAT_YVU422: - case DRM_FORMAT_YVU444: - return SUN8I_CSC_MODE_YVU2RGB; - default: - return SUN8I_CSC_MODE_YUV2RGB; - } -} - -static void sun8i_vi_layer_update_colors(struct sun8i_mixer *mixer, int ch= annel, - int overlay, struct drm_plane *plane) -{ - struct drm_plane_state *state =3D plane->state; - const struct drm_format_info *fmt; - u32 csc_mode; - - fmt =3D state->fb->format; - csc_mode =3D sun8i_vi_layer_get_csc_mode(fmt); - sun8i_csc_config(mixer, channel, csc_mode, - state->color_encoding, - state->color_range); -} - static void sun8i_vi_layer_update_buffer(struct sun8i_mixer *mixer, int ch= annel, int overlay, struct drm_plane *plane) { @@ -333,8 +303,7 @@ static void sun8i_vi_layer_atomic_update(struct drm_pla= ne *plane, layer->overlay, plane); sun8i_vi_layer_update_coord(mixer, layer->channel, layer->overlay, plane); - sun8i_vi_layer_update_colors(mixer, layer->channel, - layer->overlay, plane); + sun8i_csc_config(mixer, layer->channel, new_state); sun8i_vi_layer_update_buffer(mixer, layer->channel, layer->overlay, plane); } --=20 2.51.0