]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/rockchip: vop: Allow 4096px width scaling
authorAlex Bee <knaerzche@gmail.com>
Sat, 15 Jun 2024 17:03:54 +0000 (17:03 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Oct 2024 13:07:46 +0000 (15:07 +0200)
[ Upstream commit 0ef968d91a20b5da581839f093f98f7a03a804f7 ]

There is no reason to limit VOP scaling to 3840px width, the limit of
RK3288, when there are newer VOP versions that support 4096px width.

Change to enforce a maximum of 4096px width plane scaling, the maximum
supported output width of the VOP versions supported by this driver.

Fixes: 4c156c21c794 ("drm/rockchip: vop: support plane scale")
Signed-off-by: Alex Bee <knaerzche@gmail.com>
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240615170417.3134517-4-jonas@kwiboo.se
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/rockchip/rockchip_drm_vop.c

index 682d78fab9a5938ad69e5f164de8f6f87fc5ce52..d4a3170d1678c2134686d1ebec297f7778b6beb4 100644 (file)
@@ -370,8 +370,8 @@ static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win,
        if (info->is_yuv)
                is_yuv = true;
 
-       if (dst_w > 3840) {
-               DRM_DEV_ERROR(vop->dev, "Maximum dst width (3840) exceeded\n");
+       if (dst_w > 4096) {
+               DRM_DEV_ERROR(vop->dev, "Maximum dst width (4096) exceeded\n");
                return;
        }