Patch "drm/rockchip: vop2: Add check for 32 bpp format for rk3588" has been added to the 6.13-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: Add check for 32 bpp format for rk3588

to the 6.13-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-add-check-for-32-bpp-format-for-rk.patch
and it can be found in the queue-6.13 subdirectory.

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



commit 49dca18810bbf09b04a84cfdaa675966db10423b
Author: Andy Yan <andy.yan@xxxxxxxxxxxxxx>
Date:   Sat Dec 14 16:17:05 2024 +0800

    drm/rockchip: vop2: Add check for 32 bpp format for rk3588
    
    [ Upstream commit 7e8a56c703c67bfa8d3f71a0c1c297bb1252b897 ]
    
    RK3588 only support DRM_FORMAT_XRGB2101010/XBGR2101010 in afbc mode.
    
    Fixes: 5a028e8f062f ("drm/rockchip: vop2: Add support for rk3588")
    Signed-off-by: Andy Yan <andy.yan@xxxxxxxxxxxxxx>
    Signed-off-by: Heiko Stuebner <heiko@xxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20241214081719.3330518-7-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 2abc68fe2d1ff..6082b1c179aeb 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -560,6 +560,15 @@ static bool rockchip_vop2_mod_supported(struct drm_plane *plane, u32 format,
 		}
 	}
 
+	if (format == DRM_FORMAT_XRGB2101010 || format == DRM_FORMAT_XBGR2101010) {
+		if (vop2->data->soc_id == 3588) {
+			if (!rockchip_afbc(plane, modifier)) {
+				drm_dbg_kms(vop2->drm, "Only support 32 bpp format with afbc\n");
+				return false;
+			}
+		}
+	}
+
 	if (modifier == DRM_FORMAT_MOD_LINEAR)
 		return true;