devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v10 11/11] drm: sun4i: de33: mixer: add mixer configuration for the H616
Date: Sun, 11 May 2025 22:31:20 +1200	[thread overview]
Message-ID: <20250511104042.24249-12-ryan@testtoast.com> (raw)
In-Reply-To: <20250511104042.24249-1-ryan@testtoast.com>

From: Jernej Skrabec <jernej.skrabec@gmail.com>

The H616 (and related SoC packages sharing the same die) carry the new
DE33 display engine.

Add the mixer configuration and a compatible string for the H616 to the
mixer.

Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Ryan Walklin <ryan@testtoast.com>

--
Changelog v7..v8:
- Separate DE33 support and H616 enablement in the mixer.
---
 drivers/gpu/drm/sun4i/sun8i_mixer.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index 0d4695132dae..f774b693634d 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -799,6 +799,17 @@ static const struct sun8i_mixer_cfg sun50i_h6_mixer0_cfg = {
 	.vi_num		= 1,
 };
 
+static const struct sun8i_mixer_cfg sun50i_h616_mixer0_cfg = {
+	.ccsc		= CCSC_MIXER0_LAYOUT,
+	.de_type	= sun8i_mixer_de33,
+	.mod_rate	= 600000000,
+	.scaler_mask	= 0xf,
+	.scanline_yuv	= 4096,
+	.ui_num		= 3,
+	.vi_num		= 1,
+	.map		= {0, 6, 7, 8},
+};
+
 static const struct of_device_id sun8i_mixer_of_table[] = {
 	{
 		.compatible = "allwinner,sun8i-a83t-de2-mixer-0",
@@ -844,6 +855,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = {
 		.compatible = "allwinner,sun50i-h6-de3-mixer-0",
 		.data = &sun50i_h6_mixer0_cfg,
 	},
+	{
+		.compatible = "allwinner,sun50i-h616-de33-mixer-0",
+		.data = &sun50i_h616_mixer0_cfg,
+	},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, sun8i_mixer_of_table);
-- 
2.49.0


  parent reply	other threads:[~2025-05-11 10:42 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-11 10:31 [PATCH v10 00/11] drm: sun4i: add Display Engine 3.3 (DE33) support Ryan Walklin
2025-05-11 10:31 ` [PATCH v10 01/11] drm: sun4i: de2/de3: add mixer version enum Ryan Walklin
2025-05-14 15:08   ` Maxime Ripard
2025-05-11 10:31 ` [PATCH v10 02/11] drm: sun4i: de2/de3: refactor mixer initialisation Ryan Walklin
2025-05-14 15:08   ` Maxime Ripard
2025-05-11 10:31 ` [PATCH v10 03/11] drm: sun4i: de2/de3: add generic blender register reference function Ryan Walklin
2025-05-14 15:08   ` Maxime Ripard
2025-05-11 10:31 ` [PATCH v10 04/11] drm: sun4i: de2/de3: use generic register reference function for layer configuration Ryan Walklin
2025-05-14 15:08   ` Maxime Ripard
2025-05-11 10:31 ` [PATCH v10 05/11] dt-bindings: allwinner: add H616 DE33 bus binding Ryan Walklin
2025-05-15  8:00   ` Chen-Yu Tsai
2025-05-16  9:46     ` Ryan Walklin
2025-05-11 10:31 ` [PATCH v10 06/11] dt-bindings: allwinner: add H616 DE33 clock binding Ryan Walklin
2025-05-11 10:31 ` [PATCH v10 07/11] dt-bindings: allwinner: add H616 DE33 mixer binding Ryan Walklin
2025-05-11 10:31 ` [PATCH v10 08/11] clk: sunxi-ng: ccu: add Display Engine 3.3 (DE33) support Ryan Walklin
2025-05-11 10:31 ` [PATCH v10 09/11] drm: sun4i: de33: vi_scaler: " Ryan Walklin
2025-05-14 15:07   ` Maxime Ripard
2025-05-11 10:31 ` [PATCH v10 10/11] drm: sun4i: de33: mixer: " Ryan Walklin
2025-05-14 15:07   ` Maxime Ripard
2025-05-16  9:49     ` Ryan Walklin
2025-05-11 10:31 ` Ryan Walklin [this message]
2025-05-14 15:07   ` [PATCH v10 11/11] drm: sun4i: de33: mixer: add mixer configuration for the H616 Maxime Ripard
2025-05-12 15:51 ` [PATCH v10 00/11] drm: sun4i: add Display Engine 3.3 (DE33) support Chris Morgan
2025-05-12 16:11 ` (subset) " Chen-Yu Tsai

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=20250511104042.24249-12-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 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).