3d46ef80e0
* sunxi-6.18: make the mess even worse * fixing one of megis patches and add sunxi 32bit to the mess * rewrite against 6.18 * fix media-ov5640-Don-t-powerup-the-sensor-during-driver-probe.patch * fix media-sun6i-csi-implement-vidioc_enum_framesizes.patch * fix misc-modem-power-Power-manager-for-modems.patch * Fix usb-gadget-Fix-dangling-pointer-in-netdev-private-data.patch, include rewrite * fix mmc-sunxi-mmc-Remove-runtime-PM.patch, two hunks no longer apply * re-extract all of megis patches * remove unneeded branch * add note to disabled patch * auto-generated, out of date * drop megous drm patches in favor of Jernej's work. disable broken patches * disable patch which breaks compilation for armhf * disable breaking patch, rewrite everything * remove patches unrelated to sunxi family * fix spi dev compatible patch * fix tsc2007 patch * drop mainlined patch, adjust x96 mate T95 eth sd card hack * remove upstreamed patch * re-enable no longer broken * another rewrite to align stuff properly * adjust various comments in series.conf * recover lost overlays * uew5622: fix compilation against Linux 6.18 * fix Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch * adjust patch subject to make sense * restore fixup creation restore overlay prefix on opiz2 this needs to be properly sorted at some point * bump to 6.18.1 sunxi and sunxi64 build just fine * fix and re-enable drv-mfd-axp20x-add-sysfs-interface.patch * rewrite patches
139 lines
5.2 KiB
Diff
139 lines
5.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Date: Sun, 12 Oct 2025 21:23:06 +0200
|
|
Subject: drm/sun4i: layers: Make atomic commit functions void
|
|
|
|
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 111111111111..222222222222 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 111111111111..222222222222 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,
|
|
--
|
|
Armbian
|
|
|