Received-SPF: pass (google.com: domain of linux-kernel+bounces-138223-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Changhuang Liang <changhuang.liang@starfivetech.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
	Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Jack Zhu <jack.zhu@starfivetech.com>,
	Changhuang Liang <changhuang.liang@starfivetech.com>,
	Dan Carpenter <dan.carpenter@linaro.org>,
	linux-media@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-staging@lists.linux.dev
Subject: [PATCH v2 7/8] staging: media: starfive: Move the struct media_pipeline position
Date: Wed, 10 Apr 2024 02:10:25 -0700
Message-Id: <20240410091026.50272-8-changhuang.liang@starfivetech.com>
In-Reply-To: <20240410091026.50272-1-changhuang.liang@starfivetech.com>
References: <20240410091026.50272-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?/M72600xFXwg7rfnK837AYLinfK7gUso1FXYkPW3vPmqmcopARU+5BuKT8oG?=
 =?us-ascii?Q?CdWQj0d92yJlj/oO8GWLN0RWuSEbSwQ2mVTrAlPbGNtFrbvQAk5bcdspEUmB?=
 =?us-ascii?Q?r1cRkfYjYMkOXt29Uv3vLeb9AqxGJk52zN955UnyXRqpsb/g+RykSwv5XPq/?=
 =?us-ascii?Q?d0MwfWXKPaLtW3wa0R0/fsUSbniDpGcm0u2KqrkqDfru6Tcb/2Q9Cj7pZaW7?=
 =?us-ascii?Q?dxtOXp/4yArLxBDlTJDL/OeozTomHkpGxQlzl8owTu1HwgveJpofH9JQazqG?=
 =?us-ascii?Q?quEJMQkms7T4O56tSRAlri90eiy2xq0ka7IX7V7UQ8DdGyXtzazpInND0/Uw?=
 =?us-ascii?Q?xnliK1Y5F5ljfUCwEJfQGdj6KDrrPxhjPQbJpK4RlD48dfGgJj5c8dNKjgMz?=
 =?us-ascii?Q?hb4KXoYChngJeV/i0ntoGElGy1wLyyezam4ZfrVfDqsCN70V8kzFbA/Tba/h?=
 =?us-ascii?Q?J2OpAKKTvTabvnSJ9UguLrA56vQ+KqrWPaBd2bPyNyYNk3qyZWjXSosztHoD?=
 =?us-ascii?Q?d8B0PuJvAFSZWt48lwDXe6gAf3yhfRlhVzSq7JcepzqzthMAPd3Fu3D3d7Qu?=
 =?us-ascii?Q?LAmJeD6EC4fj393o1ngJn60mlq1rO0qw6DwTKhI9weFQT92UfWKPOOzLHmw/?=
 =?us-ascii?Q?JNqXaBmht9ROEeoCdCk/i6Vd0J2aAcvU+/GsVEF4YJf+Ia3arnsQC5qlX2NY?=
 =?us-ascii?Q?pxKwzR3DivBlFnY62XFiWtTmgru9xdAfdqPWGPZ1jN1ZcgDs+EvnocH+g2hs?=
 =?us-ascii?Q?eyUAMoGuXkYtJcCMJZqdhUpiBSWEiwEtynI7JWupMaYy57YmCzQYYXDKt6LD?=
 =?us-ascii?Q?fC6LwPHMNxQdU7Rz86ZAXaounApYQ3ZRDCbTfWxFl/RCnmrtTIrXcrUYkUZ3?=
 =?us-ascii?Q?4KHTxI9XWlhxERBb5U234f1ArX7ZdZT+8UKx0NIG5VzA/mglkOwkHNL36sPi?=
 =?us-ascii?Q?jencf93DS9hBbSAszm4/7iE6zvMfmwPKKmEny5OzSVYudJ+gLdhaEn2m2av6?=
 =?us-ascii?Q?gKeo/MhJRkYpmuMfzYVir9YwfnODHvaO2dEl0uj6ieFeC4WMwV4QeDfYCql3?=
 =?us-ascii?Q?TXb5HkxplnEEewUOLWGKvwPAFlcddT15N+8a/+vF3V1iDF9UtgdSL/NdsWJw?=
 =?us-ascii?Q?fbFz4gUmz9FyMx1WiyekotX6vukBIVoCc45PBMIWhNQ2KvV5yzFLVsDywb90?=
 =?us-ascii?Q?hBEzq8sJf0ZkK1sEF3HlfMuKluEAuJDGQORRQEODA54Stu/W3kzdp2qGOjAU?=
 =?us-ascii?Q?OHARSGruxDSUj/g5eARIfu7Po7+D3Jnio4y1YR71sMabERdYJ+mlQ4eU122w?=
 =?us-ascii?Q?Atdzv/y4KvgVBvyMgTDTPwAtuGxL86yJAfAYAf/+0imTeWmu0datt23FUW1y?=
 =?us-ascii?Q?WOPeRCzhPT3yJoCAq7qScXu5sSe0plY3MQGdLyAP7X7CUOobB1yihpPQYcZE?=
 =?us-ascii?Q?iK+OwXPEp0uEf6Uu/ZXBhlz8B9Pzfx/bhdmCgR47l5zBStJ0FO2J8Uo/Hn6J?=
 =?us-ascii?Q?/4gYils7yOuOsgXhbmINbyv3Fu3+V6ACYA/syikwtgHcraPNXYUT8xijjf6S?=
 =?us-ascii?Q?E7W1MYWtHRuRhPk/STp57NdgJ7Emu5wPYEr0Dv4lFNIiWA+AfnD87+kDRzkq?=
 =?us-ascii?Q?bLOfeyl5j/LRJ/Wip1aREAg=3D?=
X-OriginatorOrg: starfivetech.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 674c8356-b30d-4ad2-3eb6-08dc593e18bc
X-MS-Exchange-CrossTenant-AuthSource: SHXPR01MB0671.CHNPR01.prod.partner.outlook.cn
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 09:10:41.8747
 (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: /yKFE53dFhThHLbyww0isgW6EX04zlUv1hBNyzFedwah3g4lp4O8aTdXbzvC/JC7AUptHB5Mf3hjv5ya4SUV06oA2XtrWkFmPc9qr6R2PKLcY0VFtahPfXWM3Ca/j8m/
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SHXPR01MB0461

Different video capture devices have different media pipeline. The
media pipeline cannot be shared between the "struct stfcamss". Move
it into "struct stfcamss_video" so that each video capture device
has its own independent media pipeline.

Fixes: bba185d141b1 ("media: staging: media: starfive: camss: Add core driver")

Signed-off-by: Changhuang Liang <changhuang.liang@starfivetech.com>
---
 drivers/staging/media/starfive/camss/stf-camss.h | 1 -
 drivers/staging/media/starfive/camss/stf-video.c | 2 +-
 drivers/staging/media/starfive/camss/stf-video.h | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/media/starfive/camss/stf-camss.h b/drivers/staging/media/starfive/camss/stf-camss.h
index 6b9215c92cfa..5fbac7e97eaf 100644
--- a/drivers/staging/media/starfive/camss/stf-camss.h
+++ b/drivers/staging/media/starfive/camss/stf-camss.h
@@ -52,7 +52,6 @@ struct stf_isr_data {
 struct stfcamss {
 	struct v4l2_device v4l2_dev;
 	struct media_device media_dev;
-	struct media_pipeline pipe;
 	struct device *dev;
 	struct stf_isp_dev isp_dev;
 	unsigned int isp_stream;
diff --git a/drivers/staging/media/starfive/camss/stf-video.c b/drivers/staging/media/starfive/camss/stf-video.c
index 69e3e4f9e56b..61d9d42fc5a0 100644
--- a/drivers/staging/media/starfive/camss/stf-video.c
+++ b/drivers/staging/media/starfive/camss/stf-video.c
@@ -280,7 +280,7 @@ static int video_start_streaming(struct vb2_queue *q, unsigned int count)
 	struct video_device *vdev = &video->vdev;
 	int ret;
 
-	ret = video_device_pipeline_start(vdev, &video->stfcamss->pipe);
+	ret = video_device_pipeline_start(vdev, &video->pipe);
 	if (ret < 0) {
 		dev_err(video->stfcamss->dev,
 			"Failed to media_pipeline_start: %d\n", ret);
diff --git a/drivers/staging/media/starfive/camss/stf-video.h b/drivers/staging/media/starfive/camss/stf-video.h
index ea7ec92c3ff5..0699c1716c2f 100644
--- a/drivers/staging/media/starfive/camss/stf-video.h
+++ b/drivers/staging/media/starfive/camss/stf-video.h
@@ -68,6 +68,7 @@ struct stfcamss_video {
 	struct vb2_queue vb2_q;
 	struct video_device vdev;
 	struct media_pad pad;
+	struct media_pipeline pipe;
 	struct v4l2_format active_fmt;
 	enum v4l2_buf_type type;
 	const struct stfcamss_video_ops *ops;
-- 
2.25.1