Received-SPF: pass (google.com: domain of linux-kernel+bounces-52282-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
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>
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 v3 07/13] staging: media: starfive: Separate ISP hardware from capture device
Date: Mon,  5 Feb 2024 01:04:18 -0800
Message-Id: <20240205090424.40302-8-changhuang.liang@starfivetech.com>
In-Reply-To: <20240205090424.40302-1-changhuang.liang@starfivetech.com>
References: <20240205090424.40302-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?1HNCs74MkbAOkVXEUe2iXU7IcWz0DnSQd89KZC3jXUoQR6PCatif5AxD4rdX?=
 =?us-ascii?Q?Jh46lDF3KIx1hBi8xHxlP3qAMtcuHYc2isXCQTQOjuE/+p12RpPu2ZXUccKN?=
 =?us-ascii?Q?zAtSlHFLdTHh4mesWzpZyFuaTTDJxyO5toquBVPZLNsMhOpbtrAmIezHyQCd?=
 =?us-ascii?Q?c8v5c5iYf4cLqXwc288zov6IP/kEh5T3qbX8cWAWDnPjQzpStYZMBowh6STk?=
 =?us-ascii?Q?QD7NrNCP6uN8cFKHlh6wSJ7ujG20yYfZCuMTFdxXsftnVDSGme+yjDRx7b+x?=
 =?us-ascii?Q?NtFqV2PQnnXe5/reggUpwsw0gjQSE7L5lqZsoDPkUVH7wj8fpUcQpZpy//PL?=
 =?us-ascii?Q?ZMwh1anhTxSHpE6oJuZLdkITeY/6rrqMJep8tVA5vQ6Lno7ccMytC8eIA0WU?=
 =?us-ascii?Q?aqmdflTh17LGk4tGTLlMTmNpkqlHPD/v0kimXdZF2LSY7s1xFvFT903d/gIn?=
 =?us-ascii?Q?kvX+8pYFZOr7l2FQqacf77AtXHNkcozQhrnwrY5SVm3POHaoutgbctCWNjqM?=
 =?us-ascii?Q?PM4SXAnM9JPtAPreglx0GyCHBkPxGynV3K+teBkNNJVI2m2DyP61gLiw/qnV?=
 =?us-ascii?Q?mdZuUWW5cLHHSz+rGuo5FxPMkNUcUZsOaxlBqbqGbG/z3XCmae2H/rncnHou?=
 =?us-ascii?Q?iXIQJsXz5zBAn+3atSC8ng4G4Gah3XxrNVeDS1MyE3ikXDP8ZpZLcbVTCXWX?=
 =?us-ascii?Q?oxjyksL7plebp7wFdzZhfhGxvCMEywTh7+TbFnfLVNIZfv0yMZoERxWd+Dn8?=
 =?us-ascii?Q?rFf37ood1TGTJf/MastE0SFz5jbFA0xazTHxY64E2t4o73IdGr4ACgvD7AqD?=
 =?us-ascii?Q?54JogT628clqy/pR4T2nhEEnHynBO0vdS9WQEmGzX/2bE6jY/jm/N2o2TrRr?=
 =?us-ascii?Q?JV4TPoxtyNNgimciJ3mvnhR8VEoI3dnr73dtDgKKkxNtQrO3l9M37wAj2pb2?=
 =?us-ascii?Q?fQEEKJiWNiyF+BpBdhn+8ERDHzYdRUJKDjKl2Gl1KWkPVwtlAYDIjLmjSFac?=
 =?us-ascii?Q?1DQtZLWNfvoCTD2vHvbjOT34HHovKb18S9nRbZujaZcbP0Tsjxq5dHW+EVbK?=
 =?us-ascii?Q?07RSTmR1d5SL03bpIME6a4hMMiTMXaOZDm0ZS5N0+lHnqCjtmq3bLkUwYBiG?=
 =?us-ascii?Q?Lye2VnCeMZL5nBiL2mU1fA3hmLF9/IY0mHGSibp+2rYGD8Ir/JMzhgYiAlHu?=
 =?us-ascii?Q?RybKZcL1rdPd5siP7N/yqB52oRNj6SbNiFdD3md0Y8LrCSQl+E+sbqQBI+HS?=
 =?us-ascii?Q?TqdH/4gDR7yepWOQreLIiEczGk0QsK7ZSiSh36k2+DKHTlHJfJJmZeExdzwp?=
 =?us-ascii?Q?AIQPVg/IHoV/80naDyS1dcFu9z/I4gG/ANzz/R2ru8IQrDHGhrP2djvONJD1?=
 =?us-ascii?Q?I/UanxJZS8GDITokA1DPCWifjb7UXTyJn5tp2qWzQ5S34wFcM6IJzsJackIA?=
 =?us-ascii?Q?ph1QtnTYKwe8RGn+j+8cZRQj6nTQ3NH1WSRdZga3V06AUJdUpiniNMTj68/Y?=
 =?us-ascii?Q?4UOITfznk6sDU4A5+KtVJwUfDhI5k3AJom1Xj7eYsrmOpdevDe7TGGSFdvg7?=
 =?us-ascii?Q?q6ARzdb9N4I+lbKkVWAXM1m/ezxEV0ZP3LjgtdPu3qn9sHV/K/OJVaQ20Kwb?=
 =?us-ascii?Q?kIYg10Cy/o/T65U3kKmnWqI=3D?=
X-OriginatorOrg: starfivetech.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 35bfb7f4-99c8-4d69-d894-08dc26297f3a
X-MS-Exchange-CrossTenant-AuthSource: SHXPR01MB0671.CHNPR01.prod.partner.outlook.cn
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 09:04:45.1032
 (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: iBpUjGrh+Xnp2JwuSkg2LBrNyR5NkpBZjMokkXmPGHIWpTRea8RgFonbARUhdsWD7RIJzeW48OGzmfJcP/8wNyFEQ8LVf124uUI3JKco5i84ziyhLcu88ZjC7P4fm2pA
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SHXPR01MB0815

Some ISP hardware operations also used for output device, so separate
them from capture device, move them to ISP common file.

Signed-off-by: Changhuang Liang <changhuang.liang@starfivetech.com>
---
 .../media/starfive/camss/stf-capture.c        | 60 -------------------
 .../media/starfive/camss/stf-isp-hw-ops.c     | 60 +++++++++++++++++++
 .../staging/media/starfive/camss/stf-isp.h    |  3 +
 3 files changed, 63 insertions(+), 60 deletions(-)

diff --git a/drivers/staging/media/starfive/camss/stf-capture.c b/drivers/staging/media/starfive/camss/stf-capture.c
index 5cbafac46ee6..e91e726a1462 100644
--- a/drivers/staging/media/starfive/camss/stf-capture.c
+++ b/drivers/staging/media/starfive/camss/stf-capture.c
@@ -66,13 +66,6 @@ static void stf_set_raw_addr(struct stfcamss *stfcamss, dma_addr_t addr)
 	stf_syscon_reg_write(stfcamss, VIN_START_ADDR_N, (long)addr);
 }
 
-static void stf_set_yuv_addr(struct stfcamss *stfcamss,
-			     dma_addr_t y_addr, dma_addr_t uv_addr)
-{
-	stf_isp_reg_write(stfcamss, ISP_REG_Y_PLANE_START_ADDR, y_addr);
-	stf_isp_reg_write(stfcamss, ISP_REG_UV_PLANE_START_ADDR, uv_addr);
-}
-
 static void stf_init_addrs(struct stfcamss_video *video)
 {
 	struct stf_capture *cap = to_stf_capture(video);
@@ -307,59 +300,6 @@ irqreturn_t stf_wr_irq_handler(int irq, void *priv)
 	return IRQ_HANDLED;
 }
 
-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) {
-			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) |
-				  ISPC_ISP | ISPC_CSI | ISPC_SC);
-	}
-
-	return IRQ_HANDLED;
-}
-
-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)) {
-				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,
-				    CSI_INTS_MASK, CSI_INTS(0x3));
-		stf_isp_reg_set_bit(stfcamss, ISP_REG_IESHD,
-				    SHAD_UP_M | SHAD_UP_EN, 0x3);
-
-		stf_isp_reg_write(stfcamss, ISP_REG_ISP_CTRL_0,
-				  (status & ~ISPC_INT_ALL_MASK) | ISPC_LINE);
-	}
-
-	return IRQ_HANDLED;
-}
-
 static int stf_queue_buffer(struct stfcamss_video *video,
 			    struct stfcamss_buffer *buf)
 {
diff --git a/drivers/staging/media/starfive/camss/stf-isp-hw-ops.c b/drivers/staging/media/starfive/camss/stf-isp-hw-ops.c
index c34631ff9422..6b3966ca18bf 100644
--- a/drivers/staging/media/starfive/camss/stf-isp-hw-ops.c
+++ b/drivers/staging/media/starfive/camss/stf-isp-hw-ops.c
@@ -443,3 +443,63 @@ void stf_isp_stream_set(struct stf_isp_dev *isp_dev)
 	stf_isp_reg_write_delay(stfcamss, ISP_REG_CSI_INPUT_EN_AND_STATUS,
 				CSI_EN_S, 10);
 }
+
+void stf_set_yuv_addr(struct stfcamss *stfcamss,
+		      dma_addr_t y_addr, dma_addr_t uv_addr)
+{
+	stf_isp_reg_write(stfcamss, ISP_REG_Y_PLANE_START_ADDR, y_addr);
+	stf_isp_reg_write(stfcamss, ISP_REG_UV_PLANE_START_ADDR, uv_addr);
+}
+
+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)) {
+				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,
+				    CSI_INTS_MASK, CSI_INTS(0x3));
+		stf_isp_reg_set_bit(stfcamss, ISP_REG_IESHD,
+				    SHAD_UP_M | SHAD_UP_EN, 0x3);
+
+		stf_isp_reg_write(stfcamss, ISP_REG_ISP_CTRL_0,
+				  (status & ~ISPC_INT_ALL_MASK) | ISPC_LINE);
+	}
+
+	return IRQ_HANDLED;
+}
+
+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) {
+			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) |
+				  ISPC_ISP | ISPC_CSI | ISPC_SC);
+	}
+
+	return IRQ_HANDLED;
+}
diff --git a/drivers/staging/media/starfive/camss/stf-isp.h b/drivers/staging/media/starfive/camss/stf-isp.h
index bc7e7b0736fa..fcda0502e3b0 100644
--- a/drivers/staging/media/starfive/camss/stf-isp.h
+++ b/drivers/staging/media/starfive/camss/stf-isp.h
@@ -427,4 +427,7 @@ int stf_isp_init(struct stfcamss *stfcamss);
 int stf_isp_register(struct stf_isp_dev *isp_dev, struct v4l2_device *v4l2_dev);
 int stf_isp_unregister(struct stf_isp_dev *isp_dev);
 
+void stf_set_yuv_addr(struct stfcamss *stfcamss,
+		      dma_addr_t y_addr, dma_addr_t uv_addr);
+
 #endif /* STF_ISP_H */
-- 
2.25.1