From 3971a18c058e0e6ab947cfa1206072efb236fd46 Mon Sep 17 00:00:00 2001 From: Algea Cao Date: Thu, 13 Jan 2022 11:44:32 +0800 Subject: [PATCH] drm/rockchip: vop2: when rect width is between 4096 and 7680, play HDR video must be centered Signed-off-by: Algea Cao Change-Id: If75d3832cb2e24d9e16e2a0ea69046b57190a227 --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 64bfd594a866..839c4986fd9b 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -3486,14 +3486,17 @@ static int vop2_cluter_splice_scale_check(struct vop2_win *win, struct drm_plane if ((drm_rect_width(&src) >> 16) <= drm_rect_width(&dst)) return 0; + if ((drm_rect_width(&src) >> 16) <= VOP2_MAX_VP_OUTPUT_WIDTH) + return 0; /* * Cluster scale down limitation in splice mode: * If scale down, must display at horizontal center */ if ((dst.x1 < half_hdisplay) && (dst.x2 > half_hdisplay)) { if ((dst.x2 + dst.x1) != hdisplay) { - DRM_ERROR("%s dst(%d %d)must scale down at center in splice mode\n", - win->name, dst.x1, dst.x2); + DRM_ERROR("%s src_w: %d dst_w %d dst(%d %d) must scale down at center in splice mode\n", + win->name, drm_rect_width(&src) >> 16, + drm_rect_width(&dst), dst.x1, dst.x2); return -EINVAL; }