]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/msm/dpu: correct dpu_plane_virtual_atomic_check()
authorDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Tue, 15 Jul 2025 17:28:18 +0000 (20:28 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Sep 2025 14:55:33 +0000 (16:55 +0200)
[ Upstream commit 1a76b255eceb9c570c6228f6393e1d63d97a22ba ]

Fix c&p error in dpu_plane_virtual_atomic_check(), compare CRTC width
too, in addition to CRTC height.

Fixes: 8c62a31607f6 ("drm/msm/dpu: allow using two SSPP blocks for a single plane")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202507150432.U0cALR6W-lkp@intel.com/
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Jessica Zhang <jessica.zhang@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/664170/
Link: https://lore.kernel.org/r/20250715-msm-fix-virt-atomic-check-v1-1-9bab02c9f952@oss.qualcomm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c

index 421138bc3cb779c45fcfd5319056f0d31c862452..28d42eade5ccb91ea7f984313cef5fdd005b7cf3 100644 (file)
@@ -1169,7 +1169,7 @@ static int dpu_plane_virtual_atomic_check(struct drm_plane *plane,
        if (!old_plane_state || !old_plane_state->fb ||
            old_plane_state->src_w != plane_state->src_w ||
            old_plane_state->src_h != plane_state->src_h ||
-           old_plane_state->src_w != plane_state->src_w ||
+           old_plane_state->crtc_w != plane_state->crtc_w ||
            old_plane_state->crtc_h != plane_state->crtc_h ||
            msm_framebuffer_format(old_plane_state->fb) !=
            msm_framebuffer_format(plane_state->fb))