From nobody Sat Sep 21 07:23:58 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B8F7C3DA7D for ; Tue, 3 Jan 2023 03:42:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232463AbjACDma (ORCPT ); Mon, 2 Jan 2023 22:42:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230071AbjACDm1 (ORCPT ); Mon, 2 Jan 2023 22:42:27 -0500 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71593BC32; Mon, 2 Jan 2023 19:42:22 -0800 (PST) X-UUID: 34ab3a6ef2344f1c8e9fb48e46cdf970-20230103 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=ApD93pQI5RZG3vKi/IhKSTfJIVsHqHw4mKr2DXKEgaQ=; b=coeS4vU3hWLIWib/zI0WbTowpshcS1BJn3+taPV66l5EDpCZ3zEknw+AuyzM7KMegvfCrVjhR7lATH2nyHRfVNdMaZ9JmKitKmoXnT/2g8rCQLHi9oWEGIcs/vz60kbGgxgtKiT59jAS76TCGhjCJBwSOXhbGxAsT5a8tdBDuVM=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.16,REQID:3f82b79e-7e22-44df-b0ef-93ef76ca5c56,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:09771b1,CLOUDID:ad339cf4-ff42-4fb0-b929-626456a83c14,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:11|1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0 X-CID-BVR: 0 X-UUID: 34ab3a6ef2344f1c8e9fb48e46cdf970-20230103 Received: from mtkmbs11n2.mediatek.inc [(172.21.101.187)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 2038646243; Tue, 03 Jan 2023 11:42:17 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.186) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.3; Tue, 3 Jan 2023 11:42:15 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Tue, 3 Jan 2023 11:42:15 +0800 From: Irui Wang To: Hans Verkuil , Mauro Carvalho Chehab , Matthias Brugger , , , kyrie wu CC: , , , , , Tomasz Figa , , , Irui Wang Subject: [V4] media: mtk-jpeg: Fixes jpeghw multi-core judgement Date: Tue, 3 Jan 2023 11:42:13 +0800 Message-ID: <20230103034213.18573-1-irui.wang@mediatek.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: kyrie wu some chips have multi-hw, but others have only one, modify the condition of multi-hw judgement Fixes: 934e8bccac95 ("mtk-jpegenc: support jpegenc multi-hardware") Signed-off-by: kyrie wu Signed-off-by: irui wang Reviewed-by: AngeloGioacchino Del Regno --- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 4 +++- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c b/drivers= /media/platform/mediatek/jpeg/mtk_jpeg_core.c index 969516a940ba..56b27ecd61ec 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c @@ -1692,7 +1692,7 @@ static int mtk_jpeg_probe(struct platform_device *pde= v) return -EINVAL; } =20 - if (list_empty(&pdev->dev.devres_head)) { + if (jpeg->variant->hw_arch) { INIT_DELAYED_WORK(&jpeg->job_timeout_work, mtk_jpeg_job_timeout_work); =20 @@ -1885,6 +1885,7 @@ static struct mtk_jpeg_variant mtk8195_jpegenc_drvdat= a =3D { .ioctl_ops =3D &mtk_jpeg_enc_ioctl_ops, .out_q_default_fourcc =3D V4L2_PIX_FMT_YUYV, .cap_q_default_fourcc =3D V4L2_PIX_FMT_JPEG, + .hw_arch =3D MTK_JPEG_HW_MULTI_CORE, }; =20 static const struct mtk_jpeg_variant mtk8195_jpegdec_drvdata =3D { @@ -1896,6 +1897,7 @@ static const struct mtk_jpeg_variant mtk8195_jpegdec_= drvdata =3D { .ioctl_ops =3D &mtk_jpeg_dec_ioctl_ops, .out_q_default_fourcc =3D V4L2_PIX_FMT_JPEG, .cap_q_default_fourcc =3D V4L2_PIX_FMT_YUV420M, + .hw_arch =3D MTK_JPEG_HW_MULTI_CORE, }; =20 #if defined(CONFIG_OF) diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h b/drivers= /media/platform/mediatek/jpeg/mtk_jpeg_core.h index b9126476be8f..ead47e11dd48 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h @@ -46,6 +46,16 @@ enum mtk_jpeg_ctx_state { MTK_JPEG_SOURCE_CHANGE, }; =20 +/** + * enum mtk_jpeg_hw_arch - arch of the jpeg hw + * @MTK_JPEG_HW_MULTI_CORE: jpeg hw is mluti-core + * @MTK_JPEG_HW_SINGLE_CORE: jpeg hw is single core + */ +enum mtk_jpeg_hw_arch { + MTK_JPEG_HW_MULTI_CORE =3D 0, + MTK_JPEG_HW_SINGLE_CORE =3D 1, +}; + /** * struct mtk_jpeg_variant - mtk jpeg driver variant * @clks: clock names @@ -60,6 +70,7 @@ enum mtk_jpeg_ctx_state { * @ioctl_ops: the callback of jpeg v4l2_ioctl_ops * @out_q_default_fourcc: output queue default fourcc * @cap_q_default_fourcc: capture queue default fourcc + * @hw_arch: mark jpeg hw arch */ struct mtk_jpeg_variant { struct clk_bulk_data *clks; @@ -74,6 +85,7 @@ struct mtk_jpeg_variant { const struct v4l2_ioctl_ops *ioctl_ops; u32 out_q_default_fourcc; u32 cap_q_default_fourcc; + enum mtk_jpeg_hw_arch hw_arch; }; =20 struct mtk_jpeg_src_buf { --=20 2.18.0