Patch "drm/rockchip: vop2: clear afbc en and transform bit for cluster window at linear mode" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/rockchip: vop2: clear afbc en and transform bit for cluster window at linear mode

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-rockchip-vop2-clear-afbc-en-and-transform-bit-fo.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit ddefd2d688d1a742b6f130c005a0c6a81c2de207
Author: Andy Yan <andy.yan@xxxxxxxxxxxxxx>
Date:   Mon Dec 11 19:57:41 2023 +0800

    drm/rockchip: vop2: clear afbc en and transform bit for cluster window at linear mode
    
    [ Upstream commit 20529a68307feed00dd3d431d3fff0572616b0f2 ]
    
    The enable bit and transform offset of cluster windows should be
    cleared when it work at linear mode, or we may have a iommu fault
    issue on rk3588 which cluster windows switch between afbc and linear
    mode.
    
    As the cluster windows of rk3568 only supports afbc format
    so is therefore not affected.
    
    Signed-off-by: Andy Yan <andy.yan@xxxxxxxxxxxxxx>
    Reviewed-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
    Signed-off-by: Heiko Stuebner <heiko@xxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20231211115741.1784954-1-andyshrk@xxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index 80b8c83342840..a6071464a543f 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -1258,6 +1258,11 @@ static void vop2_plane_atomic_update(struct drm_plane *plane,
 		vop2_win_write(win, VOP2_WIN_AFBC_ROTATE_270, rotate_270);
 		vop2_win_write(win, VOP2_WIN_AFBC_ROTATE_90, rotate_90);
 	} else {
+		if (vop2_cluster_window(win)) {
+			vop2_win_write(win, VOP2_WIN_AFBC_ENABLE, 0);
+			vop2_win_write(win, VOP2_WIN_AFBC_TRANSFORM_OFFSET, 0);
+		}
+
 		vop2_win_write(win, VOP2_WIN_YRGB_VIR, DIV_ROUND_UP(fb->pitches[0], 4));
 	}