65 lines
2.1 KiB
Diff
65 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <[email protected]>
|
|
Date: Sun, 12 Oct 2025 21:23:05 +0200
|
|
Subject: drm/sun4i: vi_layer: Move check from update to check callback
|
|
|
|
DRM requires that all check are done in atomic_check callback. Move
|
|
one check from atomic_commit to atomic_check callback.
|
|
|
|
Tested-by: Ryan Walklin <[email protected]>
|
|
Signed-off-by: Jernej Skrabec <[email protected]>
|
|
---
|
|
drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 18 ++++++----
|
|
1 file changed, 11 insertions(+), 7 deletions(-)
|
|
|
|
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
|
|
@@ -217,16 +217,11 @@ static int sun8i_vi_layer_update_formats(struct sun8i_mixer *mixer, int channel,
|
|
struct drm_plane_state *state = plane->state;
|
|
u32 val, ch_base, csc_mode, hw_fmt;
|
|
const struct drm_format_info *fmt;
|
|
- int ret;
|
|
|
|
ch_base = sun8i_channel_base(mixer, channel);
|
|
|
|
fmt = state->fb->format;
|
|
- ret = sun8i_mixer_drm_format_to_hw(fmt->format, &hw_fmt);
|
|
- if (ret) {
|
|
- DRM_DEBUG_DRIVER("Invalid format\n");
|
|
- return ret;
|
|
- }
|
|
+ sun8i_mixer_drm_format_to_hw(fmt->format, &hw_fmt);
|
|
|
|
val = hw_fmt << SUN8I_MIXER_CHAN_VI_LAYER_ATTR_FBFMT_OFFSET;
|
|
regmap_update_bits(mixer->engine.regs,
|
|
@@ -322,7 +317,9 @@ static int sun8i_vi_layer_atomic_check(struct drm_plane *plane,
|
|
struct sun8i_layer *layer = plane_to_sun8i_layer(plane);
|
|
struct drm_crtc *crtc = new_plane_state->crtc;
|
|
struct drm_crtc_state *crtc_state;
|
|
- int min_scale, max_scale;
|
|
+ const struct drm_format_info *fmt;
|
|
+ int min_scale, max_scale, ret;
|
|
+ u32 hw_fmt;
|
|
|
|
if (!crtc)
|
|
return 0;
|
|
@@ -332,6 +329,13 @@ static int sun8i_vi_layer_atomic_check(struct drm_plane *plane,
|
|
if (WARN_ON(!crtc_state))
|
|
return -EINVAL;
|
|
|
|
+ fmt = new_plane_state->fb->format;
|
|
+ ret = sun8i_mixer_drm_format_to_hw(fmt->format, &hw_fmt);
|
|
+ if (ret) {
|
|
+ DRM_DEBUG_DRIVER("Invalid plane format\n");
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
min_scale = DRM_PLANE_NO_SCALING;
|
|
max_scale = DRM_PLANE_NO_SCALING;
|
|
|
|
--
|
|
Armbian
|
|
|