]> www.infradead.org Git - users/hch/misc.git/commitdiff
drm/rockchip: vop2: use correct destination rectangle height check
authorAlok Tiwari <alok.a.tiwari@oracle.com>
Sun, 12 Oct 2025 14:20:01 +0000 (07:20 -0700)
committerHeiko Stuebner <heiko@sntech.de>
Tue, 14 Oct 2025 08:32:17 +0000 (10:32 +0200)
The vop2_plane_atomic_check() function incorrectly checks
drm_rect_width(dest) twice instead of verifying both width and height.
Fix the second condition to use drm_rect_height(dest) so that invalid
destination rectangles with height < 4 are correctly rejected.

Fixes: 604be85547ce ("drm/rockchip: Add VOP2 driver")
Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>
Reviewed-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/20251012142005.660727-1-alok.a.tiwari@oracle.com
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c

index b50927a824b4020a7ffd57974070ed202cd8b838..7ec7bea5e38e6cb7fa10aaf41174d1ca51e5cb8a 100644 (file)
@@ -1031,7 +1031,7 @@ static int vop2_plane_atomic_check(struct drm_plane *plane,
                return format;
 
        if (drm_rect_width(src) >> 16 < 4 || drm_rect_height(src) >> 16 < 4 ||
-           drm_rect_width(dest) < 4 || drm_rect_width(dest) < 4) {
+           drm_rect_width(dest) < 4 || drm_rect_height(dest) < 4) {
                drm_err(vop2->drm, "Invalid size: %dx%d->%dx%d, min size is 4x4\n",
                        drm_rect_width(src) >> 16, drm_rect_height(src) >> 16,
                        drm_rect_width(dest), drm_rect_height(dest));