From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4B347D075; Sun, 28 Jul 2024 15:43:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722181434; cv=none; b=Jl04EXWJlx8gTtcUmpALWx9u6j90t+lmq5WcAgogweneOIFSyuS6d7i7KVTSwuzwHYDTQbUSkwFYHhSUNE+8Uz6UztqSdbZpKEgrPkjpF9RqcnyD1j2wlIivDTY/YV6jjt5xfIKqpLg5y3eoXJ+1i2E3VkKF9GCezX9iRfnw4og= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722181434; c=relaxed/simple; bh=ecUPMFdSeUU6NFV20xqahCAIt5PeMUi+qepvgpCXrLg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h7gFOiQU/QRLhrdG31jQZxK+qy0kIDZ37msxR3rlWtJfcQoDMNSAv+Kaci0wBgAp/tfTM8kRctX6ssHfXyJXqXIBF9YyCsN/H0tQjWjDkkKhSFtXyvThZTJaO6cgIX6pNzERUp7/O7c+UD3L4dJHkHeP7QaGuVBxNKR8bB7/8vY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZR05lWS3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZR05lWS3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B6DBC4AF0F; Sun, 28 Jul 2024 15:43:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722181434; bh=ecUPMFdSeUU6NFV20xqahCAIt5PeMUi+qepvgpCXrLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZR05lWS3cZFcx9pbP3lY7OkBCU2j6uavfGnzJJOtqR4InFowkUFfBi12JtZrQjQPA tLpWgGcD9OzLMBoxJjiGrcp1DnuISgAaHNRqEmBQjgBkx38wv4uHMXItzXkudCWu8q AoRlFNhuXvycbbd7eWYV3+V200TP5XlzGWZiYbbMqnjvDIwHUZWOtduD619yh9SMjE sK+HpqrWjL0Y3s1xg81GAEaftc6M7ct2SgkYDqgIGijclsqZcmSuw6L3X+FN9TUcZp 3hBqMFV26yu6FTM9ntsJhxdbWquwP9Z9ido5CVenwQHdMc1yp8AcmrdMq0D0mI5B7j lqc13OpjFOojw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ming Qian , Sebastian Fricke , Hans Verkuil , Sasha Levin , eagle.zhou@nxp.com, mchehab@kernel.org, linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 6.10 15/34] media: amphion: Remove lock in s_ctrl callback Date: Sun, 28 Jul 2024 11:40:39 -0400 Message-ID: <20240728154230.2046786-15-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240728154230.2046786-1-sashal@kernel.org> References: <20240728154230.2046786-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.2 Content-Transfer-Encoding: 8bit From: Ming Qian [ Upstream commit 065927b51eb1f042c3e026cebfd55e72ccc26093 ] There is no need to add a lock in s_ctrl callback, it has been synchronized by the ctrl_handler's lock, otherwise it may led to a deadlock if the driver calls v4l2_ctrl_s_ctrl(). Signed-off-by: Ming Qian Signed-off-by: Sebastian Fricke Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- 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 a57f9f4f3b876..6a38a0fa0e2d4 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 4eb57d793a9c0..16ed4d21519cd 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