From patchwork Wed Apr 12 11:56:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 82438 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp283622vqo; Wed, 12 Apr 2023 05:25:46 -0700 (PDT) X-Google-Smtp-Source: AKy350b6L/YqUPq64Gvtc0EGC2Mg8gpYBdPch8XNe/Ox8ftrytQvTDKoCb+CItGgjEYFHgoEuQu3 X-Received: by 2002:a17:902:e5c9:b0:1a6:7534:974a with SMTP id u9-20020a170902e5c900b001a67534974amr1643834plf.48.1681302346222; Wed, 12 Apr 2023 05:25:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681302346; cv=none; d=google.com; s=arc-20160816; b=bz0w2M+JIV5qGeTIMTHsXoD53QBjO+z4mUJgAhE3jlm4NwzW+7woyLBz04GK7zBE2p TNE61wouDUdCsfVJ0PGYQ22q8SKPBzCRQUCAXLQPFXkJUA6XHuFlOKqpa7BVs4XyccJm v3xQQnP5K8I9iZh11WuVnsY+tcnUjVIMv15RfNm5gi9qwyPQS5FpABBFUts2NnBOYMq7 P01osZ/59nX3Qo+iZqLDreFn+DEQOyM85CasU9okt5uRtm+y9mXWGcdZrIOqVq4Z2ZY3 wsMh+P8fLCZmJwwrVYIVQOZ+bfvBtqohgttXuT1WqlRqRWXB5G/mcZQa0dgCO7dXE8aE ST+Q== 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=h63wur+WyzAK+Pbd9UxIWsuv205NDqGa7BtPTNGhM8A=; b=sptZ8IsBhs+H2roCGeIuTNszvm5R2OOErS9qRYBEyEPlvcEICjBLTUI3Kz387APSRC 0V3VuRR2YNxBzhDbivo6LfFzeAC2jP5AVhGo1pWRKHCaokTAcM8x8kji+H/XoipYUc83 LZYDmqzgNT7a4v2Bqh2L6QhxgQsQvZEwl0rhAAKb3CJ+qi8r26buCluLFdbngq+QiqSD j62QIXqNstaaWVTwKSyV1rr4ohuYs4exRvqQcBW0jk0VtsaN/K+tiEw6aQ9wO2215ANM dX7d7UUan7FFJ4qnmRVO+TidlAcBZ7B6/TSMqQZMxUvlREIritZuPp8OdpM2T9AdiLoj aRJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=V+RYJ2ui; 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 jy14-20020a17090342ce00b001a652580118si5119987plb.237.2023.04.12.05.25.34; Wed, 12 Apr 2023 05:25:46 -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=V+RYJ2ui; 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 S231682AbjDLL5b (ORCPT + 99 others); Wed, 12 Apr 2023 07:57:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231531AbjDLL5L (ORCPT ); Wed, 12 Apr 2023 07:57:11 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D67F75B81; Wed, 12 Apr 2023 04:57:08 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:c2e:89bd:4b8e:9e98]) (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 5BC536603206; Wed, 12 Apr 2023 12:57:07 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1681300627; bh=ZKTWNs6DFyoOacCAnTYmZcugQ4xTQ0qtplCE2KqxA6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V+RYJ2uiqXG71Yl1Nziw7EQ3fs9sGvjoJfV07LuAqvvTFrY2l+wqB5LITqvbVc8V3 qogL+X395+x7rJpww4TUl5yi64ftELrWwBI9SWjNmOYYW8Y6MUtIQGrbWPwfc87Aei 3ywR6LA84JsjrvolACTm8ChCATbsR6D43eyQjGa0pOR82GdjFkld2aj8tyqpnp3JVw DLy8kVmZnBVJ5IJKP0kjvR37Hw/svfzdDIgmy4r4e2bBOn+Oj3/LqbfphnZ2/eVMqr Yy+sTUYs6GtvyD1jJIzbzpVmcq0pjlxT2IK8cFCAgenZqAzfXyZzN0n7arTOnhQQLz 8OUWwaYvYKZOQ== 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 v6 08/13] media: verisilicon: Compute motion vectors size for AV1 frames Date: Wed, 12 Apr 2023 13:56:47 +0200 Message-Id: <20230412115652.403949-9-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230412115652.403949-1-benjamin.gaignard@collabora.com> References: <20230412115652.403949-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, 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?1762973288661167575?= X-GMAIL-MSGID: =?utf-8?q?1762973288661167575?= 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 Reviewed-by: AngeloGioacchino Del Regno --- 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 3293060a8c67..e31cbe56779a 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -337,6 +337,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