From patchwork Fri Sep 30 14:55:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 611216 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 11953C433F5 for ; Fri, 30 Sep 2022 14:55:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231475AbiI3Ozv (ORCPT ); Fri, 30 Sep 2022 10:55:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231473AbiI3Oz0 (ORCPT ); Fri, 30 Sep 2022 10:55:26 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37B8641503 for ; Fri, 30 Sep 2022 07:55:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id BDEDCB8291A for ; Fri, 30 Sep 2022 14:55:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B75ABC433D7; Fri, 30 Sep 2022 14:55:14 +0000 (UTC) Message-ID: <50618425-5159-4077-3d3b-6938c86ca474@xs4all.nl> Date: Fri, 30 Sep 2022 16:55:13 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.0 Content-Language: en-US To: "linux-media@vger.kernel.org" Cc: "kyrie.wu" , Ming Qian , Irui Wang From: Hans Verkuil Subject: [GIT PULL FOR v6.2 v2] imx-jpeg & mtk-jpeg: fixes and enhancements Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Changes since v1: - Update "media: imx-jpeg: Implement g_selection and s_selection" and "media: imx-jpeg: Support contiguous and non contiguous format" to v3 (I missed that a v3 was posted). - Added "media: imx-jpeg: Lock on ioctl encoder/decoder stop cmd" The following changes since commit d67614f276c1499ad939fa5c1aadd35498cc6b34: Merge fixes into media_stage (2022-09-27 10:27:56 +0200) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-v6.2b for you to fetch changes up to df71c6e4d5e54a79a772c3f8a3676ab6bf169c46: media: imx-jpeg: Lock on ioctl encoder/decoder stop cmd (2022-09-30 16:43:53 +0200) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Jason Wang (1): media: imx-jpeg: Remove unnecessary memset() after dma_alloc_coherent() Jianhua Lin (2): dt-bindings: media: mediatek-jpeg-decoder: Add MT8188 compatible string dt-bindings: media: mediatek-jpeg-encoder: Add MT8188 compatible string Ming Qian (6): media: imx-jpeg: Add a timeout mechanism for each frame media: imx-jpeg: Don't clear stop state in handling dynamic resolution change media: imx-jpeg: Disable useless interrupt to avoid kernel panic media: imx-jpeg: Implement g_selection and s_selection media: imx-jpeg: Support contiguous and non contiguous format media: imx-jpeg: Lock on ioctl encoder/decoder stop cmd kyrie wu (15): dt-bindings: mediatek: Add mediatek, mt8195-jpgenc compatible mtk-jpegenc: export jpeg encoder functions mtk-jpegenc: support jpegenc multi-hardware mtk-jpegenc: add jpegenc timeout func interface mtk-jpegenc: add jpeg encode worker interface mtk-jpegenc: add output pic reorder interface mtk-jpegenc: add stop cmd interface for jpgenc dt-bindings: mediatek: Add mediatek,mt8195-jpgdec compatible media: mtk-jpegdec: export jpeg decoder functions media: mtk-jpegdec: support jpegdec multi-hardware media: mtk-jpegdec: add jpegdec timeout func interface media: mtk-jpegdec: add jpeg decode worker interface media: mtk-jpegdec: add output pic reorder interface media: mtk-jpegdec: refactor jpegdec func interface mtk-jpegdec: add stop cmd interface for jpgdec Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml | 168 ++++++++++++++++++ Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml | 147 ++++++++++++++++ Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.yaml | 1 + Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml | 1 + drivers/media/platform/mediatek/jpeg/Makefile | 14 +- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 490 ++++++++++++++++++++++++++++++++++++++++++++++++---- drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.h | 169 ++++++++++++++++-- drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 315 +++++++++++++++++++++++++++++++--- drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.h | 6 +- drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_reg.h | 1 + drivers/media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 255 +++++++++++++++++++++++++++ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c | 4 +- drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 610 +++++++++++++++++++++++++++++++++++++++++++++++------------------ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 10 +- 14 files changed, 1934 insertions(+), 257 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt8195-jpegdec.yaml create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt8195-jpegenc.yaml