From: Jernej Skrabec <jernej.skrabec@gmail.com>
To: wens@csie.org
Cc: mripard@kernel.org, maarten.lankhorst@linux.intel.com,
tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch,
samuel@sholland.org, dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Ryan Walklin <ryan@testtoast.com>
Subject: [PATCH v2 01/30] drm/sun4i: mixer: Fix up DE33 channel macros
Date: Tue, 4 Nov 2025 19:09:13 +0100 [thread overview]
Message-ID: <20251104180942.61538-2-jernej.skrabec@gmail.com> (raw)
In-Reply-To: <20251104180942.61538-1-jernej.skrabec@gmail.com>
Properly define macros. Till now raw numbers and inappropriate macro was
used.
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Tested-by: Ryan Walklin <ryan@testtoast.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
drivers/gpu/drm/sun4i/sun8i_mixer.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.h b/drivers/gpu/drm/sun4i/sun8i_mixer.h
index a1c1cbccc654..b5badfa2c997 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.h
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h
@@ -39,6 +39,9 @@
#define DE3_CH_BASE 0x1000
#define DE3_CH_SIZE 0x0800
+#define DE33_CH_BASE 0x1000
+#define DE33_CH_SIZE 0x20000
+
#define SUN8I_MIXER_BLEND_PIPE_CTL(base) ((base) + 0)
#define SUN8I_MIXER_BLEND_ATTR_FCOLOR(base, x) ((base) + 0x4 + 0x10 * (x))
#define SUN8I_MIXER_BLEND_ATTR_INSIZE(base, x) ((base) + 0x8 + 0x10 * (x))
@@ -242,7 +245,7 @@ static inline u32
sun8i_channel_base(struct sun8i_mixer *mixer, int channel)
{
if (mixer->cfg->de_type == SUN8I_MIXER_DE33)
- return mixer->cfg->map[channel] * 0x20000 + DE2_CH_SIZE;
+ return DE33_CH_BASE + mixer->cfg->map[channel] * DE33_CH_SIZE;
else if (mixer->cfg->de_type == SUN8I_MIXER_DE3)
return DE3_CH_BASE + channel * DE3_CH_SIZE;
else
--
2.51.2
next prev parent reply other threads:[~2025-11-04 18:10 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-04 18:09 [PATCH v2 00/30] drm/sun4i: Refactor layer code for proper DE33 support Jernej Skrabec
2025-11-04 18:09 ` Jernej Skrabec [this message]
2025-11-04 18:09 ` [PATCH v2 02/30] drm/sun4i: mixer: Remove ccsc cfg for >= DE3 Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 03/30] drm/sun4i: de2: Initialize layer fields earlier Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 04/30] drm/sun4i: ui_layer: Move check from update to check callback Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 05/30] drm/sun4i: vi_layer: " Jernej Skrabec
2025-11-05 14:51 ` Chen-Yu Tsai
2025-11-04 18:09 ` [PATCH v2 06/30] drm/sun4i: layers: Make atomic commit functions void Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 07/30] drm/sun4i: Move blender config from layers to mixer Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 08/30] drm/sun4i: ui layer: Write attributes in one go Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 09/30] drm/sun4i: vi " Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 10/30] drm/sun4i: mixer: Move layer enabling to atomic_update Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 11/30] drm/sun4i: de2/de3: Simplify CSC config interface Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 12/30] drm/sun4i: csc: Simplify arguments with taking plane state Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 13/30] drm/sun4i: de2/de3: Move plane type determination to mixer Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 14/30] drm/sun4i: ui_layer: Change index meaning Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 15/30] drm/sun4i: layer: move num of planes calc out of layer code Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 16/30] drm/sun4i: ui_layer: use layer struct instead of multiple args Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 17/30] drm/sun4i: vi_layer: " Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 18/30] drm/sun4i: ui_scaler: use layer instead of mixer for args Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 19/30] drm/sun4i: vi_scaler: " Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 20/30] drm/sun4i: layers: Make regmap for layers configurable Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 21/30] drm/sun4i: csc: use layer arg instead of mixer Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 22/30] drm/sun4i: layers: add physical index arg Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 23/30] drm/sun4i: vi_scaler: Update DE33 base calculation Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 24/30] drm/sun4i: mixer: Convert heuristics to quirk Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 25/30] drm/sun4i: ui_scaler: drop sanity checks Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 26/30] drm/sun4i: mixer: Add quirk for number of VI scalers Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 27/30] drm/sun4i: mixer: split out layer config Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 28/30] drm/sun4i: layer: replace mixer with layer struct Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 29/30] drm/sun4i: vi_scaler: Find mixer from crtc Jernej Skrabec
2025-11-04 18:09 ` [PATCH v2 30/30] drm/sun4i: Nuke mixer pointer from layer code Jernej Skrabec
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=20251104180942.61538-2-jernej.skrabec@gmail.com \
--to=jernej.skrabec@gmail.com \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=ryan@testtoast.com \
--cc=samuel@sholland.org \
--cc=simona@ffwll.ch \
--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