From 308d91769707edc9898ea26edc5e8fa81661e263 Mon Sep 17 00:00:00 2001
From: Wei Dun <willam.wei@rock-chips.com>
Date: Thu, 21 Aug 2025 16:24:29 +0800
Subject: [PATCH] media: rockchip: vpss: add FBC format alignment check for
 width/height

Change-Id: Ia35e17fd0c825b694f609c2a8f3636d261465c7c
Signed-off-by: Wei Dun <willam.wei@rock-chips.com>
---
 .../platform/rockchip/vpss/vpss_offline_v20.c | 68 +++++++++++++++----
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/drivers/media/platform/rockchip/vpss/vpss_offline_v20.c b/drivers/media/platform/rockchip/vpss/vpss_offline_v20.c
index 55afee3a99f7..97b8647a8f71 100644
--- a/drivers/media/platform/rockchip/vpss/vpss_offline_v20.c
+++ b/drivers/media/platform/rockchip/vpss/vpss_offline_v20.c
@@ -946,11 +946,6 @@ static int read_config(struct rkvpss_offline_dev *ofl,
 	u32 in_ctrl, in_size, in_c_offs, unite_r_offs, val, mask, unite_off = 0, enlarge = 0,
 		header_size = 0, payload_size = 0;
 
-	if (!IS_ALIGNED(cfg->input.stride, 4)) {
-		v4l2_err(&ofl->v4l2_dev, "input stride %d is not 4-byte aligned\n", cfg->input.stride);
-		return -EINVAL;
-	}
-
 	in_c_offs = 0;
 	in_ctrl = 0;
 	switch (cfg->input.format) {
@@ -1348,17 +1343,10 @@ static int write_config(struct rkvpss_offline_dev *ofl,
 				 cfg->dev_id, i);
 			cfg->output[i].enable = 0;
 		}
-
 		if (!cfg->output[i].enable)
 			continue;
 		ch_en = true;
 
-		if (!IS_ALIGNED(cfg->output[i].stride, 4)) {
-			v4l2_err(&ofl->v4l2_dev, "output stride %d is not 4-byte aligned for ch%d\n",
-				 cfg->output[i].stride, i);
-			return -EINVAL;
-		}
-
 		if (cfg->output[i].aspt.enable) {
 			w = cfg->output[i].aspt.width;
 			h = cfg->output[i].aspt.height;
@@ -2028,6 +2016,34 @@ int rkvpss_check_params(struct rkvpss_offline_dev *ofl,
 		goto end;
 	}
 
+	/* check input format alignment */
+	if (cfg->input.format == V4L2_PIX_FMT_FBC0 ||
+	    cfg->input.format == V4L2_PIX_FMT_FBC2 ||
+	    cfg->input.format == V4L2_PIX_FMT_FBC4) {
+		if (!IS_ALIGNED(cfg->input.width, 64)) {
+			v4l2_err(&ofl->v4l2_dev,
+				 "dev_id:%d fbc input width %d is not 64 aligned\n",
+				 cfg->dev_id, cfg->input.width);
+			ret = -EINVAL;
+			goto end;
+		}
+		if (!IS_ALIGNED(cfg->input.height, 4)) {
+			v4l2_err(&ofl->v4l2_dev,
+				 "dev_id:%d fbc input height %d is not 4 aligned\n",
+				 cfg->dev_id, cfg->input.height);
+			ret = -EINVAL;
+			goto end;
+		}
+	} else {
+		if (!IS_ALIGNED(cfg->input.stride, 4)) {
+			v4l2_err(&ofl->v4l2_dev,
+				 "dev_id:%d input stride %d is not 4-byte aligned\n",
+				 cfg->dev_id, cfg->input.stride);
+			ret = -EINVAL;
+			goto end;
+		}
+	}
+
 	*unite = false;
 	if (cfg->input.width > RKVPSS_MAX_WIDTH_V20) {
 		*unite = true;
@@ -2107,6 +2123,34 @@ int rkvpss_check_params(struct rkvpss_offline_dev *ofl,
 			goto end;
 		}
 
+		/* check output format alignment */
+		if (cfg->output[i].format == V4L2_PIX_FMT_FBC0 ||
+		    cfg->output[i].format == V4L2_PIX_FMT_FBC2 ||
+		    cfg->output[i].format == V4L2_PIX_FMT_FBC4) {
+			if (!IS_ALIGNED(cfg->input.width, 64)) {
+				v4l2_err(&ofl->v4l2_dev,
+					 "dev_id:%d ch:%d fbc output width %d is not 64 aligned\n",
+					 cfg->dev_id, i, cfg->input.width);
+				ret = -EINVAL;
+				goto end;
+			}
+			if (!IS_ALIGNED(cfg->input.height, 4)) {
+				v4l2_err(&ofl->v4l2_dev,
+					 "dev_id:%d ch:%d fbc output height %d is not 4 aligned\n",
+					 cfg->dev_id, i, cfg->input.height);
+				ret = -EINVAL;
+				goto end;
+			}
+		} else {
+			if (!IS_ALIGNED(cfg->output[i].stride, 4)) {
+				v4l2_err(&ofl->v4l2_dev,
+					 "dev_id:%d ch:%d output stride %d is not 4-byte aligned\n",
+					 cfg->dev_id, i, cfg->output[i].stride);
+				ret = -EINVAL;
+				goto end;
+			}
+		}
+
 		/* check output size */
 		if (cfg->output[i].aspt.enable) {
 			out_width = cfg->output[i].aspt.width;