From patchwork Tue Jan 3 17:00:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 38550 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4723739wrt; Tue, 3 Jan 2023 09:07:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXtkX08phiOeWUUt5z3FhpKR+Lrz6o8L0BFFnBBtu+WIzHs8xrbJF0HyyX2YDFu7u97vmIwl X-Received: by 2002:a05:6402:8d9:b0:462:8a68:1398 with SMTP id d25-20020a05640208d900b004628a681398mr51584571edz.1.1672765630848; Tue, 03 Jan 2023 09:07:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672765630; cv=none; d=google.com; s=arc-20160816; b=Eh+uT5sUL6rUjXXOs8mxk9Y3MMXFhOa04bIhidJCeBw2ziYUDx1fsQdB+KLHWJrKK5 iQP5JwNvqDTzwouBPV3EQCG0p9DFc4nn1t4XQxu5JJ/VQuNJsgj58Iftiewyl7Seet8u qS/I+5B6yg2W022NmsXi+AMOtlt6LvzTbinw6JbkBgH2yQFC6MSHztxA/IPhMHvKDEkJ XohK3Xd3DSg6wfOG3MsAJVmJEADGjDVkiQ+pXMw9sC6qSHucN8HZyIBMATjPnGpmUyAR wF+Uh4Lhey5tdO+PKiJmAyEyfNKd7RGvxzyuk8PqgsqXHCv7S7Fnfvu/iBsjDJoTDT// vkRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GETrcC0ya/xIotHgc1xpVJSaOrGTFDg6cAqwLAjyyEg=; b=EfNmblmK5EKPfVxbdNmEJOnq2JNB3nultE/AhAEZhcveCUm/tEx1i6tk2UQjvO+Ty6 H9hAhvjMqBD36RfgBWylRyeimVKFEm3IltI+Nr9DG2kzNMBsuxTyU5O1aSirAxKdlODc 3utxySAl73YSW+Wq+GCqJ7hBmeEOd3VnuBcdwltbMXBnPQ4UkYUBgTel3nGlb5dPUiKc 4Xf+yNs/cb1b3mHeFpMQccO6no8wffYGanYMnoknJJmbLZEPhIf7pmNucNO/uTvsGuae K64JmYNlp6ZH/7ULt+SbpLk5I2ixBQVasOKie9/BBdcoWrMwRw/M2SBEbr6Qa/6nZKKl 8IIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=arepqSVf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f5-20020aa7d845000000b0045cecdc1fbcsi25804183eds.9.2023.01.03.09.06.47; Tue, 03 Jan 2023 09:07:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=arepqSVf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238519AbjACRFh (ORCPT + 99 others); Tue, 3 Jan 2023 12:05:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238435AbjACREk (ORCPT ); Tue, 3 Jan 2023 12:04:40 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 565AC13F4D; Tue, 3 Jan 2023 09:01:28 -0800 (PST) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:abfa:cf23:1e4e:2b14]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: benjamin.gaignard) by madras.collabora.co.uk (Postfix) with ESMTPSA id B6A496602D22; Tue, 3 Jan 2023 17:01:15 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1672765276; bh=0evQrqRnb9kaCHHqbzsXzEtQVoBvZbX6zxh5lAc3G0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=arepqSVfQN9tsFnEFv9RYCmekD+1+YPbuLQ8pislwVcVNHN2ptorkKFwfFSo80Sxq hlHoZkcev+T5yk3CgDaECuN88IRrZhSEQighCKaaQzaDQseNESCMMmxLawwb2xuPIh kKuvbd5wq2hp8BjPZbTLVkiRDT7DeMHid/KcEFtrL4jQ5HAQGO/2gf6ddfHKsz9EXl oSVKBETny+KuSORyr1/lupX9Vw9yc4iyIHAP/xdhur6dHBCFV3g8MsUWD6Vr8BP4KF wYwqja4MnC+9BsuM8NpXVKwiB4ttiY+i81823qwgTJ9v4iNqgZBVUN+hO3ZqZInM3R VtPkuHWsnR1iA== From: Benjamin Gaignard To: ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, mchehab@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de, daniel.almeida@collabora.com, nicolas.dufresne@collabora.co.uk Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v2 13/13] media: verisilicon: Conditionnaly ignore native formats Date: Tue, 3 Jan 2023 18:00:58 +0100 Message-Id: <20230103170058.810597-14-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230103170058.810597-1-benjamin.gaignard@collabora.com> References: <20230103170058.810597-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754021894125348744?= X-GMAIL-MSGID: =?utf-8?q?1754021894125348744?= AV1 film grain feature requires to use the postprocessor to produce valid frames. In such case the driver shouldn't propose native pixels format but only post-processed pixels format. If a codec set need_postproc field in hantro_ctx structure to true native pixel formats will be ignored. Signed-off-by: Benjamin Gaignard --- drivers/media/platform/verisilicon/hantro.h | 3 ++ .../media/platform/verisilicon/hantro_drv.c | 5 ++ .../platform/verisilicon/hantro_postproc.c | 4 ++ .../media/platform/verisilicon/hantro_v4l2.c | 46 +++++++++++++------ 4 files changed, 45 insertions(+), 13 deletions(-) diff --git a/drivers/media/platform/verisilicon/hantro.h b/drivers/media/platform/verisilicon/hantro.h index a98cb40a8d3b..7a5357e810fb 100644 --- a/drivers/media/platform/verisilicon/hantro.h +++ b/drivers/media/platform/verisilicon/hantro.h @@ -231,6 +231,8 @@ struct hantro_dev { * @ctrl_handler: Control handler used to register controls. * @jpeg_quality: User-specified JPEG compression quality. * @bit_depth: Bit depth of current frame + * @need_postproc: Set to true if the bitstream features require to + * use the post-processor. * * @codec_ops: Set of operations related to codec mode. * @postproc: Post-processing context. @@ -258,6 +260,7 @@ struct hantro_ctx { struct v4l2_ctrl_handler ctrl_handler; int jpeg_quality; int bit_depth; + bool need_postproc; const struct hantro_codec_ops *codec_ops; struct hantro_postproc_ctx postproc; diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index 4fc6dea16ae6..8d7055c0bf3b 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -346,6 +346,11 @@ static int hantro_av1_s_ctrl(struct v4l2_ctrl *ctrl) return -EINVAL; ctx->bit_depth = bit_depth; + + if (ctrl->p_new.p_av1_sequence->flags + & V4L2_AV1_SEQUENCE_FLAG_FILM_GRAIN_PARAMS_PRESENT) + ctx->need_postproc = true; + break; default: return -EINVAL; diff --git a/drivers/media/platform/verisilicon/hantro_postproc.c b/drivers/media/platform/verisilicon/hantro_postproc.c index 7dc39519a2ee..293e5612e2ce 100644 --- a/drivers/media/platform/verisilicon/hantro_postproc.c +++ b/drivers/media/platform/verisilicon/hantro_postproc.c @@ -57,6 +57,10 @@ bool hantro_needs_postproc(const struct hantro_ctx *ctx, { if (ctx->is_encoder) return false; + + if (ctx->need_postproc) + return true; + return fmt->postprocessed; } diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c index bbe79dbd2cd9..5c381766cca3 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -38,6 +38,11 @@ hantro_get_formats(const struct hantro_ctx *ctx, unsigned int *num_fmts) { const struct hantro_fmt *formats; + if (ctx->need_postproc) { + *num_fmts = 0; + return NULL; + } + if (ctx->is_encoder) { formats = ctx->dev->variant->enc_fmts; *num_fmts = ctx->dev->variant->num_enc_fmts; @@ -132,6 +137,15 @@ hantro_get_default_fmt(const struct hantro_ctx *ctx, bool bitstream) hantro_check_depth_match(ctx, &formats[i])) return &formats[i]; } + + formats = hantro_get_postproc_formats(ctx, &num_fmts); + for (i = 0; i < num_fmts; i++) { + if (bitstream == (formats[i].codec_mode != + HANTRO_MODE_NONE) && + hantro_check_depth_match(ctx, &formats[i])) + return &formats[i]; + } + return NULL; } @@ -261,19 +275,6 @@ static int vidioc_g_fmt_out_mplane(struct file *file, void *priv, return 0; } -static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv, - struct v4l2_format *f) -{ - struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; - struct hantro_ctx *ctx = fh_to_ctx(priv); - - vpu_debug(4, "f->type = %d\n", f->type); - - *pix_mp = ctx->dst_fmt; - - return 0; -} - static int hantro_try_fmt(const struct hantro_ctx *ctx, struct v4l2_pix_format_mplane *pix_mp, enum v4l2_buf_type type) @@ -353,6 +354,25 @@ static int hantro_try_fmt(const struct hantro_ctx *ctx, return 0; } +static int vidioc_g_fmt_cap_mplane(struct file *file, void *priv, + struct v4l2_format *f) +{ + struct v4l2_pix_format_mplane *pix_mp = &f->fmt.pix_mp; + struct hantro_ctx *ctx = fh_to_ctx(priv); + int ret; + + vpu_debug(4, "f->type = %d\n", f->type); + + ret = hantro_try_fmt(ctx, pix_mp, f->type); + if (ret) + return ret; + + ctx->vpu_dst_fmt = hantro_find_format(ctx, pix_mp->pixelformat); + ctx->dst_fmt = *pix_mp; + + return 0; +} + static int vidioc_try_fmt_cap_mplane(struct file *file, void *priv, struct v4l2_format *f) {