Received-SPF: pass (google.com: domain of linux-kernel+bounces-169532-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Ming Qian <ming.qian@nxp.com>
To: mchehab@kernel.org,
	hverkuil-cisco@xs4all.nl
Cc: nicolas@ndufresne.ca,
	shawnguo@kernel.org,
	robh+dt@kernel.org,
	s.hauer@pengutronix.de,
	kernel@pengutronix.de,
	festevam@gmail.com,
	linux-imx@nxp.com,
	xiahong.bao@nxp.com,
	eagle.zhou@nxp.com,
	tao.jiang_2@nxp.com,
	ming.qian@oss.nxp.com,
	imx@lists.linux.dev,
	linux-media@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 2/3] media: amphion: Remove lock in s_ctrl callback
Date: Mon,  6 May 2024 17:49:17 +0900
Message-ID: <20240506084918.799544-2-ming.qian@nxp.com>
In-Reply-To: <20240506084918.799544-1-ming.qian@nxp.com>
References: <20240506084918.799544-1-ming.qian@nxp.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?C0I4oeI6xD9xQpi39ORammHOqoftGzNgyGAfhVAVOiVAnmWTHw3LtEuREG41?=
 =?us-ascii?Q?l3DX3ElY0yZ4cbq9U5MvApxxLmV+xWE+c/cKaMLp8stDAHshnrVZ8EOztgrL?=
 =?us-ascii?Q?p2t4wbq1G3+sXYHGyZXjaNS2X/mK519CX6VBV1rIpldLzI22DJcA39O46Qdf?=
 =?us-ascii?Q?rWDeYgNqPC7PjhyeqzEabM3RSx+4jNro3Jnft8D/Eg1jn7jN4eGr1Uv9bh5l?=
 =?us-ascii?Q?muU3XAEwWfJNBcQlbDj1nyWqmjC4aSagcm9PrR735dUYw8T3zEzLuAZl9reK?=
 =?us-ascii?Q?20RMDnzr8L/VqXadEv44Z3igTdd00mqriYC9xtjrC6qsiNGKm0uBt1fVXfa5?=
 =?us-ascii?Q?rYcHm4dXhz3A3KMtcdpeRx90qDlOvUJp93zb+dghxv3DuiDAU8jmKFBD7o9u?=
 =?us-ascii?Q?ceLGhI/4jWER9kcwQsFfA2g9X1VSzYMXGHYm8PUKHXBDJPwnXYG7oHJk6rFM?=
 =?us-ascii?Q?1Cxa5/4qttLTuDU0HvCIHVX2XoOPZunvKj+AOqfJVJRBYtDdiG2Gw7QCdSIh?=
 =?us-ascii?Q?/rEo3b9HfIu7XA7YRNJ4QpyHJNSa5u2VbU1J0q74BGvzVxSrq0qvlLFZwPq8?=
 =?us-ascii?Q?rVAlyY5P2foV/3tQoOM3zxvctaMzCcCbZP5aRLnAlz0B+cpaQBagesHevq0K?=
 =?us-ascii?Q?QXY/DMEMMAE6YnsRXb3+e37Oa9OTSoxJAijGtCnQ2hk9VtdsLMPWl9iwLdMK?=
 =?us-ascii?Q?gwSY6cjp49WarBaeMf+qDRHILgb5ZuwEH+A/1RFyrMEeXpHVJHHvpIs1BIpf?=
 =?us-ascii?Q?V/HPd8KGNaO8OT2mzxppQLaJHSRrbPil/HaV8XSpHtn9uNYrr5ckYI+yIf7W?=
 =?us-ascii?Q?Tb9lEjcODiDmaOq4t7qJ6rAKd8b+kl2lhRc/4rOCUz2rmrzqceBFGrIvajCy?=
 =?us-ascii?Q?/Ux8apBZDY7XeNOY0GktNi6MgoJh0ipiSBqSbA9Cdc5Ph8V6JMNXWNB9tD5L?=
 =?us-ascii?Q?ObB7OHgiGhrXbkhQ0q0X6UEJVaqVDucMRcSaAujXROrE08zco085Y3r+tkGO?=
 =?us-ascii?Q?7lKGPyraFpDQxciq6DqWUAKGaMqdhTBz0/rDEhv1kF4AlqWv/TTmhI/30l40?=
 =?us-ascii?Q?CN/3oj/+RLuxKm5yAm32gbEtbnoanF3MFyGHLh9Fn/BCU6L4TAdw2nBwtVbV?=
 =?us-ascii?Q?oZuMg6E7kE6g+gPCs7EHF4qtTVnXuqC2V3VbZ6FilTr2xhBX+8Jy7fCmJiRR?=
 =?us-ascii?Q?1B8yF8zA+NO/kT3focdc+9pW15zNppLTnCMFG1rwzvr5oENFdF+LnD+MFOIE?=
 =?us-ascii?Q?oW8YIYCmNajUFbSH2GcyIdRULc0j7BLf/Qy76GIgyntbZDIygR4kIlBaENQU?=
 =?us-ascii?Q?QE58jV5DSpv2ZkLpXXijjuDElYWwvTR3WG05t3w7Nr2AArUcmNg047yXoft5?=
 =?us-ascii?Q?xmcGIjVjNKIAnlMLiWBZfFC0YmSUMbsf1pQER6ELX2kI38Oc+G4NWy6sxaFy?=
 =?us-ascii?Q?eVhV0SdP8Cp/vez4zyhIFdQp1qDk6vQ2/G/S7+aPGZ6nhDkY00j14QrUfYK1?=
 =?us-ascii?Q?WZFBiXtn4SEq5VAKcryxkcBSh65EfW9shxN8fOysg7unvx3qoCdFeusBaUeL?=
 =?us-ascii?Q?A5Pkh1jzmbiUiUQ9X4+qS1IJT42LunAYRHSk2ViR?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 690063c6-884d-463c-a301-08dc6da97f9e
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8254.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 May 2024 08:49:54.0846
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Jflz+0+tGm1mbSDv12wxwrzU/afIrD4V0+eOAtZzwCpi+DvvF0aUpoci2jsNGh9mH3bza1fnY6AXQCy5+4LdoA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7812

There is no need to add lock in s_ctrl callback, it has been
synchronized by the ctrl_handler's lock, otherwise it may led to
deadlock if driver call v4l2_ctrl_s_ctrl().

Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
v3
- move this patch from 3/3 to 2/3 to avoid confusion

 drivers/media/platform/amphion/vdec.c | 2 --
 drivers/media/platform/amphion/venc.c | 2 --
 2 files changed, 4 deletions(-)

diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/amphion/vdec.c
index a57f9f4f3b87..6a38a0fa0e2d 100644
--- a/drivers/media/platform/amphion/vdec.c
+++ b/drivers/media/platform/amphion/vdec.c
@@ -195,7 +195,6 @@ static int vdec_op_s_ctrl(struct v4l2_ctrl *ctrl)
 	struct vdec_t *vdec = inst->priv;
 	int ret = 0;
 
-	vpu_inst_lock(inst);
 	switch (ctrl->id) {
 	case V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE:
 		vdec->params.display_delay_enable = ctrl->val;
@@ -207,7 +206,6 @@ static int vdec_op_s_ctrl(struct v4l2_ctrl *ctrl)
 		ret = -EINVAL;
 		break;
 	}
-	vpu_inst_unlock(inst);
 
 	return ret;
 }
diff --git a/drivers/media/platform/amphion/venc.c b/drivers/media/platform/amphion/venc.c
index 4eb57d793a9c..16ed4d21519c 100644
--- a/drivers/media/platform/amphion/venc.c
+++ b/drivers/media/platform/amphion/venc.c
@@ -518,7 +518,6 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
 	struct venc_t *venc = inst->priv;
 	int ret = 0;
 
-	vpu_inst_lock(inst);
 	switch (ctrl->id) {
 	case V4L2_CID_MPEG_VIDEO_H264_PROFILE:
 		venc->params.profile = ctrl->val;
@@ -579,7 +578,6 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
 		ret = -EINVAL;
 		break;
 	}
-	vpu_inst_unlock(inst);
 
 	return ret;
 }
-- 
2.43.0-rc1