diff options
| author | Daniel Stone <daniels@collabora.com> | 2025-12-15 15:09:20 +0100 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2026-01-08 20:00:34 +0100 |
| commit | dfb673c71fc0039a6495731d0c0fcefa8a97541d (patch) | |
| tree | 0dd7f951cebeb2cf73c5da61d2982f69386d5de9 | |
| parent | f403945d240417761d404cb1ce8fa2c1ec02daf5 (diff) | |
drm/rockchip: vop2: Enforce scaling workaround in plane_check
It seems only cluster windows are capable of applying downscaling when
the source region has an odd width. Instead of applying a workaround
inside atomic_update, fail the plane check if this is requested.
Signed-off-by: Daniel Stone <daniels@collabora.com>
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-4-83463c075a8d@collabora.com
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index fbcc655cb583..ded8b9952c6d 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -998,6 +998,7 @@ static int vop2_plane_atomic_check(struct drm_plane *plane, struct drm_crtc *crtc = pstate->crtc; struct drm_crtc_state *cstate; struct vop2_video_port *vp; + struct vop2_win *win = to_vop2_win(plane); struct vop2 *vop2; const struct vop2_data *vop2_data; struct drm_rect *dest = &pstate->dst; @@ -1065,6 +1066,16 @@ static int vop2_plane_atomic_check(struct drm_plane *plane, return -EINVAL; } + /* + * This is workaround solution for IC design: + * esmart can't support scale down when src_w % 16 == 1. + */ + if (!vop2_cluster_window(win) && src_w > dest_w && (src_w & 1)) { + drm_dbg_kms(vop2->drm, + "Esmart windows cannot downscale odd-width source regions\n"); + return -EINVAL; + } + return 0; } @@ -1225,16 +1236,6 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, WARN_ON(src_w < 4) || WARN_ON(src_h < 4)) return; - /* - * This is workaround solution for IC design: - * esmart can't support scale down when src_w % 16 == 1. - */ - if (!vop2_cluster_window(win) && src_w > dsp_w && (src_w & 1)) { - drm_dbg_kms(vop2->drm, "vp%d %s act_w[%d] MODE 16 == 1\n", - vp->id, win->data->name, src_w); - src_w -= 1; - } - 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); |