RCORE RK3588 Module Support and Pocket A311D Support

linux/patches6.6/meson-g12b-bananapi-cm4-mnt-pocket-reform/0001-a311d-viu-fifo-lines-config.patch

@@ -22,8 +22,7 @@ diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu
 index 119d00f..b8fc35e 100644
 --- a/drivers/gpu/drm/meson/meson_viu.c
 +++ b/drivers/gpu/drm/meson/meson_viu.c
-@@ -441,4 +441,5 @@ void meson_viu_init(struct meson_drm *priv)
->>>>>>> afb4920c (intial support for A311D MNT Pocket Reform)
+@@ -441,5 +441,5 @@ void meson_viu_init(struct meson_drm *priv)
  		VIU_OSD_FIFO_LIMITS(2);      /* fifo_lim: 2*16=32 */
 
  	if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A))