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 07/23] drm: sun4i: de3: add formatter flag to mixer config
Date: Thu, 20 Jun 2024 23:29:45 +1200 [thread overview]
Message-ID: <20240620113150.83466-8-ryan@testtoast.com> (raw)
In-Reply-To: <20240620113150.83466-1-ryan@testtoast.com>
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Only the DE3 (and newer) display engines have a formatter module. This
could be inferred from the is_de3 flag alone, however this will not
scale with addition of future DE versions in subsequent patches.
Add a separate flag to signal this in the mixer configuration.
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Ryan Walklin <ryan@testtoast.com>
---
drivers/gpu/drm/sun4i/sun8i_mixer.c | 1 +
drivers/gpu/drm/sun4i/sun8i_mixer.h | 2 ++
2 files changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index 01382860aaeea..0738ee6446330 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -653,6 +653,7 @@ static const struct sun8i_mixer_cfg sun50i_a64_mixer1_cfg = {
static const struct sun8i_mixer_cfg sun50i_h6_mixer0_cfg = {
.ccsc = CCSC_MIXER0_LAYOUT,
.is_de3 = true,
+ .has_formatter = 1,
.mod_rate = 600000000,
.scaler_mask = 0xf,
.scanline_yuv = 4096,
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.h b/drivers/gpu/drm/sun4i/sun8i_mixer.h
index 85c94884fb9a4..13401643c7bfc 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.h
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h
@@ -162,6 +162,7 @@ enum {
* @mod_rate: module clock rate that needs to be set in order to have
* a functional block.
* @is_de3: true, if this is next gen display engine 3.0, false otherwise.
+ * @has_formatter: true, if mixer has formatter core, for 10-bit and YUV handling
* @scaline_yuv: size of a scanline for VI scaler for YUV formats.
*/
struct sun8i_mixer_cfg {
@@ -171,6 +172,7 @@ struct sun8i_mixer_cfg {
int ccsc;
unsigned long mod_rate;
unsigned int is_de3 : 1;
+ unsigned int has_formatter : 1;
unsigned int scanline_yuv;
};
--
2.45.2
next prev parent reply other threads:[~2024-06-20 11:32 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 11:29 [PATCH 00/23] drm: sun4i: add Display Engine 3.3 (DE33) support Ryan Walklin
2024-06-20 11:29 ` [PATCH 01/23] drm: sun4i: de2/de3: Change CSC argument Ryan Walklin
2024-06-25 0:27 ` Andre Przywara
2024-06-20 11:29 ` [PATCH 02/23] drm: sun4i: de2/de3: Merge CSC functions into one Ryan Walklin
2024-06-20 11:29 ` [PATCH 03/23] drm: sun4i: de2/de3: call csc setup also for UI layer Ryan Walklin
2024-06-20 11:29 ` [PATCH 04/23] drm: sun4i: de2: Initialize layer fields earlier Ryan Walklin
2024-06-20 11:29 ` [PATCH 05/23] drm: sun4i: de3: Add YUV formatter module Ryan Walklin
2024-06-20 11:29 ` [PATCH 06/23] drm: sun4i: de3: add format enumeration function to engine Ryan Walklin
2024-06-20 11:29 ` Ryan Walklin [this message]
2024-06-20 11:29 ` [PATCH 08/23] drm: sun4i: de3: add YUV support to the DE3 mixer Ryan Walklin
2024-06-20 11:29 ` [PATCH 09/23] drm: sun4i: de3: pass engine reference to ccsc setup function Ryan Walklin
2024-06-20 11:29 ` [PATCH 10/23] drm: sun4i: de3: add YUV support to the color space correction module Ryan Walklin
2024-06-20 11:29 ` [PATCH 11/23] drm: sun4i: de3: add YUV support to the TCON Ryan Walklin
2024-06-20 11:29 ` [PATCH 12/23] drm: sun4i: support YUV formats in VI scaler Ryan Walklin
2024-06-20 11:29 ` [PATCH 13/23] drm: sun4i: de2/de3: add mixer version enum Ryan Walklin
2024-06-25 0:27 ` Andre Przywara
2024-06-20 11:29 ` [PATCH 14/23] drm: sun4i: de2/de3: refactor mixer initialisation Ryan Walklin
2024-06-25 0:28 ` Andre Przywara
2024-06-25 1:23 ` Ryan Walklin
2024-06-20 11:29 ` [PATCH 15/23] drm: sun4i: vi_scaler refactor vi_scaler enablement Ryan Walklin
2024-06-20 11:29 ` [PATCH 16/23] drm: sun4i: de2/de3: make blender register references generic Ryan Walklin
2024-06-20 11:29 ` [PATCH 17/23] drm: sun4i: de3: Implement AFBC support Ryan Walklin
2024-06-20 11:29 ` [PATCH 18/23] dt-bindings: allwinner: add H616 DE33 bus, clock and display bindings Ryan Walklin
2024-06-20 12:25 ` Rob Herring (Arm)
2024-06-25 0:37 ` Andre Przywara
2024-06-25 1:24 ` Ryan Walklin
2024-06-20 11:29 ` [PATCH 19/23] clk: sunxi-ng: ccu: add Display Engine 3.3 (DE33) support Ryan Walklin
2024-06-20 11:29 ` [PATCH 20/23] drm: sun4i: de33: mixer: " Ryan Walklin
2024-06-20 11:29 ` [PATCH 21/23] drm: sun4i: de33: vi_scaler: " Ryan Walklin
2024-06-20 11:30 ` [PATCH 22/23] drm: sun4i: de33: fmt: " Ryan Walklin
2024-06-20 11:30 ` [PATCH 23/23] 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=20240620113150.83466-8-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).