Received-SPF: pass (google.com: domain of linux-kernel+bounces-127684-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 07/13] staging: media: starfive: Separate ISP hardware from capture device
Date: Tue,  2 Apr 2024 03:00:05 -0700
Message-Id: <20240402100011.13480-8-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?LLLPJA4V3wPrkSqFj+UZz+YDRBvWAAvuLw4A3lmbbeptw8dtoNZGbDZkOcfi?=
 =?us-ascii?Q?lBAver7oNEoXJJvoVZ/uAUqZPVOAGJ0t6nzxcWmQp14Fc1leEG3ZzSCoIiZs?=
 =?us-ascii?Q?WkFvdo3D8qaVpT9vUEfPQuho8tICUEmTtPU+dB9dSnaeUBFuBj7QSSlYgfA5?=
 =?us-ascii?Q?ax8zcBbMLK1yee1TuL6amAvX+npTvRlPbkhQv+OvTrGos3VIT4tvWudboy5N?=
 =?us-ascii?Q?gsaKf+Q2KCAfK++EsB+u3dHODZysaYKr2eBNUFE9yk55N82JgUz/6VL9eMhS?=
 =?us-ascii?Q?wprEdtBpP210/FsfOAV1suArsgdjZzm39+qZEB9qYruGYlUpQ1ii/YRH1owU?=
 =?us-ascii?Q?cRQJEHZuGuWXrLWn6pi6r0MiOVQJakYVpH4OzVZL/VeZtQOWx6OhICQ+/ZBX?=
 =?us-ascii?Q?9VlPB2r3bF8XXWq8/96/Ci6qgIkbomFxXlYA5fEyIoJxZq1NR8jcNXgLqicS?=
 =?us-ascii?Q?QKEHUng3LEleNqlqqMCJ50IQZS1+IzO8HIUaKtupDUMH/gxEC5MpjAhxxBM3?=
 =?us-ascii?Q?xNHwI+tF7z04cnCArTJvBqo1NojUCuaLWMazCtL6/fxgtblrDixe/+OFNmF1?=
 =?us-ascii?Q?jkocV91YRx3XxtGI1nWOLWNMIyuTfY/szxpK/m+IaSzgYXVR9cWtLf8bF/jj?=
 =?us-ascii?Q?wIZBhgKSCAX3NBneV3cQuYR0PtQOiU/4aHJcWDpBHa21s5GRE7tcfe7CzO2Q?=
 =?us-ascii?Q?uhAhrIh1DVY0r2VIVya0O2ei5QdK6/zePBFRkRPfVvOd+S4g0JqDi+eJz2g8?=
 =?us-ascii?Q?FAPnaXnpmxH/kJd7ne2OzSSqssv50Ow264x9ZPIEsOXZGs5Pc60PxGLJLJis?=
 =?us-ascii?Q?gRkPojYoExAbRJs6UkqSw/rZaSCp0wTI2MUvpEZ+igJ1T7wyNGb9zDPOcDdB?=
 =?us-ascii?Q?rUONnC0iqnx5VZbp+AaH8QpWZ4HZ31390C17TgeIU2i/RNNJbfycZMttIp1Q?=
 =?us-ascii?Q?vLUDs40qCgq5j6Df972QwmqtQvHP4arhRSRziJsiks6Kr2AdWZJ/z+J/c2Pn?=
 =?us-ascii?Q?678l8gLrS4iLHadnf306P0xEsTAxnrIz+5HFg7FJJ2cuRSN2pH4W14oL8AtX?=
 =?us-ascii?Q?zU9Rp7nMHZdZkdhcHN7VxSWf+T7CcwXqm1JnwM1RkTtBGnIF8KmGnf3yqsXy?=
 =?us-ascii?Q?gFMyEmAM2Oz3qqxgoWMPmXlCIWMvwDv+KyNceEjSedePpl07ttmqkYuVLhx8?=
 =?us-ascii?Q?VU6xHzaBvj5OyjIRCKi3Pmmy1Q81EjGdLa9IhfnjRr+HQLykTC9o8Rrh2Ybr?=
 =?us-ascii?Q?SNtcF3zAEpefuvdUc1pn+Av18WPoqO5tIgx4Y9KT2szU1CL+ljapUcPosTjM?=
 =?us-ascii?Q?mZ6Zj3oxx/9wXYe3w/2NXDDUZ8SMv7lEDgMyAFDQC57vXUWitmbhYTPndpmZ?=
 =?us-ascii?Q?QPt1sgeJj3/6W2VtwGot7LS+zDoa7DN7dNw7rCyzNoU8VUFJHDXtS+Ea6T3c?=
 =?us-ascii?Q?I/Luhm0j6ClVUi36W2IEBsL/gXiC7sd/1MAsVjA69xeBFRn5mEMPsmgFr81W?=
 =?us-ascii?Q?9hH1oLMdho0BZe+8yBFWLupfq1BRokUXDiSbWfzY3+Ym9Ghh96nxTPWQ0n3G?=
 =?us-ascii?Q?zZDInYGwN4a/vX9mje3F4obzrGcrJeafzsSXKP/wbQJ4UNiDM7IM9iRBINLX?=
 =?us-ascii?Q?/lObKzwJYkSl/8dyFQtvNRQ=3D?=
X-OriginatorOrg: starfivetech.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 941a7dd1-2438-4d9f-ebc1-08dc52fbbc1c
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:32.7187
 (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: RDcJh/B2YBxHyYr8oZMHTZdXXXETrhYam0oCU2vlPjmZ7y5casuDcVr5SctaAUEWQYJdc7lPN/ZXjKtvD5M7ZJO08emj8PvH8gxs92W2cbj4hFLX/UwZufqHoR7FcEfa
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SHXPR01MB0862

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 696d79920713..75f6ef405e61 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