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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19CF2C001B0 for ; Mon, 3 Jul 2023 08:09:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230373AbjGCIJV (ORCPT ); Mon, 3 Jul 2023 04:09:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230160AbjGCIJU (ORCPT ); Mon, 3 Jul 2023 04:09:20 -0400 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 CAD1BC5; Mon, 3 Jul 2023 01:09:17 -0700 (PDT) Received: from [IPV6:2a01:e0a:120:3210:4563:92b0:7df7:68d2] (unknown [IPv6:2a01:e0a:120:3210:4563:92b0:7df7:68d2]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 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 762B8660297B; Mon, 3 Jul 2023 09:09:15 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1688371755; bh=FoxyCwSED1NQb2JVKQe28H/cQr0EbCDBOFoxMI+oRmk=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=DX+0JyOi+UOAHjq+U7oPBEXI/iGkisjG3bkMz93iti3JlqWvZyY7i4tLWXdLS+081 jlqKGzRkb0RVaO4m511EhrPeVwYCMy80lMdoJPyf6+fkZPiBiKshVlu+UnXSCcsFUB hezXrnKZtVJhr81Q+3PLGm63u7EYCTh0S3xPOFridHH20BYJ2maAlCpzpNz2ZHyub3 rudswu81kQdJXnL6gZC7bC4nmLxWYyonXo8VuAeatB1jmubCthLD4/yWeVPp0V9slO 4kJMv6ByOoqe7P7mp6+SXZOURXU3ybNccRmu5mydjS7FpaqNWZnPwTHTLoYesY23AL VLnoLUdpeX/LA== Message-ID: <5cb3f216-5041-a155-5d2c-059dc1f15024@collabora.com> Date: Mon, 3 Jul 2023 10:09:13 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH v3 04/11] media: videobuf2: Stop define VB2_MAX_FRAME as global To: Hsia-Jun Li Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, m.szyprowski@samsung.com, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, hverkuil-cisco@xs4all.nl, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, linux-rockchip@lists.infradead.org, mchehab@kernel.org, linux-staging@lists.linux.dev, ming.qian@nxp.com, kernel@collabora.com, gregkh@linuxfoundation.org, tfiga@chromium.org, nicolas.dufresne@collabora.com References: <20230622131349.144160-1-benjamin.gaignard@collabora.com> <20230622131349.144160-5-benjamin.gaignard@collabora.com> Content-Language: en-US From: Benjamin Gaignard In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Le 30/06/2023 à 11:51, Hsia-Jun Li a écrit : > > On 6/22/23 21:13, Benjamin Gaignard wrote: >> CAUTION: Email originated externally, do not click links or open >> attachments unless you recognize the sender and know the content is >> safe. >> >> >> After changing bufs arrays to a dynamic allocated array >> VB2_MAX_FRAME doesn't mean anything for videobuf2 core. > > I think make it 64 which is the VB2_MAX_FRAME in Android GKI kernel is > more reasonable. > > It would be hard to iterate the whole array, it would go worse with a > filter. Such iterate may need to go twice because you mix > post-processing buffer and decoding buffer(with MV) in the same array. Here I don't want to change drivers behavior so I keep the same value. If it happens that they need more buffers, like for dynamic resolution change feature for Verisilicon VP9 decoder, case by case patches will be needed. > >> Remove it from the core definitions but keep it for drivers internal >> needs. >> >> Signed-off-by: Benjamin Gaignard >> --- >>   drivers/media/common/videobuf2/videobuf2-core.c | 2 ++ >>   drivers/media/platform/amphion/vdec.c | 1 + >>   .../media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c | 2 ++ >>   drivers/media/platform/qcom/venus/hfi.h | 2 ++ >>   drivers/media/platform/verisilicon/hantro_hw.h | 2 ++ >>   drivers/staging/media/ipu3/ipu3-v4l2.c | 2 ++ >>   include/media/videobuf2-core.h | 1 - >>   include/media/videobuf2-v4l2.h | 4 ---- >>   8 files changed, 11 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/media/common/videobuf2/videobuf2-core.c >> b/drivers/media/common/videobuf2/videobuf2-core.c >> index 86e1e926fa45..899783f67580 100644 >> --- a/drivers/media/common/videobuf2/videobuf2-core.c >> +++ b/drivers/media/common/videobuf2/videobuf2-core.c >> @@ -31,6 +31,8 @@ >> >>   #include >> >> +#define VB2_MAX_FRAME  32 >> + >>   static int debug; >>   module_param(debug, int, 0644); >> >> diff --git a/drivers/media/platform/amphion/vdec.c >> b/drivers/media/platform/amphion/vdec.c >> index 3fa1a74a2e20..b3219f6d17fa 100644 >> --- a/drivers/media/platform/amphion/vdec.c >> +++ b/drivers/media/platform/amphion/vdec.c >> @@ -28,6 +28,7 @@ >> >>   #define VDEC_MIN_BUFFER_CAP            8 >>   #define VDEC_MIN_BUFFER_OUT            8 >> +#define VB2_MAX_FRAME                  32 >> >>   struct vdec_fs_info { >>          char name[8]; >> diff --git >> a/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c >> b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c >> index 6532a69f1fa8..a1e0f24bb91c 100644 >> --- a/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c >> +++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c >> @@ -16,6 +16,8 @@ >>   #include "../vdec_drv_if.h" >>   #include "../vdec_vpu_if.h" >> >> +#define VB2_MAX_FRAME  32 >> + >>   /* reset_frame_context defined in VP9 spec */ >>   #define VP9_RESET_FRAME_CONTEXT_NONE0 0 >>   #define VP9_RESET_FRAME_CONTEXT_NONE1 1 >> diff --git a/drivers/media/platform/qcom/venus/hfi.h >> b/drivers/media/platform/qcom/venus/hfi.h >> index f25d412d6553..bd5ca5a8b945 100644 >> --- a/drivers/media/platform/qcom/venus/hfi.h >> +++ b/drivers/media/platform/qcom/venus/hfi.h >> @@ -10,6 +10,8 @@ >> >>   #include "hfi_helper.h" >> >> +#define VB2_MAX_FRAME                          32 >> + >>   #define VIDC_SESSION_TYPE_VPE                  0 >>   #define VIDC_SESSION_TYPE_ENC                  1 >>   #define VIDC_SESSION_TYPE_DEC                  2 >> diff --git a/drivers/media/platform/verisilicon/hantro_hw.h >> b/drivers/media/platform/verisilicon/hantro_hw.h >> index e83f0c523a30..9e8faf7ba6fb 100644 >> --- a/drivers/media/platform/verisilicon/hantro_hw.h >> +++ b/drivers/media/platform/verisilicon/hantro_hw.h >> @@ -15,6 +15,8 @@ >>   #include >>   #include >> >> +#define VB2_MAX_FRAME  32 >> + >>   #define DEC_8190_ALIGN_MASK    0x07U >> >>   #define MB_DIM                 16 >> diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c >> b/drivers/staging/media/ipu3/ipu3-v4l2.c >> index e530767e80a5..6627b5c2d4d6 100644 >> --- a/drivers/staging/media/ipu3/ipu3-v4l2.c >> +++ b/drivers/staging/media/ipu3/ipu3-v4l2.c >> @@ -10,6 +10,8 @@ >>   #include "ipu3.h" >>   #include "ipu3-dmamap.h" >> >> +#define VB2_MAX_FRAME  32 >> + >>   /******************** v4l2_subdev_ops ********************/ >> >>   #define IPU3_RUNNING_MODE_VIDEO                0 >> diff --git a/include/media/videobuf2-core.h >> b/include/media/videobuf2-core.h >> index 77921cf894ef..080b783d608d 100644 >> --- a/include/media/videobuf2-core.h >> +++ b/include/media/videobuf2-core.h >> @@ -20,7 +20,6 @@ >>   #include >>   #include >> >> -#define VB2_MAX_FRAME  (32) >>   #define VB2_MAX_PLANES (8) >> >>   /** >> diff --git a/include/media/videobuf2-v4l2.h >> b/include/media/videobuf2-v4l2.h >> index 5a845887850b..88a7a565170e 100644 >> --- a/include/media/videobuf2-v4l2.h >> +++ b/include/media/videobuf2-v4l2.h >> @@ -15,10 +15,6 @@ >>   #include >>   #include >> >> -#if VB2_MAX_FRAME != VIDEO_MAX_FRAME >> -#error VB2_MAX_FRAME != VIDEO_MAX_FRAME >> -#endif >> - >>   #if VB2_MAX_PLANES != VIDEO_MAX_PLANES >>   #error VB2_MAX_PLANES != VIDEO_MAX_PLANES >>   #endif >> -- >> 2.39.2 >>