Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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, linux-media@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH] media: amphion: release m2m ctx when releasing vpu instance
Date:   Mon, 29 Aug 2022 13:33:16 +0800
Message-Id: <20220829053316.19400-1-ming.qian@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iGCN6n5rqAYqUApIX1l0jroWX3uyDHo93yhQWx6UIy6jxjmU7o3/eL5BnM/k?=
 =?us-ascii?Q?b2roLWC3ylCCyA7JilkV1iMr3/CMsh5Ut/4hf68JrS/El/z1iJ8juAO1uTWW?=
 =?us-ascii?Q?d9/Gx3/GTJm8Dv/5uwsmCoqWxY04qNghLdZnXFM6Jj0eTDtCDfogS125jSnF?=
 =?us-ascii?Q?YxUpGtop6i+TiXqBlblSVfog8U8kgkHzsedHI+bsRgS61AuxgKVK72pTkdgx?=
 =?us-ascii?Q?K/SyLb+DQEvNcfL6PmZWh/6d6oX+xGdjngLCGCxRMnqCwJJV5emSaxhjvzi0?=
 =?us-ascii?Q?RUj3a8wbSVbwodNIxb1hmVxetFo0SwQnt1S9+n+cIgVAzQtuIZgdW7Zr4/nK?=
 =?us-ascii?Q?D3HELWK2a5OeLCFntg+J5kwbD0swW0P7L6Da17FKNhR7pNeoWq84oiDwo/LX?=
 =?us-ascii?Q?FqB/ZH9s1d89tEjNMNYK0TU/3b2GiG17yaYYnF46qHcnE/kcukg1zDFngdE/?=
 =?us-ascii?Q?LJTqjlJ7GT5pG9DucplWKwsEnUpw8BBV80qnX3cuaKF/nUurZwYPgmgxkVM8?=
 =?us-ascii?Q?1myIIPU6RM4ex2MU1zVq5M4IoJkucQqvNPwhrg5PpdO16j0p7Q6lvWK34R9X?=
 =?us-ascii?Q?mPDhKP+G4dZp5Us/LYBUe4LXVeqCn6OCmQX0NcdEe3tt9QcBQpM71X3qz2Fv?=
 =?us-ascii?Q?5/aRRV6T0YMC+dFO45R8XE6vJ3UuvYCwtdjukPRVPipnmm6QoherxnGUYzRT?=
 =?us-ascii?Q?S31qIqq2pFPSvS0OPwddpc0SMEo1NtGVyCcab6Bjn+/5RN05cLfcrg3HMYLu?=
 =?us-ascii?Q?mJL5gasN4iROR/3v89HyXHDtCi88lBPyGOVNSiOcnDFt3el+6izKrC99ZAYM?=
 =?us-ascii?Q?05fs2Yu8L/b5wxsMzUODj9zOCSFVq0RuQVZDCRd2G/ITp6yM63OppaJvIztO?=
 =?us-ascii?Q?g5SsCoDYmOWUQz7AUAZ+P1dCbBnVADGI2V8fVK/yYuRRlbV1XaDGo0th6BMR?=
 =?us-ascii?Q?R3GZbJ4Qrfp2WGo/gzgq6GpCgcnen0kfAlNTDxWJnOnDQpsOWeVV5i3wEuzo?=
 =?us-ascii?Q?C4sLk4P0QLdykro8J/bKr6T4Gs/Ecw3OIZNDn5VPSL192++5OG+5dYIzpxNy?=
 =?us-ascii?Q?HEFKD1fLkpqb2VYW0NcE0TpXbhvMDpjyiNiTICKZn82UAqYOrtp+lp1DInom?=
 =?us-ascii?Q?yunsKQwdi53+pFkJLfDhulBX0O+CE7zLDgPOoxdkiDfYBA53qmTM99PwiFue?=
 =?us-ascii?Q?PjRfF+AxCBCBB54F6gN4oiurf1n9vl32fpnPk406wDkwQ+rJe3E8EMyBfV4G?=
 =?us-ascii?Q?ek4h+ED8ScylgsVR+3hguxLVGPB2X551/SD/lnlAlIna/mgPh36BYBaEid0C?=
 =?us-ascii?Q?4+rZ2C9TW6jXs1TL1S+1bo1EEN3nYuDMsr56lWt/5HT8XYssDdsO4z5dKZoM?=
 =?us-ascii?Q?Rzz1QzTkDlJoFcIH3Pxu16CiebGdph+vFWYER6ymY+BQ223iLkBUTrDWds8B?=
 =?us-ascii?Q?xfOno8tM3cw6MSI8DhJ4ccNAbzQ+iyUDy1jkE/XYxHiC1mupB7G+DrsVJ8cS?=
 =?us-ascii?Q?8gj7ghFUQctWgoDcaJvev3SoYt7G+cyjDUAOoYnKtNsKVBZuz4boMFttSt2G?=
 =?us-ascii?Q?SFzoyWFU/gvfs8BCbLxTDgAdhZeHg5SzhC/K3lVw?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0fdd24a0-1855-43b5-15bd-08da898001d8
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2022 05:33:30.9072
 (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: tS9FZEuBQQ4vf7hsG6hftQ4ly1B7glRX1O49mg9MFOrUeSUth/eUlcitXKmiDAxFWC1PPjanOHYcF5+BgPuHtQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9452
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

release m2m ctx in the callback function that
release the vpu instance, then there is no need
to add lock around releasing m2m ctx.

Fixes: 3cd084519c6f ("media: amphion: add vpu v4l2 m2m support")
Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
 drivers/media/platform/amphion/vpu_v4l2.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/amphion/vpu_v4l2.c
index 1f18289aa47a..99ad2f1c5a53 100644
--- a/drivers/media/platform/amphion/vpu_v4l2.c
+++ b/drivers/media/platform/amphion/vpu_v4l2.c
@@ -688,6 +688,10 @@ static int vpu_v4l2_release(struct vpu_inst *inst)
 		inst->workqueue = NULL;
 	}
 
+	if (inst->fh.m2m_ctx) {
+		v4l2_m2m_ctx_release(inst->fh.m2m_ctx);
+		inst->fh.m2m_ctx = NULL;
+	}
 	v4l2_ctrl_handler_free(&inst->ctrl_handler);
 	mutex_destroy(&inst->lock);
 	v4l2_fh_del(&inst->fh);
@@ -770,13 +774,6 @@ int vpu_v4l2_close(struct file *file)
 
 	vpu_trace(vpu->dev, "tgid = %d, pid = %d, inst = %p\n", inst->tgid, inst->pid, inst);
 
-	vpu_inst_lock(inst);
-	if (inst->fh.m2m_ctx) {
-		v4l2_m2m_ctx_release(inst->fh.m2m_ctx);
-		inst->fh.m2m_ctx = NULL;
-	}
-	vpu_inst_unlock(inst);
-
 	call_void_vop(inst, release);
 	vpu_inst_unregister(inst);
 	vpu_inst_put(inst);
-- 
2.37.1