From patchwork Wed May 3 08:34:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 89634 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1168193vqo; Wed, 3 May 2023 01:40:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5kITVskcDKM5tItDMEsz/7rCstPnjCAwyP1ioJ0yyWyOknOQfoHqgXGWl97VABgRFgZbSO X-Received: by 2002:a05:6a20:1601:b0:f3:6f93:1710 with SMTP id l1-20020a056a20160100b000f36f931710mr24847448pzj.0.1683103223210; Wed, 03 May 2023 01:40:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683103223; cv=none; d=google.com; s=arc-20160816; b=fdXb+KRmETwo8pCGh1C7+HG3BeVurph/AmvXgonaCdlM3Nq9OQM1Uhgr1WD51KGWiE aQ2k87uymkF1+z6a1e4ahbWrtJm8M1pChyFTYF4Vzh8YsKMnQRDLacZoDLjj7SVsNHaW K9krjVo2uXuFPmzuCdFTZmzLLDBEt09mSjDsBSwoLbEIA/zxDZN5cfFckEOOqmNhcjL8 Mrx+86NjiBDa1K0g+Wu8PJbXoVrCOREA6dgtPmXOfPmIRbHO4P0evXy77ANk3c9DWJv4 zkzPU/yrYpDC28YdTu14sspxgtrA5cQhz8bP8MQeSq/8r+aBSdkzRhrQITeb8RYRJYLu MGmA== 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=AJJcCZFAyty5lRqnIaLFwaNQ86NZ+9Fbu8Ur/F/Xq0Y=; b=h5rE9xxuz2i7hirUp+8bDNLmnEOJp0Jpq79J9SInt9pc1t1SPhKkLUPJ/rbeg4rdor lIszBU8jg2EyEgY/NUyOYrqFkwjrnhTabgGJ2Bxj9hqPTTb/4VISoRalQUDe+mVGjgdy jZTJlkxyDAW9bDADTPp2nRiyUOQ2V9yxuwLoB45u/GWaeBNVmnhJf5TvuaqQswYJPM2n KCK5L/p5Esza84GuolKubNhTmwkBJysc8CTmMuXpJU6THQgDXywgxT0poEvBLYk+bgbH j0U7f6jQV6yZGqgsECodqowEl6ExyG88ktKtz3u/op/6IOwmPbofQSF/TgQP6+dzkkv9 7M1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=fb0O3CHF; 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=QUARANTINE sp=QUARANTINE 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 j69-20020a638048000000b00528cf858c87si10022999pgd.156.2023.05.03.01.40.10; Wed, 03 May 2023 01:40:23 -0700 (PDT) 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=fb0O3CHF; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230024AbjECIf0 (ORCPT + 99 others); Wed, 3 May 2023 04:35:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229861AbjECIex (ORCPT ); Wed, 3 May 2023 04:34:53 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1320E4ECB; Wed, 3 May 2023 01:34:50 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:8234:977e:ebbe:d70b]) (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 75B7E66056DD; Wed, 3 May 2023 09:34:49 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1683102889; bh=sI93uPIy3N6rVoU+Pg7Tcfm2o5+/AvmPETDKyi6Xgko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fb0O3CHFl0jT0eOiYHJ1X2X3uv0J3jx/lUpTYU9s1RojgQF9SZGqw82B+QFkooY5X QXRsEU+1o8Q346lNkSbqKpy9g72DCux93uQRxYz384yo1TJYZgMzm4uO41ZKlh5iDb fjuzkXNchf1/kjOtvY7MF0D8W3sVnAYK2EHb/FLsHlxrkf/Dd4Z75THRu1TY8XWKpE pL5km5FTWVdqIAUc7fJOaRW6sDUOdEB4hKRsyvd8DCaRrNw0eAJZq9x4VtazZcsRvy bDMHj8XtbGYW9QZ3DMrYfsbsN5CbkpQwPzxNHDX5ukCB+RIrq042n/7WXls45reiFb UJdDEaDNG2izA== 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-cisco@xs4all.nl, nicolas.dufresne@collabora.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 v7 08/13] media: verisilicon: Compute motion vectors size for AV1 frames Date: Wed, 3 May 2023 10:34:33 +0200 Message-Id: <20230503083438.85139-9-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503083438.85139-1-benjamin.gaignard@collabora.com> References: <20230503083438.85139-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1764861644984637343?= X-GMAIL-MSGID: =?utf-8?q?1764861644984637343?= Compute the additional space required to store motion vectors at the end of the frames buffers. Signed-off-by: Benjamin Gaignard Reviewed-by: Nicolas Dufresne --- 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 1ab5f9ce725b..1c76ca1fe1c6 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -333,6 +333,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