From patchwork Thu Feb 24 07:34:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 12757905 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 38288C433F5 for ; Thu, 24 Feb 2022 07:34:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231539AbiBXHe6 (ORCPT ); Thu, 24 Feb 2022 02:34:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231477AbiBXHe5 (ORCPT ); Thu, 24 Feb 2022 02:34:57 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFED536692 for ; Wed, 23 Feb 2022 23:34:27 -0800 (PST) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 2E9BE6176C for ; Thu, 24 Feb 2022 07:34:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10B2BC340E9; Thu, 24 Feb 2022 07:34:25 +0000 (UTC) Message-ID: <000d2cfe-c0b0-da23-025c-1dc863a95e81@xs4all.nl> Date: Thu, 24 Feb 2022 08:34:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.1 Content-Language: en-US To: "linux-media@vger.kernel.org" Cc: Ming Qian From: Hans Verkuil Subject: [GIT PULL FOR v5.18] v2: amphion video decoder/encoder driver Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Ming Qian, Thank you very much for your hard work on this! Very nice to see this go in. Regards, Hans Changes since v1: - Added the Makefile/Kconfig last after all the other driver sources are in place to avoid bisect problems. The following changes since commit 2b891d3980f6c255459d0e1c29ce2152ec7cf678: media: xilinx: csi2rxss: Use mipi-csi2.h (2022-02-17 10:32:26 +0100) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.18r for you to fetch changes up to c40c0f562b42cad3bc97bc29c273aaa5776a67a5: media: amphion: add amphion vpu entry in Kconfig and Makefile (2022-02-24 08:22:49 +0100) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Ming Qian (12): dt-bindings: media: amphion: add amphion video codec bindings media: add nv12m_8l128 and nv12m_10be_8l128 video format. media: amphion: add amphion vpu device driver media: amphion: add vpu core driver media: amphion: implement vpu core communication based on mailbox media: amphion: add vpu v4l2 m2m support media: amphion: add v4l2 m2m vpu encoder stateful driver media: amphion: add v4l2 m2m vpu decoder stateful driver media: amphion: implement windsor encoder rpc interface media: amphion: implement malone decoder rpc interface MAINTAINERS: add AMPHION VPU CODEC V4L2 driver entry media: amphion: add amphion vpu entry in Kconfig and Makefile Documentation/devicetree/bindings/media/amphion,vpu.yaml | 180 ++++++ Documentation/userspace-api/media/v4l/pixfmt-yuv-planar.rst | 28 +- MAINTAINERS | 9 + drivers/media/platform/Kconfig | 19 + drivers/media/platform/Makefile | 2 + drivers/media/platform/amphion/Makefile | 20 + drivers/media/platform/amphion/vdec.c | 1691 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/media/platform/amphion/venc.c | 1358 +++++++++++++++++++++++++++++++++++++++++++++ drivers/media/platform/amphion/vpu.h | 362 ++++++++++++ drivers/media/platform/amphion/vpu_cmds.c | 433 +++++++++++++++ drivers/media/platform/amphion/vpu_cmds.h | 25 + drivers/media/platform/amphion/vpu_codec.h | 68 +++ drivers/media/platform/amphion/vpu_color.c | 183 ++++++ drivers/media/platform/amphion/vpu_core.c | 871 +++++++++++++++++++++++++++++ drivers/media/platform/amphion/vpu_core.h | 15 + drivers/media/platform/amphion/vpu_dbg.c | 494 +++++++++++++++++ drivers/media/platform/amphion/vpu_defs.h | 187 +++++++ drivers/media/platform/amphion/vpu_drv.c | 260 +++++++++ drivers/media/platform/amphion/vpu_helpers.c | 413 ++++++++++++++ drivers/media/platform/amphion/vpu_helpers.h | 74 +++ drivers/media/platform/amphion/vpu_imx8q.c | 271 +++++++++ drivers/media/platform/amphion/vpu_imx8q.h | 115 ++++ drivers/media/platform/amphion/vpu_malone.c | 1625 +++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/media/platform/amphion/vpu_malone.h | 44 ++ drivers/media/platform/amphion/vpu_mbox.c | 118 ++++ drivers/media/platform/amphion/vpu_mbox.h | 16 + drivers/media/platform/amphion/vpu_msgs.c | 385 +++++++++++++ drivers/media/platform/amphion/vpu_msgs.h | 14 + drivers/media/platform/amphion/vpu_rpc.c | 257 +++++++++ drivers/media/platform/amphion/vpu_rpc.h | 456 +++++++++++++++ drivers/media/platform/amphion/vpu_v4l2.c | 712 ++++++++++++++++++++++++ drivers/media/platform/amphion/vpu_v4l2.h | 55 ++ drivers/media/platform/amphion/vpu_windsor.c | 1169 +++++++++++++++++++++++++++++++++++++++ drivers/media/platform/amphion/vpu_windsor.h | 37 ++ drivers/media/v4l2-core/v4l2-ioctl.c | 2 + include/uapi/linux/videodev2.h | 2 + 36 files changed, 11967 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/amphion,vpu.yaml create mode 100644 drivers/media/platform/amphion/Makefile create mode 100644 drivers/media/platform/amphion/vdec.c create mode 100644 drivers/media/platform/amphion/venc.c create mode 100644 drivers/media/platform/amphion/vpu.h create mode 100644 drivers/media/platform/amphion/vpu_cmds.c create mode 100644 drivers/media/platform/amphion/vpu_cmds.h create mode 100644 drivers/media/platform/amphion/vpu_codec.h create mode 100644 drivers/media/platform/amphion/vpu_color.c create mode 100644 drivers/media/platform/amphion/vpu_core.c create mode 100644 drivers/media/platform/amphion/vpu_core.h create mode 100644 drivers/media/platform/amphion/vpu_dbg.c create mode 100644 drivers/media/platform/amphion/vpu_defs.h create mode 100644 drivers/media/platform/amphion/vpu_drv.c create mode 100644 drivers/media/platform/amphion/vpu_helpers.c create mode 100644 drivers/media/platform/amphion/vpu_helpers.h create mode 100644 drivers/media/platform/amphion/vpu_imx8q.c create mode 100644 drivers/media/platform/amphion/vpu_imx8q.h create mode 100644 drivers/media/platform/amphion/vpu_malone.c create mode 100644 drivers/media/platform/amphion/vpu_malone.h create mode 100644 drivers/media/platform/amphion/vpu_mbox.c create mode 100644 drivers/media/platform/amphion/vpu_mbox.h create mode 100644 drivers/media/platform/amphion/vpu_msgs.c create mode 100644 drivers/media/platform/amphion/vpu_msgs.h create mode 100644 drivers/media/platform/amphion/vpu_rpc.c create mode 100644 drivers/media/platform/amphion/vpu_rpc.h create mode 100644 drivers/media/platform/amphion/vpu_v4l2.c create mode 100644 drivers/media/platform/amphion/vpu_v4l2.h create mode 100644 drivers/media/platform/amphion/vpu_windsor.c create mode 100644 drivers/media/platform/amphion/vpu_windsor.h