Received-SPF: pass (google.com: domain of linux-kernel+bounces-127683-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Changhuang Liang <changhuang.liang@starfivetech.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Hans Verkuil <hverkuil-cisco@xs4all.nl>,
	Ming Qian <ming.qian@nxp.com>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Nicolas Dufresne <nicolas.dufresne@collabora.com>,
	Benjamin Gaignard <benjamin.gaignard@collabora.com>,
	Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>,
	Mingjia Zhang <mingjia.zhang@mediatek.com>,
	Marvin Lin <milkfafa@gmail.com>
Cc: Jack Zhu <jack.zhu@starfivetech.com>,
	Changhuang Liang <changhuang.liang@starfivetech.com>,
	linux-media@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-staging@lists.linux.dev
Subject: [PATCH v4 05/13] staging: media: starfive: Separate buffer from ISP hardware operation
Date: Tue,  2 Apr 2024 03:00:03 -0700
Message-Id: <20240402100011.13480-6-changhuang.liang@starfivetech.com>
In-Reply-To: <20240402100011.13480-1-changhuang.liang@starfivetech.com>
References: <20240402100011.13480-1-changhuang.liang@starfivetech.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?opvNdLQ4q/EcEMbVgr0Hjcydx2SqeGqur8jLce6WB1U6LgYPHddRuFLWU+TR?=
 =?us-ascii?Q?7mxf9aurwVM37CwQg6+u9Lo46yv9X+KrWEouRBhnbo7VV437w5yvHRqNijpw?=
 =?us-ascii?Q?aYdm846stWrHMvTP1K8YnfFl/vxvNDlO5Cb4uKkKZffqu0ZobVdbE1qnQYbp?=
 =?us-ascii?Q?nzN8fEcEQy/w6UELPJzgxwlFFUetJw0BpkIEehffXDw4GU1vDzzxBo1BBnTn?=
 =?us-ascii?Q?g9X3aacDhZh0AsStBFh8iL7c29HBMdZ6Tgu0Zbxjb+hXMVto1bpXBICa+kD3?=
 =?us-ascii?Q?eWqOiM4QeRj7o4FqE4PZSB/5j4qlTp3PXyQT9JCacuhALYcwD1EXIf1qbE4i?=
 =?us-ascii?Q?drEzVlR/6ESrIAtZ3kjrvu7ukzlPUsKnObbpSjJKmhw5NFHghzFR6fPXCquI?=
 =?us-ascii?Q?JL4ZJelxWtOCKMBrjyIJqgGppu4QWK7l7ZFdtIftCcLVc6659Hba4agGAPoc?=
 =?us-ascii?Q?ZyY+MzazBjKdqrKYdniK9DVsm5gX2i+pPIR/8aI+90CvSHvB5TVUDvMe3xeR?=
 =?us-ascii?Q?WNTF21SQzDhGUaE0+4H0Lq/7ERev6MlS4+/7MB+C0oi+zy5alC8hoPMQD9Tu?=
 =?us-ascii?Q?B7ZgyvWrDGYL6/IRMH8CJrEl3ZYVtBxS1KsaTPM0fYovKbKudzVyzEypnL/g?=
 =?us-ascii?Q?TGP9Zm699s/2tEys+aVmcHYJnEpUgYe1eoND949gnA0FzFrx/JMsu+kRBVOU?=
 =?us-ascii?Q?m2HWii3hWFWGcfMJhDErfx1WCwZm3cG9bRMQQ+rxEqZVqILFwTzeUgscXcMa?=
 =?us-ascii?Q?2tNxE5AjCpH4QRFpi3CiRjz8LLifYbgb7ClFrMWvcQuedzbENJXmht/vvzEl?=
 =?us-ascii?Q?wnOlBbpfzIsjjobUrTNPkUD4vZv7dy5zwBRhc6aczjKY7VCZdoAdeKOHSywU?=
 =?us-ascii?Q?lvShWQ6mgT+EV5clL+o1FSa1Fa9tCbcjk/l3CfNBM9HB/dC58ujbwHgi4/pR?=
 =?us-ascii?Q?/rRlYjq/nIwpwnSlrm08BAYB3jjuevKgRZ6P16cjTm96nEEPEBvetuovz+dN?=
 =?us-ascii?Q?XEvwZUUAOy746VjRfPVOJ2UrG6Dpn4CQU7Cs83NF2LQMCM1Og+VHk12EZFfa?=
 =?us-ascii?Q?83ZRCGI2S6jgKQbFwLFGxUb/IRSGv10mS2HMsugGqC3NZuEwVuVuQ5pN9OYb?=
 =?us-ascii?Q?NNfnrw1a6co4CLpGg+hPa6u7/aGi30miw2m1Sl1WTQ7mG6yv4jzrWC7rR4Ax?=
 =?us-ascii?Q?FqMZ4mEMKdKHnW/bjkirmdTFBJvNHhnbILLUPYwnfb/8vUQ5qfhlEaXJ5yfS?=
 =?us-ascii?Q?yWHKzOHz2vFhICvbYCjNWwu7Ckm45P4mqIjvs0eElu8TQNsxqNguVT/fJAHX?=
 =?us-ascii?Q?Z7FbM7ambGD+/mmHZAzXqMbAWBEBYshLw3CUOpwk7a4NzQFcgeQXRUS0qof5?=
 =?us-ascii?Q?6AorJFLOM2pE1n8NQ5EwW8XkrcmhjAabylYVncTtqORNPllfKrI44HpbkVrR?=
 =?us-ascii?Q?00wOwVe4jHBpKUzHVw/WYZQR5OrQl1rdiaRmMGr7fu+C7y/uyfUZcC6v4NYj?=
 =?us-ascii?Q?tqW9F7UFsvHqGCl2JIjcpBORyKQrnMXxSZh4M8ZrmpcLfJ2iSm3kOTQh4UDF?=
 =?us-ascii?Q?gjuNUrQslgpKgDGYi9cwL/JH86zjvaVPC2bzkeQtBXe8OSEsam1BrylrXUCr?=
 =?us-ascii?Q?H175T4MMZF9KlE2vKIXDCf0=3D?=
X-OriginatorOrg: starfivetech.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1c200a57-f78b-4c3a-80c6-08dc52fbba13
X-MS-Exchange-CrossTenant-AuthSource: SHXPR01MB0671.CHNPR01.prod.partner.outlook.cn
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2024 10:00:29.2455
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: WKTcZDL4WKTTOd6QTfdyXpx2eS1j1cYnFqOE9qmf28dtJJ2qAc1L3/TED5Y1+VEOrarV3BxKAIimU0IfDq5ZgFtD35NtQeqnxVHjKtqxnQpOPaiB2r4nIMyy5oWfitmB
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SHXPR01MB0669

Separate buffer from ISP hardware operation. Convenient to extract the
buffer be a common file.
Replace "while" with "if" in stf_buf_done helper function because one
interrupt signal only handle one video buffer.

Signed-off-by: Changhuang Liang <changhuang.liang@starfivetech.com>
---
 .../media/starfive/camss/stf-capture.c        | 63 +++++++++++--------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/drivers/staging/media/starfive/camss/stf-capture.c b/drivers/staging/media/starfive/camss/stf-capture.c
index ec5169e7b391..494e56e731f0 100644
--- a/drivers/staging/media/starfive/camss/stf-capture.c
+++ b/drivers/staging/media/starfive/camss/stf-capture.c
@@ -368,7 +368,7 @@ static void stf_buf_flush(struct stf_v_buf *output, enum vb2_buffer_state state)
 	}
 }
 
-static void stf_buf_done(struct stf_v_buf *output)
+static struct stfcamss_buffer *stf_buf_done(struct stf_v_buf *output)
 {
 	struct stfcamss_buffer *ready_buf;
 	u64 ts = ktime_get_ns();
@@ -376,27 +376,27 @@ static void stf_buf_done(struct stf_v_buf *output)
 
 	if (output->state == STF_OUTPUT_OFF ||
 	    output->state == STF_OUTPUT_RESERVED)
-		return;
+		return NULL;
 
 	spin_lock_irqsave(&output->lock, flags);
 
-	while ((ready_buf = stf_buf_get_ready(output))) {
+	ready_buf = stf_buf_get_ready(output);
+	if (ready_buf) {
 		ready_buf->vb.vb2_buf.timestamp = ts;
 		ready_buf->vb.sequence = output->sequence++;
-
-		vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
 	}
 
 	spin_unlock_irqrestore(&output->lock, flags);
+
+	return ready_buf;
 }
 
-static void stf_change_buffer(struct stf_v_buf *output)
+static struct stfcamss_buffer *stf_change_buffer(struct stf_v_buf *output)
 {
 	struct stf_capture *cap = container_of(output, struct stf_capture,
 					       buffers);
 	struct stfcamss *stfcamss = cap->video.stfcamss;
 	struct stfcamss_buffer *ready_buf;
-	dma_addr_t *new_addr;
 	unsigned long flags;
 	u32 active_index;
 
@@ -404,7 +404,7 @@ static void stf_change_buffer(struct stf_v_buf *output)
 	    output->state == STF_OUTPUT_STOPPING ||
 	    output->state == STF_OUTPUT_RESERVED ||
 	    output->state == STF_OUTPUT_IDLE)
-		return;
+		return NULL;
 
 	spin_lock_irqsave(&output->lock, flags);
 
@@ -426,37 +426,37 @@ static void stf_change_buffer(struct stf_v_buf *output)
 
 	/* Get next buffer */
 	output->buf[active_index] = stf_buf_get_pending(output);
-	if (!output->buf[active_index]) {
-		new_addr = ready_buf->addr;
+	if (!output->buf[active_index])
 		stf_buf_update_on_last(output);
-	} else {
-		new_addr = output->buf[active_index]->addr;
+	else
 		stf_buf_update_on_next(output);
-	}
 
-	if (output->state == STF_OUTPUT_STOPPING) {
+	if (output->state == STF_OUTPUT_STOPPING)
 		output->last_buffer = ready_buf;
-	} else {
-		if (cap->type == STF_CAPTURE_RAW)
-			stf_set_raw_addr(stfcamss, new_addr[0]);
-		else if (cap->type == STF_CAPTURE_YUV)
-			stf_set_yuv_addr(stfcamss, new_addr[0], new_addr[1]);
-
+	else
 		stf_buf_add_ready(output, ready_buf);
-	}
 
 out_unlock:
 	spin_unlock_irqrestore(&output->lock, flags);
+
+	return output->buf[active_index];
 }
 
 irqreturn_t stf_wr_irq_handler(int irq, void *priv)
 {
 	struct stfcamss *stfcamss = priv;
 	struct stf_capture *cap = &stfcamss->captures[STF_CAPTURE_RAW];
+	struct stfcamss_buffer *change_buf;
+	struct stfcamss_buffer *ready_buf;
 
 	if (atomic_dec_if_positive(&cap->buffers.frame_skip) < 0) {
-		stf_change_buffer(&cap->buffers);
-		stf_buf_done(&cap->buffers);
+		change_buf = stf_change_buffer(&cap->buffers);
+		if (change_buf)
+			stf_set_raw_addr(stfcamss, change_buf->addr[0]);
+
+		ready_buf = stf_buf_done(&cap->buffers);
+		if (ready_buf)
+			vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
 	}
 
 	stf_syscon_reg_set_bit(stfcamss, VIN_INRT_PIX_CFG, U0_VIN_INTR_CLEAN);
@@ -469,12 +469,16 @@ irqreturn_t stf_isp_irq_handler(int irq, void *priv)
 {
 	struct stfcamss *stfcamss = priv;
 	struct stf_capture *cap = &stfcamss->captures[STF_CAPTURE_YUV];
+	struct stfcamss_buffer *ready_buf;
 	u32 status;
 
 	status = stf_isp_reg_read(stfcamss, ISP_REG_ISP_CTRL_0);
 	if (status & ISPC_ISP) {
-		if (status & ISPC_ENUO)
-			stf_buf_done(&cap->buffers);
+		if (status & ISPC_ENUO) {
+			ready_buf = stf_buf_done(&cap->buffers);
+			if (ready_buf)
+				vb2_buffer_done(&ready_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
+		}
 
 		stf_isp_reg_write(stfcamss, ISP_REG_ISP_CTRL_0,
 				  (status & ~ISPC_INT_ALL_MASK) |
@@ -488,13 +492,18 @@ irqreturn_t stf_line_irq_handler(int irq, void *priv)
 {
 	struct stfcamss *stfcamss = priv;
 	struct stf_capture *cap = &stfcamss->captures[STF_CAPTURE_YUV];
+	struct stfcamss_buffer *change_buf;
 	u32 status;
 
 	status = stf_isp_reg_read(stfcamss, ISP_REG_ISP_CTRL_0);
 	if (status & ISPC_LINE) {
 		if (atomic_dec_if_positive(&cap->buffers.frame_skip) < 0) {
-			if ((status & ISPC_ENUO))
-				stf_change_buffer(&cap->buffers);
+			if ((status & ISPC_ENUO)) {
+				change_buf = stf_change_buffer(&cap->buffers);
+				if (change_buf)
+					stf_set_yuv_addr(stfcamss, change_buf->addr[0],
+							 change_buf->addr[1]);
+			}
 		}
 
 		stf_isp_reg_set_bit(stfcamss, ISP_REG_CSIINTS,
-- 
2.25.1