From patchwork Tue Feb 14 14:05:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 56994 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2992973wrn; Tue, 14 Feb 2023 06:08:16 -0800 (PST) X-Google-Smtp-Source: AK7set8UX8DrD9gWLhdLlL/AT4xsGKeoydmw4S+qQAifz+rWkrgo2LOP5XyALlLi0zdjYDOtxQGf X-Received: by 2002:aa7:9d89:0:b0:593:96a2:d60a with SMTP id f9-20020aa79d89000000b0059396a2d60amr2086134pfq.30.1676383696044; Tue, 14 Feb 2023 06:08:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676383696; cv=none; d=google.com; s=arc-20160816; b=loqIwYWm50gLqN4fp6rA+1LHykgaZzY6Is1Jm2jLmueQSF/vFCHzSwA7QjD4bi/aSX zK9zAPj4ZCNKxsdOh6xehY7fGMqSRGJACJ6O7OCHQsOvCxmSrVUpTaGxRh2jc9BZSX5d EOh/S217xrY0AuuMc/EqNUhiZ2wmnXZjaYg+cDV4FdQ3zJuhJ4psRdAWFdjchzDralZR tqT44t4QPF7jw8qdsZqw7a5ee8lNXmlN1P2CuFurE4Y6BDA8Wui4WZP6R8lQaQQtVjOq DwFzv7YC3keuY94e9x3SuYlkPguYcEuS0tifdimtRQTX2ZFbNQNKbwG7qBtJbPXwYBYQ +Svg== 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=OKA4oS0WJnGnmjFtDnDvzFOU4S13LDI5h1znf8oUxVs=; b=rq4mM7HxiwKLbaQMLU63uORGk9HxYkSUNEOzxwGayPoZzNR0LHPU2/62pyw78zenvK e8naKIPkiyfFwFLHe8PdrAtrKCjgsTjfplh+ohk8Pt3GwK3tbO5a1GMKiYPkQW0kogNu 6kh+srDnEVs3FtNzz/CXYIPrk6ihgQOQ65w9dQfhaDyc3d6XejqdlVFDIaMuzw0AT3sS tE3xI9quT2FNa+AVuSCbwNKCL02JN6MEU2DYbJSWVimGJ6CPyg7IPp8IZiTDzJ7Wz8Yv 9GNWul+w6v0UNTbCQTvQ2qab+EYRRCO1HnKxRhdB7KguZFESbRI/xtiNB4618/lEoV9u k6Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=WhBHl2JX; 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=REJECT sp=REJECT 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 o21-20020aa79795000000b00593d4cbda81si15448675pfp.116.2023.02.14.06.08.03; Tue, 14 Feb 2023 06:08:16 -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=WhBHl2JX; 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=REJECT sp=REJECT dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233214AbjBNOGe (ORCPT + 99 others); Tue, 14 Feb 2023 09:06:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232529AbjBNOGN (ORCPT ); Tue, 14 Feb 2023 09:06:13 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA40C26878; Tue, 14 Feb 2023 06:06:11 -0800 (PST) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:37c0:9b2b:ec16:1f37]) (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 A13A7660217C; Tue, 14 Feb 2023 14:06:07 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1676383568; bh=gGoMGrYnSHhhO3aHJYJGSTnXU+/tx3NyQMBEgbM6JvM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WhBHl2JXB+qRwDZF6A6n5UpU4kTEcX/+CbHcTN9ZAZI+7wbSRp2/NAY56dXCZ7xDa 2dWXsBJ2NAGP0RrkkZ/KkLv+qk5UlCeslCIrqSIuH5e34hzcomr4x/DUderYIpM9E7 f2d4ZimNAO5miving3fvisNJCQqNNhyyFduPTW9M+3dnuHI9nifIT7JZoOHAyjwkTz QrC+rR1AC1iQd21Oo5kIPbjTO8CHXD5PyZ5z+Ubxpy7GADADu7Zp/howxx+844W5r5 c6zGdLby4QMnDuqdaQ5ZAifqTnuVhjhIypBS5Md8ikYZC0u1fLmiG3Gd+okEYIXkTV j//X+6pRTWTwQ== 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, hverkuil@xs4all.nl, nicolas.dufresne@collabora.com, jernej.skrabec@gmail.com 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 v4 07/12] media: verisilicon: Compute motion vectors size for AV1 frames Date: Tue, 14 Feb 2023 15:05:52 +0100 Message-Id: <20230214140557.537984-8-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230214140557.537984-1-benjamin.gaignard@collabora.com> References: <20230214140557.537984-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?1757815710723014233?= X-GMAIL-MSGID: =?utf-8?q?1757815710723014233?= Compute the additional space required to store motion vectors at the end of the frames buffers. Signed-off-by: Benjamin Gaignard --- version 4: - Double motion vectors buffer size. drivers/media/platform/verisilicon/hantro_hw.h | 13 +++++++++++++ .../media/platform/verisilicon/hantro_postproc.c | 3 +++ drivers/media/platform/verisilicon/hantro_v4l2.c | 5 +++++ 3 files changed, 21 insertions(+) diff --git a/drivers/media/platform/verisilicon/hantro_hw.h b/drivers/media/platform/verisilicon/hantro_hw.h index e83f0c523a30..bc61d4e051c7 100644 --- a/drivers/media/platform/verisilicon/hantro_hw.h +++ b/drivers/media/platform/verisilicon/hantro_hw.h @@ -417,6 +417,19 @@ hantro_hevc_mv_size(unsigned int width, unsigned int height) return width * height / 16; } +static inline unsigned short hantro_av1_num_sbs(unsigned short dimension) +{ + return DIV_ROUND_UP(dimension, 64); +} + +static inline size_t +hantro_av1_mv_size(unsigned int width, unsigned int height) +{ + size_t num_sbs = hantro_av1_num_sbs(width) * hantro_av1_num_sbs(height); + + return ALIGN(num_sbs * 384, 16) * 2 + 512; +} + int hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx); int rockchip_vpu2_mpeg2_dec_run(struct hantro_ctx *ctx); void hantro_mpeg2_dec_copy_qtable(u8 *qtable, diff --git a/drivers/media/platform/verisilicon/hantro_postproc.c b/drivers/media/platform/verisilicon/hantro_postproc.c index 6437423ccf3a..bb16af50719d 100644 --- a/drivers/media/platform/verisilicon/hantro_postproc.c +++ b/drivers/media/platform/verisilicon/hantro_postproc.c @@ -213,6 +213,9 @@ int hantro_postproc_alloc(struct hantro_ctx *ctx) else if (ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_HEVC_SLICE) buf_size += hantro_hevc_mv_size(pix_mp.width, pix_mp.height); + else if (ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_AV1_FRAME) + buf_size += hantro_av1_mv_size(pix_mp.width, + pix_mp.height); for (i = 0; i < num_buffers; ++i) { struct hantro_aux_buf *priv = &ctx->postproc.dec_q[i]; diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c index 7e74e47c9a89..9adca9b7ef24 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -336,6 +336,11 @@ static int hantro_try_fmt(const struct hantro_ctx *ctx, pix_mp->plane_fmt[0].sizeimage += hantro_hevc_mv_size(pix_mp->width, pix_mp->height); + else if (ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_AV1_FRAME && + !hantro_needs_postproc(ctx, fmt)) + pix_mp->plane_fmt[0].sizeimage += + hantro_av1_mv_size(pix_mp->width, + pix_mp->height); } else if (!pix_mp->plane_fmt[0].sizeimage) { /* * For coded formats the application can specify