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 06/30] drm/sun4i: layers: Make atomic commit functions void
Date: Tue, 4 Nov 2025 19:09:18 +0100 [thread overview]
Message-ID: <20251104180942.61538-7-jernej.skrabec@gmail.com> (raw)
In-Reply-To: <20251104180942.61538-1-jernej.skrabec@gmail.com>
Functions called by atomic_commit callback should not fail. None of them
actually returns error, so make them void.
No functional change.
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_ui_layer.c | 20 +++++++-------------
drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 20 +++++++-------------
2 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
index fce7b265c5d8..8baa1d0b53bd 100644
--- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
@@ -46,9 +46,9 @@ static void sun8i_ui_layer_update_alpha(struct sun8i_mixer *mixer, int channel,
mask, val);
}
-static int sun8i_ui_layer_update_coord(struct sun8i_mixer *mixer, int channel,
- int overlay, struct drm_plane *plane,
- unsigned int zpos)
+static void sun8i_ui_layer_update_coord(struct sun8i_mixer *mixer, int channel,
+ int overlay, struct drm_plane *plane,
+ unsigned int zpos)
{
struct drm_plane_state *state = plane->state;
u32 src_w, src_h, dst_w, dst_h;
@@ -124,12 +124,10 @@ static int sun8i_ui_layer_update_coord(struct sun8i_mixer *mixer, int channel,
regmap_write(bld_regs,
SUN8I_MIXER_BLEND_ATTR_INSIZE(bld_base, zpos),
outsize);
-
- return 0;
}
-static int sun8i_ui_layer_update_formats(struct sun8i_mixer *mixer, int channel,
- int overlay, struct drm_plane *plane)
+static void sun8i_ui_layer_update_formats(struct sun8i_mixer *mixer, int channel,
+ int overlay, struct drm_plane *plane)
{
struct drm_plane_state *state = plane->state;
const struct drm_format_info *fmt;
@@ -144,12 +142,10 @@ static int sun8i_ui_layer_update_formats(struct sun8i_mixer *mixer, int channel,
regmap_update_bits(mixer->engine.regs,
SUN8I_MIXER_CHAN_UI_LAYER_ATTR(ch_base, overlay),
SUN8I_MIXER_CHAN_UI_LAYER_ATTR_FBFMT_MASK, val);
-
- return 0;
}
-static int sun8i_ui_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
- int overlay, struct drm_plane *plane)
+static void sun8i_ui_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
+ int overlay, struct drm_plane *plane)
{
struct drm_plane_state *state = plane->state;
struct drm_framebuffer *fb = state->fb;
@@ -184,8 +180,6 @@ static int sun8i_ui_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
regmap_write(mixer->engine.regs,
SUN8I_MIXER_CHAN_UI_LAYER_TOP_LADDR(ch_base, overlay),
lower_32_bits(dma_addr));
-
- return 0;
}
static int sun8i_ui_layer_atomic_check(struct drm_plane *plane,
diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
index c80bdece5ffc..dae6f83cea6e 100644
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
@@ -48,9 +48,9 @@ static void sun8i_vi_layer_update_alpha(struct sun8i_mixer *mixer, int channel,
}
}
-static int sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel,
- int overlay, struct drm_plane *plane,
- unsigned int zpos)
+static void sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel,
+ int overlay, struct drm_plane *plane,
+ unsigned int zpos)
{
struct drm_plane_state *state = plane->state;
const struct drm_format_info *format = state->fb->format;
@@ -191,8 +191,6 @@ static int sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel,
regmap_write(bld_regs,
SUN8I_MIXER_BLEND_ATTR_INSIZE(bld_base, zpos),
outsize);
-
- return 0;
}
static u32 sun8i_vi_layer_get_csc_mode(const struct drm_format_info *format)
@@ -211,8 +209,8 @@ static u32 sun8i_vi_layer_get_csc_mode(const struct drm_format_info *format)
}
}
-static int sun8i_vi_layer_update_formats(struct sun8i_mixer *mixer, int channel,
- int overlay, struct drm_plane *plane)
+static void sun8i_vi_layer_update_formats(struct sun8i_mixer *mixer, int channel,
+ int overlay, struct drm_plane *plane)
{
struct drm_plane_state *state = plane->state;
u32 val, ch_base, csc_mode, hw_fmt;
@@ -246,12 +244,10 @@ static int sun8i_vi_layer_update_formats(struct sun8i_mixer *mixer, int channel,
regmap_update_bits(mixer->engine.regs,
SUN8I_MIXER_CHAN_VI_LAYER_ATTR(ch_base, overlay),
SUN8I_MIXER_CHAN_VI_LAYER_ATTR_RGB_MODE, val);
-
- return 0;
}
-static int sun8i_vi_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
- int overlay, struct drm_plane *plane)
+static void sun8i_vi_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
+ int overlay, struct drm_plane *plane)
{
struct drm_plane_state *state = plane->state;
struct drm_framebuffer *fb = state->fb;
@@ -305,8 +301,6 @@ static int sun8i_vi_layer_update_buffer(struct sun8i_mixer *mixer, int channel,
overlay, i),
lower_32_bits(dma_addr));
}
-
- return 0;
}
static int sun8i_vi_layer_atomic_check(struct drm_plane *plane,
--
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 ` [PATCH v2 01/30] drm/sun4i: mixer: Fix up DE33 channel macros Jernej Skrabec
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 ` Jernej Skrabec [this message]
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-7-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