From patchwork Wed Sep 29 16:04:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Pietrasiewicz X-Patchwork-Id: 12526167 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19D92C4332F for ; Wed, 29 Sep 2021 16:07:04 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E0FDD6159A for ; Wed, 29 Sep 2021 16:07:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E0FDD6159A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=5ivPqvJfZ5bK16g4vH/TZa5bV8H0dLTWq95/dP8Y9Ak=; b=pmYREh2B4qfkis 7aRkRdYa/YZRgaOqWvhr52zPmtBKmks4CoWqcNNZlGKQ+ULOAeGJ+a/9uHaQga8dTGPpYKTRWJP16 K3Xg7x11JFf6ItGM6Dc0PKjjVRzoFEMVGrLeoohFFQsk4BwVY/r+WBFZzyLPjvtLxm0zIdTzNPvak eteXTikefXPaE0nO2dVRXdFsw52MfVMZ4ddsAcvMuzQMGNwqOufIBnebrf1VB9SBSQNklxxIdzmP6 8+Yf6SveLw/RA/5InyXrCCiWiYr5pcqUEsdGh9Scp3VYEYierQW0CJj5E2ISvNXK2f/Cc4peJYVQL 1+w6wEp6HdCd9XD8fSJg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mVc5P-00Bfei-DC; Wed, 29 Sep 2021 16:05:35 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mVc4g-00BfID-KL; Wed, 29 Sep 2021 16:04:54 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: andrzej.p) with ESMTPSA id 655351F4466B From: Andrzej Pietrasiewicz To: linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev Cc: Andrzej Pietrasiewicz , Benjamin Gaignard , Boris Brezillon , Ezequiel Garcia , Fabio Estevam , Greg Kroah-Hartman , Hans Verkuil , Heiko Stuebner , Jernej Skrabec , Mauro Carvalho Chehab , Nicolas Dufresne , NXP Linux Team , Pengutronix Kernel Team , Philipp Zabel , Sascha Hauer , Shawn Guo , kernel@collabora.com Subject: [PATCH v7 00/11] VP9 codec V4L2 control interface Date: Wed, 29 Sep 2021 18:04:28 +0200 Message-Id: <20210929160439.6601-1-andrzej.p@collabora.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210929_090450_949650_29EC0DA6 X-CRM114-Status: GOOD ( 22.11 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Dear all, This patch series adds VP9 codec V4L2 control interface and two drivers using the new controls. It is a follow-up of previous v6 series [1]. In this iteration, we've implemented VP9 hardware decoding on two devices: Rockchip VDEC and Hantro G2, and tested on RK3399, i.MX8MQ and i.MX8MP. The i.MX8M driver needs proper power domains support, though, which is a subject of a different effort, but in all 3 cases we were able to run the drivers. GStreamer support is also available, the needed changes have been submitted by Daniel Almeida [2]. This MR is ready to be merged, and just needs the VP9 V4L2 controls to be merged and released. Both rkvdec and hantro drivers are passing a significant number of VP9 tests using Fluster[3]. There are still a few tests that are not passing, due to dynamic frame resize (not yet supported by V4L2) and small size videos (due to IP block limitations). The series adds the VP9 codec V4L2 control API as uAPI, so it aims at being merged without passing through staging, as agreed[4]. The ABI has been checked for padding and verified to contain no holes. [1] https://patchwork.linuxtv.org/project/linux-media/list/?series=6377 [2] https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2144 [3] https://github.com/fluendo/fluster [4] https://lore.kernel.org/linux-media/b8f83c93-67fd-09f5-9314-15746cbfdc61@xs4all.nl/ The series depends on the YUV tiled format support prepared by Ezequiel: https://www.spinics.net/lists/linux-media/msg197047.html Rebased onto latest media_tree. Changes related to v6: - moved setting tile filter and tile bsd auxiliary buffer addresses so that they are always set, even if no tiles are used (thanks, Jernej) - added a comment near the place where the 32-bit DMA mask is applied (thanks, Nicolas) - improved consistency in register names (thanks, Nicolas) Changes related to v5: - improved the doc comments as per Ezequiel's review (thanks, Ezequiel) - improved pdf output of documentation - added Benjamin's Reviewed-by (thanks, Benjamin) Changes related to v4: - removed unused enum v4l2_vp9_intra_prediction_mode - converted remaining enums to defines to follow the convention - improved the documentation, in particular better documented how to use segmentation features Changes related to v3: Apply suggestions from Jernej's review (thanks, Jernej): - renamed a control and two structs: V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR_PROBS => V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR v4l2_ctrl_vp9_compressed_hdr_probs => v4l2_ctrl_vp9_compressed_hdr v4l2_vp9_mv_compressed_hdr_probs => v4l2_vp9_mv_probs - moved tx_mode to v4l2_ctrl_vp9_compressed_hdr - fixed enum v4l2_vp9_ref_frame_sign_bias values (which are used to test a bitfield) - explicitly assigned values to all other vp9 enums Apply suggestion from Nicolas's review (thanks, Nicolas): - explicitly stated that the v4l2_ctrl_vp9_compressed_hdr control is optional and implemented only by drivers which need it Changes related to the RFC v2: - added another driver including a postprocessor to de-tile codec-specific tiling - reworked uAPI structs layout to follow VP8 style - changed validation of loop filter params - changed validation of segmentation params - changed validation of VP9 frame params - removed level lookup array from loop filter struct (can be computed by drivers) - renamed some enum values to match the spec more closely - V4L2 VP9 library changed the 'eob' member of 'struct v4l2_vp9_frame_symbol_counts' so that it is an array of pointers instead of an array of pointers to arrays (IPs such as g2 creatively pass parts of the 'eob' counts in the 'coeff' counts) - factored out several repeated portions of code - minor nitpicks and cleanups Andrzej Pietrasiewicz (6): media: uapi: Add VP9 stateless decoder controls media: Add VP9 v4l2 library media: hantro: Rename registers media: hantro: Prepare for other G2 codecs media: hantro: Support VP9 on the G2 core media: hantro: Support NV12 on the G2 core Boris Brezillon (1): media: rkvdec: Add the VP9 backend Ezequiel Garcia (4): hantro: postproc: Fix motion vector space size hantro: postproc: Introduce struct hantro_postproc_ops hantro: Simplify postprocessor hantro: Add quirk for NV12/NV12_4L4 capture format .../userspace-api/media/v4l/biblio.rst | 10 + .../media/v4l/ext-ctrls-codec-stateless.rst | 573 +++++ .../media/v4l/pixfmt-compressed.rst | 15 + .../media/v4l/vidioc-g-ext-ctrls.rst | 8 + .../media/v4l/vidioc-queryctrl.rst | 12 + .../media/videodev2.h.rst.exceptions | 2 + drivers/media/v4l2-core/Kconfig | 4 + drivers/media/v4l2-core/Makefile | 1 + drivers/media/v4l2-core/v4l2-ctrls-core.c | 180 ++ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 8 + drivers/media/v4l2-core/v4l2-ioctl.c | 1 + drivers/media/v4l2-core/v4l2-vp9.c | 1850 +++++++++++++++++ drivers/staging/media/hantro/Kconfig | 1 + drivers/staging/media/hantro/Makefile | 7 +- drivers/staging/media/hantro/hantro.h | 40 +- drivers/staging/media/hantro/hantro_drv.c | 23 +- drivers/staging/media/hantro/hantro_g2.c | 27 + .../staging/media/hantro/hantro_g2_hevc_dec.c | 69 +- drivers/staging/media/hantro/hantro_g2_regs.h | 132 +- .../staging/media/hantro/hantro_g2_vp9_dec.c | 980 +++++++++ drivers/staging/media/hantro/hantro_hw.h | 83 +- .../staging/media/hantro/hantro_postproc.c | 79 +- drivers/staging/media/hantro/hantro_v4l2.c | 20 + drivers/staging/media/hantro/hantro_vp9.c | 240 +++ drivers/staging/media/hantro/hantro_vp9.h | 103 + drivers/staging/media/hantro/imx8m_vpu_hw.c | 38 +- .../staging/media/hantro/rockchip_vpu_hw.c | 7 +- .../staging/media/hantro/sama5d4_vdec_hw.c | 3 +- drivers/staging/media/rkvdec/Kconfig | 1 + drivers/staging/media/rkvdec/Makefile | 2 +- drivers/staging/media/rkvdec/rkvdec-vp9.c | 1078 ++++++++++ drivers/staging/media/rkvdec/rkvdec.c | 52 +- drivers/staging/media/rkvdec/rkvdec.h | 12 +- include/media/v4l2-ctrls.h | 4 + include/media/v4l2-vp9.h | 182 ++ include/uapi/linux/v4l2-controls.h | 284 +++ include/uapi/linux/videodev2.h | 6 + 37 files changed, 6033 insertions(+), 104 deletions(-) create mode 100644 drivers/media/v4l2-core/v4l2-vp9.c create mode 100644 drivers/staging/media/hantro/hantro_g2.c create mode 100644 drivers/staging/media/hantro/hantro_g2_vp9_dec.c create mode 100644 drivers/staging/media/hantro/hantro_vp9.c create mode 100644 drivers/staging/media/hantro/hantro_vp9.h create mode 100644 drivers/staging/media/rkvdec/rkvdec-vp9.c create mode 100644 include/media/v4l2-vp9.h base-commit: e4e737bb5c170df6135a127739a9e6148ee3da82