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 v2 22/23] drm: sun4i: de33: fmt: add Display Engine 3.3 (DE33) support
Date: Wed, 3 Jul 2024 22:51:12 +1200 [thread overview]
Message-ID: <20240703105454.41254-23-ryan@testtoast.com> (raw)
In-Reply-To: <20240703105454.41254-1-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 050a8716ae862..39682d4e6d208 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 format)
{
@@ -60,10 +73,14 @@ void sun50i_fmt_setup(struct sun8i_mixer *mixer, u16 width,
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 4127f7206aade..3e60d5c788b39 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.45.2
next prev parent reply other threads:[~2024-07-03 10:57 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-03 10:50 [PATCH v2 00/23] drm: sun4i: add Display Engine 3.3 (DE33) support Ryan Walklin
2024-07-03 10:50 ` [PATCH v2 01/23] drm: sun4i: de2/de3: Change CSC argument Ryan Walklin
2024-07-03 10:50 ` [PATCH v2 02/23] drm: sun4i: de2/de3: Merge CSC functions into one Ryan Walklin
2024-07-09 0:42 ` Andre Przywara
2024-07-03 10:50 ` [PATCH v2 03/23] drm: sun4i: de2/de3: call csc setup also for UI layer Ryan Walklin
2024-07-03 10:50 ` [PATCH v2 04/23] drm: sun4i: de2: Initialize layer fields earlier Ryan Walklin
2024-07-03 10:50 ` [PATCH v2 05/23] drm: sun4i: de3: Add YUV formatter module Ryan Walklin
2024-07-03 10:50 ` [PATCH v2 06/23] drm: sun4i: de3: add format enumeration function to engine Ryan Walklin
2024-07-03 10:50 ` [PATCH v2 07/23] drm: sun4i: de3: add formatter flag to mixer config Ryan Walklin
2024-07-03 10:50 ` [PATCH v2 08/23] drm: sun4i: de3: add YUV support to the DE3 mixer Ryan Walklin
2024-07-03 10:50 ` [PATCH v2 09/23] drm: sun4i: de3: pass engine reference to ccsc setup function Ryan Walklin
2024-07-03 10:51 ` [PATCH v2 10/23] drm: sun4i: de3: add YUV support to the color space correction module Ryan Walklin
2024-07-03 10:51 ` [PATCH v2 11/23] drm: sun4i: de3: add YUV support to the TCON Ryan Walklin
2024-07-03 10:51 ` [PATCH v2 12/23] drm: sun4i: support YUV formats in VI scaler Ryan Walklin
2024-07-03 10:51 ` [PATCH v2 13/23] drm: sun4i: de2/de3: add mixer version enum Ryan Walklin
2024-07-03 10:51 ` [PATCH v2 14/23] drm: sun4i: de2/de3: refactor mixer initialisation Ryan Walklin
2024-07-03 10:51 ` [PATCH v2 15/23] drm: sun4i: vi_scaler refactor vi_scaler enablement Ryan Walklin
2024-07-03 10:51 ` [PATCH v2 16/23] drm: sun4i: de2/de3: make blender register references generic Ryan Walklin
2024-07-03 10:51 ` [PATCH v2 17/23] drm: sun4i: de3: Implement AFBC support Ryan Walklin
2024-07-03 10:51 ` [PATCH v2 18/23] dt-bindings: allwinner: add H616 DE33 bus, clock and display bindings Ryan Walklin
2024-07-03 15:28 ` Conor Dooley
2024-07-05 8:42 ` Ryan Walklin
2024-07-03 10:51 ` [PATCH v2 19/23] clk: sunxi-ng: ccu: add Display Engine 3.3 (DE33) support Ryan Walklin
2024-07-03 23:02 ` Stephen Boyd
2024-07-05 8:39 ` Ryan Walklin
2024-07-06 4:48 ` Stephen Boyd
2024-07-03 10:51 ` [PATCH v2 20/23] drm: sun4i: de33: mixer: " Ryan Walklin
2024-07-03 10:51 ` [PATCH v2 21/23] drm: sun4i: de33: vi_scaler: " Ryan Walklin
2024-07-03 10:51 ` Ryan Walklin [this message]
2024-07-03 10:51 ` [PATCH v2 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=20240703105454.41254-23-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 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.