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>,
Hironori KIKUCHI <kikuchan98@gmail.com>,
Philippe Simons <simons.philippe@gmail.com>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.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 v6 26/27] drm: sun4i: de33: fmt: add Display Engine 3.3 (DE33) support
Date: Sun, 16 Feb 2025 21:50:57 +1300 [thread overview]
Message-ID: <20250216085432.6373-28-ryan@testtoast.com> (raw)
In-Reply-To: <20250216085432.6373-2-ryan@testtoast.com>
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Like the DE3, the DE33 has a FMT (formatter) module, which
provides YUV444 to YUV422/YUV420 conversion, format re-mapping and color
depth conversion, although the DE33 module appears significantly more
capable, including up to 4K video support.
Add support for the DE33.
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Ryan Walklin <ryan@testtoast.com>
---
drivers/gpu/drm/sun4i/sun50i_fmt.c | 21 +++++++++++++++++++--
drivers/gpu/drm/sun4i/sun50i_fmt.h | 1 +
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun50i_fmt.c b/drivers/gpu/drm/sun4i/sun50i_fmt.c
index 376a3c9b993f4..03d5d7132d1aa 100644
--- a/drivers/gpu/drm/sun4i/sun50i_fmt.c
+++ b/drivers/gpu/drm/sun4i/sun50i_fmt.c
@@ -51,6 +51,19 @@ static void sun50i_fmt_de3_limits(u32 *limits, u32 colorspace, bool bit10)
}
}
+static void sun50i_fmt_de33_limits(u32 *limits, u32 colorspace)
+{
+ if (colorspace == SUN50I_FMT_CS_YUV444RGB) {
+ limits[0] = SUN50I_FMT_LIMIT(0, 4095);
+ limits[1] = SUN50I_FMT_LIMIT(0, 4095);
+ limits[2] = SUN50I_FMT_LIMIT(0, 4095);
+ } else {
+ limits[0] = SUN50I_FMT_LIMIT(256, 3840);
+ limits[1] = SUN50I_FMT_LIMIT(256, 3840);
+ limits[2] = SUN50I_FMT_LIMIT(256, 3840);
+ }
+}
+
void sun50i_fmt_setup(struct sun8i_mixer *mixer, u16 width, u16 height)
{
u32 colorspace, limit[3], base;
@@ -61,10 +74,14 @@ void sun50i_fmt_setup(struct sun8i_mixer *mixer, u16 width, u16 height)
format = mixer->color_model.format;
colorspace = sun50i_fmt_get_colorspace(format);
bit10 = sun50i_fmt_is_10bit(format);
- base = SUN50I_FMT_DE3;
+ base = mixer->cfg->de_type == sun8i_mixer_de3 ?
+ SUN50I_FMT_DE3 : SUN50I_FMT_DE33;
regs = sun8i_blender_regmap(mixer);
- sun50i_fmt_de3_limits(limit, colorspace, bit10);
+ if (mixer->cfg->de_type == sun8i_mixer_de3)
+ sun50i_fmt_de3_limits(limit, colorspace, bit10);
+ else
+ sun50i_fmt_de33_limits(limit, colorspace);
regmap_write(regs, SUN50I_FMT_CTRL(base), 0);
diff --git a/drivers/gpu/drm/sun4i/sun50i_fmt.h b/drivers/gpu/drm/sun4i/sun50i_fmt.h
index dd6816c90dfcd..e15f9803b3574 100644
--- a/drivers/gpu/drm/sun4i/sun50i_fmt.h
+++ b/drivers/gpu/drm/sun4i/sun50i_fmt.h
@@ -9,6 +9,7 @@
#include "sun8i_mixer.h"
#define SUN50I_FMT_DE3 0xa8000
+#define SUN50I_FMT_DE33 0x5000
#define SUN50I_FMT_CTRL(base) ((base) + 0x00)
#define SUN50I_FMT_SIZE(base) ((base) + 0x04)
--
2.48.1
next prev parent reply other threads:[~2025-02-16 9:35 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-16 8:50 drm: sun4i: add Display Engine 3.3 (DE33) support Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 01/27] drm: sun4i: de2/de3: Change CSC argument Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 02/27] drm: sun4i: de2/de3: Merge CSC functions into one Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 03/27] drm: sun4i: de2/de3: call csc setup also for UI layer Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 04/27] drm: sun4i: de2: Initialize layer fields earlier Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 05/27] drm: sun4i: de3: Add YUV formatter module Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 06/27] drm: sun4i: de3: add format enumeration function to engine Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 07/27] drm: sun4i: de3: add formatter flag to mixer config Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 08/27] drm: sun4i: de3: add YUV support to the DE3 mixer Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 09/27] drm: sun4i: de3: refactor YUV formatter module setup Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 10/27] drm: sun4i: de3: pass mixer reference to ccsc setup function Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 11/27] drm: sun4i: de3: add YUV support to the color space correction module Ryan Walklin
2025-02-16 18:29 ` Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 12/27] drm: sun4i: de3: add YUV support to the TCON Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 13/27] drm: sun4i: support YUV formats in VI scaler Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 14/27] drm: sun4i: de2/de3: add mixer version enum Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 15/27] drm: sun4i: de2/de3: refactor mixer initialisation Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 16/27] drm: sun4i: vi_scaler refactor vi_scaler enablement Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 17/27] drm: sun4i: de2/de3: add generic blender register reference function Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 18/27] drm: sun4i: de2/de3: use generic register reference function for layer configuration Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 19/27] drm: sun4i: de3: Implement AFBC support Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 20/27] dt-bindings: allwinner: add H616 DE33 bus binding Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 21/27] dt-bindings: allwinner: add H616 DE33 clock binding Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 22/27] dt-bindings: allwinner: add H616 DE33 mixer binding Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 23/27] clk: sunxi-ng: ccu: add Display Engine 3.3 (DE33) support Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 24/27] drm: sun4i: de33: mixer: " Ryan Walklin
2025-02-16 8:50 ` [PATCH v6 25/27] drm: sun4i: de33: vi_scaler: " Ryan Walklin
2025-02-16 8:50 ` Ryan Walklin [this message]
2025-02-16 8:50 ` [PATCH v6 27/27] 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=20250216085432.6373-28-ryan@testtoast.com \
--to=ryan@testtoast.com \
--cc=airlied@gmail.com \
--cc=andre.przywara@arm.com \
--cc=conor+dt@kernel.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jernej.skrabec@gmail.com \
--cc=kikuchan98@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=simons.philippe@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.