Received-SPF: pass (google.com: domain of linux-kernel+bounces-158085-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: Ming Qian <ming.qian@nxp.com>
To: mchehab@kernel.org,
	hverkuil-cisco@xs4all.nl
Cc: 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 v2 3/3] media: amphion: Remove lock in s_ctrl callback
Date: Thu, 25 Apr 2024 15:50:11 +0900
Message-ID: <20240425065011.105915-3-ming.qian@nxp.com>
In-Reply-To: <20240425065011.105915-1-ming.qian@nxp.com>
References: <20240425065011.105915-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?doSxjQKkZGZq18Y98sAjyxEuonUECT7u19kWVzzl3cvRYto/6oUi2uT5tkRc?=
 =?us-ascii?Q?3ntS7mjhZvgZjtSt5E/U0GiKnjMGnH5Kwy8V/FmRXFkEPc8kS0f5q/mZwAFp?=
 =?us-ascii?Q?XsygYCW1IdfgwrWhrf2U6R2tlj9pm1C+LlqGPhFs7qLauT/oyr+Do3GijHCw?=
 =?us-ascii?Q?ELljnRFOB3OV0mtYCc7mMpsJSulE2s8+yU3CoeCNXZQ24TlBk9XAWoK+WKXa?=
 =?us-ascii?Q?HzO8UNsQFcWBtioQGXqdcN6s33Z6awgT+Dvzrom8HSe6nnnjDoXTd4hLe4nc?=
 =?us-ascii?Q?s0tRWSGBrrNs92phYZwDUgYWli2LgUvh6MJfmCE2fE3+CY+aVKPER3zUkRJv?=
 =?us-ascii?Q?Xn/8OMhi8IzanC5fR5dOSgPtdcwr8/xKsGaXPCzR2hwbP4xiwWY5tqZE2/B/?=
 =?us-ascii?Q?cbpO1wBllu7AmA2fs9U4DaoccJONX1tS/BSuabv7uVKlmDEa0uYEK0nXDSRL?=
 =?us-ascii?Q?Ajue8tZdTCk3iSE7Jj/JIr1SFFDbR//l4ndrnkF/laJf5qigk5zCoTbAIq2d?=
 =?us-ascii?Q?q8p3cIBjEoxi3EefVXtzCi9uSNQMfky8zQwafQeAsKPQYtBM3UQzQWqOY8LM?=
 =?us-ascii?Q?FWxrDEDveop9Ht0Xp4YS3LbkV8Nbl2vr1tVD8AJAE1vk/xOYv02nbVlrDPMB?=
 =?us-ascii?Q?VVfQrmXyHhbiCrmSsAvxQvzvcVZr75sOSJRURoKtcFJ9Kt478ORsuITeBlrC?=
 =?us-ascii?Q?A+4Mok+snMBgy/OYPj9jp/FsN/FwfEi6iBtg/xw/wkfpHVkzhFRtwj0rjkxQ?=
 =?us-ascii?Q?Vw8pS0SiuKmlap5gcGEwbnREPEJW8ij+V0j1dJl33HSRAj857fU65woA8o3r?=
 =?us-ascii?Q?NdSTxUTdBi2S4lRUbyzbwm1c1ghOpdgnArWfa5Pire49gUvhCtbaJUnxU6kB?=
 =?us-ascii?Q?SDcd3BamkhY1a2nbq0+wrdD0vjWTr5n0Rdrjf/qcJev49+H/HvBKonkRoToq?=
 =?us-ascii?Q?pZKu6hhy+u7mgpO9LD/BJg5KC9/JWWSgiJ5CWrh5uTJT5bKXqvK1h6KSSvyc?=
 =?us-ascii?Q?aWnGoeGUanqwpyhwGDq8YijM91VPKJLIH2H8eGblRUMHleystIzhaTvxhSZH?=
 =?us-ascii?Q?hthNAniT42bTKausvBAAMe82cewTAxD5ecM4urtdmQ7TLaiW73POWuT0Zktd?=
 =?us-ascii?Q?vgcCbwYc81tpu9fFBZAhOhNzv1n9KOyJ/ahd1xa3ZvihJXE55eXbj6KIiYHR?=
 =?us-ascii?Q?HlnE9+RitJOLozTHgWmefdleFEwjd3S7W05VZxzDQGmFUdDkNW3uZVC1dFfE?=
 =?us-ascii?Q?pKg6IblNdIJVMUylS8ObqqLwWZKbv8F+bHG/p53LVg37++xWt/LF4UbOM7vY?=
 =?us-ascii?Q?6UHdifXYYmPcJ9QIc28sNXBvHJv0gzCIF4kAmJC4vUuRHZTUzB7MqKUOS7HY?=
 =?us-ascii?Q?3YMx/Wxk4ICxiqARHNSdkoVA3CuPMKQyANY+SpoLmGwkYVvtYYG4l0x/s38o?=
 =?us-ascii?Q?boKpwIa+LNFiWBYWDon369swaOqu2zMbXJ9AVaznB8BwnBFc+7qXn7bQfohz?=
 =?us-ascii?Q?RepY+IrPdEUBKwMrhLn1Di7ILQCtS965EjblmpUzPQukFGkUN+ulsR2IWSmm?=
 =?us-ascii?Q?Vy9KIP+0Yn24dlHrZTtriY9qUUmANniAcEfDqJep?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 69330978-63b0-474d-919b-08dc64f407e9
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8254.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2024 06:50:44.8871
 (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: KNDMdHRUTm4vGvbJ0xhqrfmaoNUVXyYGK0KH3HjvBotEulBCsWyAC2aZS2uK179lbb/RBHnSHzsiXW4UmNLuCQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7564

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>
---
 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 cdfaba9d107b..351b4edc8742 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