From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 07A02C43458 for ; Mon, 13 Jul 2026 14:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Content-Type: References:In-Reply-To:Date:To:From:Subject:Message-ID:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=yaOMlOkRAwrFIGmDlhCshTCWQ5yfBP7eJ8bFkeqHcP8=; b=anM/CL42q1Wv1gvXEdq74l5AAi T4g84hWOo4On6gaopi9OwSh3a4oziXJOZD/3bf4gmmmKyDoBlt3629/qV0cHLHJDvDq7efIywWL/A GHfiwnc/0UMz4c+8oB9JHN5G25x3iJ2FJz9j4DNIW6AxQSz0+I++WUtpFVfQcYfMmzxMyB5dRD9kY 78dqXED0+3lTljXqgrTLfHPVgE2zwvXAcz4tjJ5gKHHxC5UMHd5p70NLe0jXpW+D4YaJfhIVR+FHP yOiNVK8LcR1RPIT++7ZFtfUbOqrA7/hQ+e+dP4VslI0FfpjpyGRhlL7KHS8pDEqDxwlgkMGdztuev iFz1UhzQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wjHvE-00000009dYW-46YP; Mon, 13 Jul 2026 14:46:19 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wjHvC-00000009dXl-1vh7; Mon, 13 Jul 2026 14:46:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1783953971; bh=eQUa3ScWb0Cgwwi0JeC1XpMNMA9za5OuFxAcERineVo=; h=Subject:From:To:Date:In-Reply-To:References:From; b=lqrv2tURjdpv5DtV/mhSJkvyjNW9vl10v6DGJaKmDq4AMiuQBCEUW54mwswZrQbk+ 9fAu83E+uENPnV3OxskKg7FnC+TgmA5F4dSp0XgGWHZGOHchaROTu+bRifaJbYWEMv yEk9LG7P+V8YFOxMGr5lgIuPnT5eRiyLH7NMuHrFCEYBBshyQDNnWMCyA65m1JORHn A+WLFcI7wC2sq7fcMvl5gq1fQKrxMeACTOFCr8r+rL54bfO1NyrsejL6e+opguZQl+ Ov+HacxyiA4F6dsDcKUPHmly6r00Jcm15LVhHhp/LJhVUfVLbL9nRd5otxkz8G20am JmPzR1z2n3eHg== Received: from [100.64.0.214] (unknown [100.64.0.214]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange secp256r1 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nicolas) by bali.collaboradmins.com (Postfix) with ESMTPSA id 30D2217E07A2; Mon, 13 Jul 2026 16:46:10 +0200 (CEST) Message-ID: Subject: Re: [PATCH v15 01/12] media: mediatek: jpeg: fix jpeg cores' amounts setting From: Nicolas Dufresne To: Kyrie Wu =?UTF-8?Q?=28=E5=90=B4=E6=99=97=29?= , "linux-media@vger.kernel.org" , "linux-mediatek@lists.infradead.org" , AngeloGioacchino Del Regno , "robh@kernel.org" , "linux-kernel@vger.kernel.org" , "krzk+dt@kernel.org" , "linux-arm-kernel@lists.infradead.org" , "mchehab@kernel.org" , "matthias.bgg@gmail.com" , "hverkuil-cisco@xs4all.nl" , "conor+dt@kernel.org" , "devicetree@vger.kernel.org" Date: Mon, 13 Jul 2026 10:46:08 -0400 In-Reply-To: <05928d76a6cb103e1f4cafc38fd4ad4013b87c05.camel@mediatek.com> References: <20260702072614.10373-1-kyrie.wu@mediatek.com> <20260702072614.10373-2-kyrie.wu@mediatek.com> <29b98aee357ea1ff49939c47eaca3cb4a01c8d72.camel@collabora.com> <05928d76a6cb103e1f4cafc38fd4ad4013b87c05.camel@mediatek.com> Autocrypt: addr=nicolas.dufresne@collabora.com; prefer-encrypt=mutual; keydata=mDMEaCN2ixYJKwYBBAHaRw8BAQdAM0EHepTful3JOIzcPv6ekHOenE1u0vDG1gdHFrChD /e0J05pY29sYXMgRHVmcmVzbmUgPG5pY29sYXNAbmR1ZnJlc25lLmNhPoicBBMWCgBEAhsDBQsJCA cCAiICBhUKCQgLAgQWAgMBAh4HAheABQkJZfd1FiEE7w1SgRXEw8IaBG8S2UGUUSlgcvQFAmibrjo CGQEACgkQ2UGUUSlgcvQlQwD/RjpU1SZYcKG6pnfnQ8ivgtTkGDRUJ8gP3fK7+XUjRNIA/iXfhXMN abIWxO2oCXKf3TdD7aQ4070KO6zSxIcxgNQFtDFOaWNvbGFzIER1ZnJlc25lIDxuaWNvbGFzLmR1Z nJlc25lQGNvbGxhYm9yYS5jb20+iJkEExYKAEECGwMFCwkIBwICIgIGFQoJCAsCBBYCAwECHgcCF4 AWIQTvDVKBFcTDwhoEbxLZQZRRKWBy9AUCaCyyxgUJCWX3dQAKCRDZQZRRKWBy9ARJAP96pFmLffZ smBUpkyVBfFAf+zq6BJt769R0al3kHvUKdgD9G7KAHuioxD2v6SX7idpIazjzx8b8rfzwTWyOQWHC AAS0LU5pY29sYXMgRHVmcmVzbmUgPG5pY29sYXMuZHVmcmVzbmVAZ21haWwuY29tPoiZBBMWCgBBF iEE7w1SgRXEw8IaBG8S2UGUUSlgcvQFAmibrGYCGwMFCQll93UFCwkIBwICIgIGFQoJCAsCBBYCAw ECHgcCF4AACgkQ2UGUUSlgcvRObgD/YnQjfi4+L8f4fI7p1pPMTwRTcaRdy6aqkKEmKsCArzQBAK8 bRLv9QjuqsE6oQZra/RB4widZPvphs78H0P6NmpIJ Organization: Collabora Canada Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-a58HJVnWn+9zXOppBSIh" User-Agent: Evolution 3.60.2 (3.60.2-1.fc44) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260713_074614_675998_4D6ADDE6 X-CRM114-Status: GOOD ( 34.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --=-a58HJVnWn+9zXOppBSIh Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, Le lundi 13 juillet 2026 =C3=A0 03:30 +0000, Kyrie Wu (=E5=90=B4=E6=99=97) = a =C3=A9crit=C2=A0: > On Sat, 2026-07-11 at 17:43 -0400, Nicolas Dufresne wrote: > > Hi, > >=20 > > Le jeudi 02 juillet 2026 =C3=A0 15:26 +0800, Kyrie Wu a =C3=A9crit=C2= =A0: > > > Different ICs have different amounts of cores, > > > use a variable to set the cores' amounts. > > >=20 > > > Fixes: 934e8bccac95 ("mtk-jpegenc: support jpegenc multi-hardware") > > > Fixes: 0fa49df4222f ("media: mtk-jpegdec: support jpegdec multi- > > > hardware") > > > Signed-off-by: Kyrie Wu > > > Reviewed-by: AngeloGioacchino Del Regno > > > > > > --- > > > =C2=A0drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c=C2=A0=C2= =A0 | 8 ++++--- > > > - > > > =C2=A0drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h=C2=A0=C2= =A0 | 2 ++ > > > =C2=A0drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 1 + > > > =C2=A0drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 1 + > > > =C2=A04 files changed, 8 insertions(+), 4 deletions(-) > > >=20 > > > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > > > b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > > > index d147ec483081..1e014fd698ae 100644 > > > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > > > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c > > > @@ -1462,7 +1462,7 @@ static int mtk_jpegenc_get_hw(struct > > > mtk_jpeg_ctx *ctx) > > > =C2=A0 int i; > > > =C2=A0 > > > =C2=A0 spin_lock_irqsave(&jpeg->hw_lock, flags); > > > - for (i =3D 0; i < MTK_JPEGENC_HW_MAX; i++) { > > > + for (i =3D 0; i < jpeg->max_hw_count; i++) { > > > =C2=A0 comp_jpeg =3D jpeg->enc_hw_dev[i]; > > > =C2=A0 if (comp_jpeg->hw_state =3D=3D MTK_JPEG_HW_IDLE) { > > > =C2=A0 hw_id =3D i; > > > @@ -1509,7 +1509,7 @@ static int mtk_jpegdec_get_hw(struct > > > mtk_jpeg_ctx *ctx) > > > =C2=A0 int i; > > > =C2=A0 > > > =C2=A0 spin_lock_irqsave(&jpeg->hw_lock, flags); > > > - for (i =3D 0; i < MTK_JPEGDEC_HW_MAX; i++) { > > > + for (i =3D 0; i < jpeg->max_hw_count; i++) { > > > =C2=A0 comp_jpeg =3D jpeg->dec_hw_dev[i]; > > > =C2=A0 if (comp_jpeg->hw_state =3D=3D MTK_JPEG_HW_IDLE) { > > > =C2=A0 hw_id =3D i; > > > @@ -1592,7 +1592,7 @@ static void mtk_jpegenc_worker(struct > > > work_struct *work) > > > =C2=A0 jpeg_work); > > > =C2=A0 struct mtk_jpeg_dev *jpeg =3D ctx->jpeg; > > > =C2=A0 > > > - for (i =3D 0; i < MTK_JPEGENC_HW_MAX; i++) > > > + for (i =3D 0; i < jpeg->max_hw_count; i++) > > > =C2=A0 comp_jpeg[i] =3D jpeg->enc_hw_dev[i]; > > > =C2=A0 i =3D 0; > > > =C2=A0 > > > @@ -1687,7 +1687,7 @@ static void mtk_jpegdec_worker(struct > > > work_struct *work) > > > =C2=A0 struct mtk_jpeg_fb fb; > > > =C2=A0 unsigned long flags; > > > =C2=A0 > > > - for (i =3D 0; i < MTK_JPEGDEC_HW_MAX; i++) > > > + for (i =3D 0; i < jpeg->max_hw_count; i++) > > > =C2=A0 comp_jpeg[i] =3D jpeg->dec_hw_dev[i]; > > > =C2=A0 i =3D 0; > > > =C2=A0 > > > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > > > b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > > > index 02ed0ed5b736..6be5cf30dea1 100644 > > > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > > > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h > > > @@ -212,6 +212,7 @@ struct mtk_jpegdec_comp_dev { > > > =C2=A0 * @reg_decbase: jpg decode register base addr > > > =C2=A0 * @dec_hw_dev: jpg decode hardware device > > > =C2=A0 * @hw_index: jpg hw index > > > + * @max_hw_count: jpeg hw-core count > > > =C2=A0 */ > > > =C2=A0struct mtk_jpeg_dev { > > > =C2=A0 struct mutex lock; > > > @@ -234,6 +235,7 @@ struct mtk_jpeg_dev { > > > =C2=A0 void __iomem *reg_decbase[MTK_JPEGDEC_HW_MAX]; > > > =C2=A0 struct mtk_jpegdec_comp_dev > > > *dec_hw_dev[MTK_JPEGDEC_HW_MAX]; > > > =C2=A0 atomic_t hw_index; > > > + u32 max_hw_count; > > > =C2=A0}; > > > =C2=A0 > > > =C2=A0/** > > > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c > > > b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c > > > index 32372781daf5..4534caeb104f 100644 > > > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c > > > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c > > > @@ -664,6 +664,7 @@ static int mtk_jpegdec_hw_probe(struct > > > platform_device *pdev) > > > =C2=A0 master_dev->dec_hw_dev[i] =3D dev; > > > =C2=A0 master_dev->reg_decbase[i] =3D dev->reg_base; > > > =C2=A0 dev->master_dev =3D master_dev; > > > + master_dev->max_hw_count++; > >=20 > > Just one question, can the mtk_jpegenc_worker() starts before all > > cores have > > been probed ? > >=20 > > Nicolas >=20 > Dear Nicolas, >=20 > Thanks for the question. >=20 > mtk_jpegenc_worker() is not started from the probe path. For the > multicore encoder, the worker is only initialized when userspace > opens the video node: > =C2=A0=C2=A0=C2=A0 mtk_jpeg_open() > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 INIT_WORK(&ctx->jpeg_work, jpeg->variant->= jpeg_worker) >=20 > It is then queued only through the V4L2 mem2mem run path: > =C2=A0=C2=A0=C2=A0 userspace QBUF/STREAMON > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 -> v4l2_m2m_try_schedule() > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 -> .device_run =3D mtk_jpeg_multicore_enc_= device_run() > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 -> queue_work(jpeg->workqueue, &ctx->jpeg_= work) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 -> mtk_jpegenc_worker() >=20 > So the worker can run only after the video device has been registered=C2= =A0 > and after a userspace application opens the device and starts > streaming buffers. >=20 > The JPEG hw core probe is part of the platform device probe flow during > system boot. The userspace open/streaming path happens later, after the > system has booted and the video node is available. Therefore we do not > have a case where mtk_jpegenc_worker() starts before the JPEG hw probe > has completed. When I check the core implementation though, the video device is registered= and ready to open before childs driver, so even if small, there is gap where yo= u could race between probes and open. I think I'd like to suggest a different approach, which to me is easier to understand (and so should make it easier to maintain). In mtk_jpeg_probe(),= we already compute num_child. We could immediately set max_hw_count to its exp= ected value. That would replace this patch entirely. We should add some bug on if= that number is bigger then MTK_JPEGDEC_HW_MAX (bound checks, see shashiko report= ). Then, in follow up patch, to fix the minor race I mention, we could avoid setting hw_rdy counter to num_child immediately, and increment that at chil= d probe time (where you increase max_hw_count in this patch). The worker will= then wait properly for child driver to have probed (instead of spinning the device_run() by calling v4l2_m2m_job_finish() when the max retry is reached= .). hope this make sense, at least to me, having a max value that cannot increa= se sounds more logical. Nicolas >=20 > Regards, > Kyrie. > >=20 > > > =C2=A0 > > > =C2=A0 platform_set_drvdata(pdev, dev); > > > =C2=A0 pm_runtime_enable(&pdev->dev); > > > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c > > > b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c > > > index b6f5b2249f1f..2765dafab4ad 100644 > > > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c > > > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c > > > @@ -386,6 +386,7 @@ static int mtk_jpegenc_hw_probe(struct > > > platform_device *pdev) > > > =C2=A0 master_dev->enc_hw_dev[i] =3D dev; > > > =C2=A0 master_dev->reg_encbase[i] =3D dev->reg_base; > > > =C2=A0 dev->master_dev =3D master_dev; > > > + master_dev->max_hw_count++; > > > =C2=A0 > > > =C2=A0 platform_set_drvdata(pdev, dev); > > > =C2=A0 pm_runtime_enable(&pdev->dev); --=-a58HJVnWn+9zXOppBSIh Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQTvDVKBFcTDwhoEbxLZQZRRKWBy9AUCalT6MAAKCRDZQZRRKWBy 9JrbAQDLveH/jDrTKFuENiA349uauGr7XFkZYH3C9wMQTpDY6AD+IFk+ErD8G+WM Asj99DiTkwEAuORoQvEGwyqWB8+uqwg= =raLb -----END PGP SIGNATURE----- --=-a58HJVnWn+9zXOppBSIh--