diff options
| author | Daniel Stone <daniels@collabora.com> | 2025-12-15 15:09:21 +0100 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2026-01-08 20:00:34 +0100 |
| commit | 8cdd4d858d7aaeb583ae2b4e5a0378936b18f0f0 (patch) | |
| tree | ced1006fef03886aaf7b9ce7f8be117ec2b03f33 | |
| parent | dfb673c71fc0039a6495731d0c0fcefa8a97541d (diff) | |
drm/rockchip: vop2: Enforce AFBC source alignment in plane_check
Planes can only source AFBC framebuffers at multiples of 4px wide on
RK3566/RK3568. Instead of clipping on all SoCs when the user asks for an
unaligned source rectangle, reject the configuration in the plane's
atomic check on RK3566/RK3568 only.
Signed-off-by: Daniel Stone <daniels@collabora.com>
[Make RK3566/RK3568 specific, reword message, s/byte/pixel/]
Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patch.msgid.link/20251215-vop2-atomic-fixups-v5-5-83463c075a8d@collabora.com
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index ded8b9952c6d..0eab3370f088 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -1076,6 +1076,13 @@ static int vop2_plane_atomic_check(struct drm_plane *plane, return -EINVAL; } + if (vop2->version == VOP_VERSION_RK3568 && drm_is_afbc(fb->modifier) && src_w % 4) { + drm_dbg_kms(vop2->drm, + "AFBC source rectangles must be 4-pixel aligned; is %d\n", + src_w); + return -EINVAL; + } + return 0; } @@ -1236,11 +1243,9 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, WARN_ON(src_w < 4) || WARN_ON(src_h < 4)) return; - if (afbc_en && src_w % 4) { - drm_dbg_kms(vop2->drm, "vp%d %s src_w[%d] not 4 pixel aligned\n", - vp->id, win->data->name, src_w); - src_w = ALIGN_DOWN(src_w, 4); - } + if (vop2->version == VOP_VERSION_RK3568 && drm_is_afbc(fb->modifier)) + if (WARN_ON(src_w % 4)) + return; act_info = (src_h - 1) << 16 | ((src_w - 1) & 0xffff); dsp_info = (dsp_h - 1) << 16 | ((dsp_w - 1) & 0xffff); |