Planes can only source AFBC framebuffers at multiples of 4px wide. Instead of clipping when the user asks for an unaligned source rectangle, reject the configuration in the plane's atomic check.
Signed-off-by: Daniel Stone <[email protected]> --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 65437437e3d5..0abaf3e0eab6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -1068,12 +1068,19 @@ static int vop2_plane_atomic_check(struct drm_plane *plane, * 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)) { + 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; } + if (drm_is_afbc(fb->modifier) && src_w % 4) { + drm_dbg_kms(vop2->drm, + "AFBC source rectangles must be 4-byte aligned; is %d\n", + src_w); + return -EINVAL; + } + return 0; } @@ -1234,11 +1241,8 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, WARN_ON(src_w < 4); WARN_ON(src_h < 4); - 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 (drm_is_afbc(fb->modifier)) + WARN_ON(src_w % 4); act_info = (src_h - 1) << 16 | ((src_w - 1) & 0xffff); dsp_info = (dsp_h - 1) << 16 | ((dsp_w - 1) & 0xffff); -- 2.51.0
