Received-SPF: pass (google.com: domain of linux-kernel+bounces-23277-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::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>
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 v2 07/13] staging: media: starfive: Separate ISP hardware from capture device
Date: Thu, 11 Jan 2024 00:41:14 -0800
Message-Id: <20240111084120.16685-8-changhuang.liang@starfivetech.com>
In-Reply-To: <20240111084120.16685-1-changhuang.liang@starfivetech.com>
References: <20240111084120.16685-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?5y4GSLcq4G6fg02/HE0gpYACbMwm9YBeEM2UBe9XJKpKtRt+hoJZbEgt9uuP?=
 =?us-ascii?Q?zcWJYEzqZANr+Mp5BOqr5dnBrQCy2gW4UuvYMQLa1MCrQQZboOUajTruk4Bj?=
 =?us-ascii?Q?UvO23AwUD5bcwmyVmvXvX5EfUvojQGllZEEx6g5MpuZwNPhzyAEjoD1fuc+4?=
 =?us-ascii?Q?WjIJqHjy2O8sZrOnPOCHeK+RO2Qgc65PjwQ2NEBxjJBNxaOvB1kABLngroE4?=
 =?us-ascii?Q?M61uQbIKIASKwJnLJFFtygkm1CyuZ9zRWyhvHrkzX2n3cEhGuv/zTMkZtUPr?=
 =?us-ascii?Q?DIDuHdkEr6KO6Ce5i71Xz0uVsKeWrq8cXmwzP9lb+zreKuvViaO+rQmSkNu8?=
 =?us-ascii?Q?E0pVOEO2265l0b9i46YQ1lG9Mgim5r8AFEioiaMUImAdPSfwpD0UzLfMKCpx?=
 =?us-ascii?Q?KAR+1hzxDUyAUq7YinRAeyiRuFEYV9w8esJ5FKVuAa6UEmkOaux3MYKArmhy?=
 =?us-ascii?Q?KZIJiFh7YbAh3aTTvlRorcHRIIrgybnv7n5C5z1QXWbFJEzgjbBEFQu58S5X?=
 =?us-ascii?Q?5AQCTSgsJoIqSWb7Rt/79cGrNex80y8ypqSgAK0tAAsGspRWKTWg9CEcvLXr?=
 =?us-ascii?Q?Wg3AfNK7lgfEo5K44Dh7KmbFfILAkc9zp6frww9mePC/hdUDwYc671CAN+Uo?=
 =?us-ascii?Q?ZDg6Tf3k1ZFhYPOfKe9dnItrrjRIlA/MVN4ohCTOo2QeipDFTzIpuEmTctYq?=
 =?us-ascii?Q?TkZs/naYhaIit5xoDy+wFZzhXZiIUkZyWdJWpkSyw8FCm9tlnmv0C9tkWYOU?=
 =?us-ascii?Q?L+SYjZXfGc8FWvWZXcPOi8bUXKBTTxGPY8frvZ2IeF16oTd64J56IJPqYNxZ?=
 =?us-ascii?Q?SyvNxO2rRsyDN8BwWujbLW04kns4cq9TOXMUf83vEQoQp0xMNSAKpkQefn7y?=
 =?us-ascii?Q?R/p1V11wQM5jtC7aSIGAzl1Y5bMqVtPRTlDNVvWVrN3K88jXDdCQ5za7fOZ8?=
 =?us-ascii?Q?fO4Z4WLwaX6OKUjxG1qkTjmehH4EvCIoNVmPkHcBKQ8hcRg2bePgPl3+Q0a8?=
 =?us-ascii?Q?1e/ccTBeuYsyhMUzzM9S5D+FXf+5p96b7jnDcEywbX9xa4OR38yCBGCnK5Sb?=
 =?us-ascii?Q?RMhD9QaOLR2X0708sUOeJQz0+sqjy3gn2/AMVYEsf9nzMDEl4bkOiKh5uzVb?=
 =?us-ascii?Q?QdXGj4iuiJ0SFPzHTSvW1M8B9vhq3wYYPQDoOZlSjkPOqcR9aOagprRsEQ3k?=
 =?us-ascii?Q?1TZur9mENFGwCyuVpk30qPURIdfmuyN5p795uw/d1VIVQJEAyXa8SwbxgkIX?=
 =?us-ascii?Q?RHXuXHmh1uoz4yqaumtCcpMi3+nPjB/Eop7Q0JNvcdOGiT8mvUoAnfQwOtxj?=
 =?us-ascii?Q?3XmuWDj/Stnqb9HjAnN2R1ArTllexDAKl1xooiiT6P4hbUDrKxv17gP0B2Bf?=
 =?us-ascii?Q?uwQHhsijs0FjDm26gG5bK8vjEHE3Z5vEBCPUi4gDdllO7h8t7TReud/c5KPT?=
 =?us-ascii?Q?Xx3dIAFeCx9YFNvcxh7CLfpDAZnWuzEUsoSMaWoqtx0nEg/ju0x2VI6RDE7R?=
 =?us-ascii?Q?aU3yZ3pkYDXaMTKB09+uoCwcy5GMOBknOnTWciUh/jHh8Y6FzYX7cv1rfhX2?=
 =?us-ascii?Q?nGjm2Vg3pWQlUlNlWHrDpvWOAMUipLUi8hrxLjYUjFBeGN5gDzWbnE1njkwN?=
 =?us-ascii?Q?hGN+lowIAySWNRSLHuUny3w=3D?=
X-OriginatorOrg: starfivetech.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0b9aa3a9-6e3f-44ab-a64e-08dc12811d7f
X-MS-Exchange-CrossTenant-AuthSource: SH0PR01MB0667.CHNPR01.prod.partner.outlook.cn
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2024 08:41:33.5690
 (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: LhDplDBkP2ccV47xWni6JLeJu38nHjHPuivgx2Q3VnJOOxiseaeB7kirg5XXD4/+2jT0ik0TUmEMf4DQZkowQzDs39tS0TJzrl//zHYeEJmFuTlM/42ypTTZlgWlJ/zx
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SH0PR01MB0747

Some ISP hardware operations also use for output device, so separate it
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