From: Ryan Walklin <ryan@testtoast.com>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>
Cc: Andre Przywara <andre.przywara@arm.com>,
Chris Morgan <macroalpha82@gmail.com>,
John Watts <contact@jookia.org>,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, devicetree@vger.kernel.org,
linux-clk@vger.kernel.org, Ryan Walklin <ryan@testtoast.com>
Subject: [PATCH v4 09/26] drm: sun4i: de3: pass engine reference to ccsc setup function
Date: Sat, 21 Sep 2024 21:45:58 +1200 [thread overview]
Message-ID: <20240921095153.213568-10-ryan@testtoast.com> (raw)
In-Reply-To: <20240921095153.213568-1-ryan@testtoast.com>
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Configuration of the DE3 colorspace and dynamic range correction module
requires knowledge of the current video format and encoding.
Pass the display engine by reference to the csc setup function, rather
than the register map alone, to allow access to this information.
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Ryan Walklin <ryan@testtoast.com>
---
drivers/gpu/drm/sun4i/sun8i_csc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun8i_csc.c b/drivers/gpu/drm/sun4i/sun8i_csc.c
index 68d955c63b05b..8a336ccb27d33 100644
--- a/drivers/gpu/drm/sun4i/sun8i_csc.c
+++ b/drivers/gpu/drm/sun4i/sun8i_csc.c
@@ -148,17 +148,19 @@ static void sun8i_csc_setup(struct regmap *map, u32 base,
regmap_write(map, SUN8I_CSC_CTRL(base), val);
}
-static void sun8i_de3_ccsc_setup(struct regmap *map, int layer,
+static void sun8i_de3_ccsc_setup(struct sunxi_engine *engine, int layer,
enum format_type fmt_type,
enum drm_color_encoding encoding,
enum drm_color_range range)
{
u32 addr, val, mask;
+ struct regmap *map;
const u32 *table;
int i;
mask = SUN50I_MIXER_BLEND_CSC_CTL_EN(layer);
table = yuv2rgb_de3[range][encoding];
+ map = engine->regs;
switch (fmt_type) {
case FORMAT_TYPE_RGB:
@@ -204,7 +206,7 @@ void sun8i_csc_set_ccsc(struct sun8i_mixer *mixer, int layer,
u32 base;
if (mixer->cfg->is_de3) {
- sun8i_de3_ccsc_setup(mixer->engine.regs, layer,
+ sun8i_de3_ccsc_setup(&mixer->engine, layer,
fmt_type, encoding, range);
return;
}
--
2.46.1
next prev parent reply other threads:[~2024-09-21 10:03 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-21 9:45 [PATCH v4 00/26] drm: sun4i: add Display Engine 3.3 (DE33) support Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 01/26] drm: sun4i: de2/de3: Change CSC argument Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 02/26] drm: sun4i: de2/de3: Merge CSC functions into one Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 03/26] drm: sun4i: de2/de3: call csc setup also for UI layer Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 04/26] drm: sun4i: de2: Initialize layer fields earlier Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 05/26] drm: sun4i: de3: Add YUV formatter module Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 06/26] drm: sun4i: de3: add format enumeration function to engine Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 07/26] drm: sun4i: de3: add formatter flag to mixer config Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 08/26] drm: sun4i: de3: add YUV support to the DE3 mixer Ryan Walklin
2024-09-21 9:45 ` Ryan Walklin [this message]
2024-09-21 9:45 ` [PATCH v4 10/26] drm: sun4i: de3: add YUV support to the color space correction module Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 11/26] drm: sun4i: de3: add YUV support to the TCON Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 12/26] drm: sun4i: support YUV formats in VI scaler Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 13/26] drm: sun4i: de2/de3: add mixer version enum Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 14/26] drm: sun4i: de2/de3: refactor mixer initialisation Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 15/26] drm: sun4i: vi_scaler refactor vi_scaler enablement Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 16/26] drm: sun4i: de2/de3: add generic blender register reference function Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 17/26] drm: sun4i: de2/de3: use generic register reference function for layer configuration Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 18/26] drm: sun4i: de3: Implement AFBC support Ryan Walklin
2024-09-25 8:23 ` Dan Carpenter
2024-09-21 9:46 ` [PATCH v4 19/26] dt-bindings: allwinner: add H616 DE33 bus binding Ryan Walklin
2024-09-22 20:52 ` Krzysztof Kozlowski
2024-09-21 9:46 ` [PATCH v4 20/26] dt-bindings: allwinner: add H616 DE33 clock binding Ryan Walklin
2024-09-22 20:52 ` Krzysztof Kozlowski
2024-09-21 9:46 ` [PATCH v4 21/26] dt-bindings: allwinner: add H616 DE33 mixer binding Ryan Walklin
2024-09-22 20:52 ` Krzysztof Kozlowski
2024-09-29 8:52 ` Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 22/26] clk: sunxi-ng: ccu: add Display Engine 3.3 (DE33) support Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 23/26] drm: sun4i: de33: mixer: " Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 24/26] drm: sun4i: de33: vi_scaler: " Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 25/26] drm: sun4i: de33: fmt: " Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 26/26] drm: sun4i: de33: csc: " Ryan Walklin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240921095153.213568-10-ryan@testtoast.com \
--to=ryan@testtoast.com \
--cc=airlied@gmail.com \
--cc=andre.przywara@arm.com \
--cc=conor+dt@kernel.org \
--cc=contact@jookia.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jernej.skrabec@gmail.com \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=maarten.lankhorst@linux.intel.com \
--cc=macroalpha82@gmail.com \
--cc=mripard@kernel.org \
--cc=mturquette@baylibre.com \
--cc=robh@kernel.org \
--cc=samuel@sholland.org \
--cc=sboyd@kernel.org \
--cc=tzimmermann@suse.de \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).