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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 535A7C433F5 for ; Tue, 28 Sep 2021 15:22:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 31B526101E for ; Tue, 28 Sep 2021 15:22:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241613AbhI1PXm (ORCPT ); Tue, 28 Sep 2021 11:23:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241080AbhI1PXl (ORCPT ); Tue, 28 Sep 2021 11:23:41 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBB06C06161C; Tue, 28 Sep 2021 08:22:01 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: andrzej.p) with ESMTPSA id E8D241F439C0 Subject: Re: [PATCH v6 04/10] hantro: Add quirk for NV12/NV12_4L4 capture format To: Nicolas Dufresne , 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: Benjamin Gaignard , Boris Brezillon , Ezequiel Garcia , Fabio Estevam , Greg Kroah-Hartman , Hans Verkuil , Heiko Stuebner , Jernej Skrabec , Mauro Carvalho Chehab , NXP Linux Team , Pengutronix Kernel Team , Philipp Zabel , Sascha Hauer , Shawn Guo , kernel@collabora.com, Ezequiel Garcia References: <20210927151958.24426-1-andrzej.p@collabora.com> <20210927151958.24426-5-andrzej.p@collabora.com> From: Andrzej Pietrasiewicz Message-ID: Date: Tue, 28 Sep 2021 17:21:56 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org W dniu 28.09.2021 o 17:08, Nicolas Dufresne pisze: > Le lundi 27 septembre 2021 à 17:19 +0200, Andrzej Pietrasiewicz a écrit : >> From: Ezequiel Garcia >> >> The G2 core decoder engine produces NV12_4L4 format, >> which is a simple NV12 4x4 tiled format. The driver currently >> hides this format by always enabling the post-processor engine, >> and therefore offering NV12 directly. >> >> This is done without using the logic in hantro_postproc.c >> and therefore makes it difficult to add VP9 cleanly. >> >> Since fixing this is not easy, add a small quirk to force >> NV12 if HEVC was configured, but otherwise declare NV12_4L4 >> as the pixel format in imx8mq_vpu_g2_variant.dec_fmts. >> >> This will be used by the VP9 decoder which will be added soon. >> >> Signed-off-by: Ezequiel Garcia >> Signed-off-by: Andrzej Pietrasiewicz >> --- >> drivers/staging/media/hantro/hantro_v4l2.c | 14 ++++++++++++++ >> drivers/staging/media/hantro/imx8m_vpu_hw.c | 2 +- >> 2 files changed, 15 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/staging/media/hantro/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c >> index bcb0bdff4a9a..d1f060c55fed 100644 >> --- a/drivers/staging/media/hantro/hantro_v4l2.c >> +++ b/drivers/staging/media/hantro/hantro_v4l2.c >> @@ -150,6 +150,20 @@ static int vidioc_enum_fmt(struct file *file, void *priv, >> unsigned int num_fmts, i, j = 0; >> bool skip_mode_none; >> >> + /* >> + * The HEVC decoder on the G2 core needs a little quirk to offer NV12 >> + * only on the capture side. Once the post-processor logic is used, >> + * we will be able to expose NV12_4L4 and NV12 as the other cases, >> + * and therefore remove this quirk. >> + */ >> + if (capture && ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_HEVC_SLICE) { >> + if (f->index == 0) { >> + f->pixelformat = V4L2_PIX_FMT_NV12; >> + return 0; >> + } >> + return -EINVAL; >> + } >> + >> /* >> * When dealing with an encoder: >> * - on the capture side we want to filter out all MODE_NONE formats. >> diff --git a/drivers/staging/media/hantro/imx8m_vpu_hw.c b/drivers/staging/media/hantro/imx8m_vpu_hw.c >> index 02e61438220a..a40b161e5956 100644 >> --- a/drivers/staging/media/hantro/imx8m_vpu_hw.c >> +++ b/drivers/staging/media/hantro/imx8m_vpu_hw.c >> @@ -134,7 +134,7 @@ static const struct hantro_fmt imx8m_vpu_dec_fmts[] = { >> >> static const struct hantro_fmt imx8m_vpu_g2_dec_fmts[] = { >> { >> - .fourcc = V4L2_PIX_FMT_NV12, >> + .fourcc = V4L2_PIX_FMT_NV12_4L4, > > This depends on some accepted patches from Ezequiel. I don't recall seeing a > mention of this in the cover, this is not a problem per see, but perhaps nice > for the testers. I believe only 76180 is needed, but here's the complete series > I refer to: > > 76178 Accepted [v3,1/4] media: Rename V4L2_PIX_FMT_SUNXI_TILED_NV12 to V4L2_PIX_FMT_NV12_32L32 > 76179 Accepted [v3,2/4] media: Rename V4L2_PIX_FMT_HM12 to V4L2_PIX_FMT_NV12_16L16 > 76180 Accepted [v3,3/4] media: Add NV12_4L4 tiled format > 76181 Accepted [v3,4/4] media: Clean V4L2_PIX_FMT_NV12MT documentation > > >> .codec_mode = HANTRO_MODE_NONE, >> }, >> { > > It was mentioned in the cover letter: "The series depends on the YUV tiled format support prepared by Ezequiel: https://www.spinics.net/lists/linux-media/msg197047.html" Anyway, thanks for clarifying this. Regards, Andrzej