Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   Ming Qian <ming.qian@nxp.com>
To:     mchehab@kernel.org, shawnguo@kernel.org, hverkuil-cisco@xs4all.nl
Cc:     robh+dt@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de,
        festevam@gmail.com, linux-imx@nxp.com, linux-media@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] media: amphion: ensure the buffer count is not less than min_buffer
Date:   Wed, 27 Apr 2022 16:59:42 +0800
Message-Id: <20220427085942.18159-1-ming.qian@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1MzNgUKwQuSOFKfBkoQHEMApGE4XcccS62C83/fW3iR1zO//venY8d8HkFXj?=
 =?us-ascii?Q?t/XivbwPrG5kM9STApzPW3KaI69ZxAAr3NvaO65AnKeaF0eoFWLT3oiRpK7z?=
 =?us-ascii?Q?FIytw2V0JIvXnQ7lQe+ZEbKiqZVtySDQa2RREvMKYgC3lsbVx/f1yvNgDQFW?=
 =?us-ascii?Q?JBBT43FOVybzvLNQGEEJe85w1Um7qOpbX9OUG9kOB1bKmLHMOyMiDREpLPf4?=
 =?us-ascii?Q?x+EULAzBjurM56dOiX8gZ4Ikx5P8HBo0G039YcsAM0fwij85SCzLs3WH/XUo?=
 =?us-ascii?Q?CV/aZGjvRWICY8V1EXGqASmW/yTU/H/cfebWhdgRy/zYNxC8xfm+DNKDkRH+?=
 =?us-ascii?Q?Vy/eFr87jlWP7IR5lVtkf3zaVT/DyAokYKRR1PdrwxsAP1JTpM2fq1kd51i9?=
 =?us-ascii?Q?pMWnGF/5f3swfGN+4Oj+WIe9ykf4g0mp3+8vnx92LDDBW1k2lL/zmR9inky/?=
 =?us-ascii?Q?BmPqQotGB+C/6LsPhpgsjAVAWWm7jExSJWjuBl0hxvqPVskVHUd/9hLMjcow?=
 =?us-ascii?Q?PHRwfvNyn4lcviDsKp3NgSOGgKU9OyRcr0oI7+uKt3N+NL4LP8TQ8TrpLORC?=
 =?us-ascii?Q?yalHMtYHPEKx3uGJTSBdtXCWamklJFmqzQaQqvc930AoYjgZlRUCyuolnrlz?=
 =?us-ascii?Q?6h0ahaWS5iHu0hcb85TN61LQSI2xMp271gw1KxsLkk7A0W8jc3T8yQ3xeO/6?=
 =?us-ascii?Q?riM7LbeRx4adDusDEUlKuyRpth40f+yZIL4VjjWSDrd1MLhuc3Fbk0kLkjLx?=
 =?us-ascii?Q?R4GhMHicrADEw44I0JsIBZ9knF1fRG7uhJt0vltKe6Ybksnw3AVPI3+BBb41?=
 =?us-ascii?Q?6A4glnm+5z19roDK5uK2gpvFuan6NHbiMfVuOn7H9cdM1YVWv0P98ZEneFf4?=
 =?us-ascii?Q?o30SAgdxFPwgPaRnUUXYSIQAr2F/8mLZcWTVdKTDVvNY1TnE7JfE+KV0deZ6?=
 =?us-ascii?Q?nqZnkcHaI8Chl8CvDheOI6/uUijrEIGyPedaX6CrxXeQsAyqtUZvoEkOJ/AC?=
 =?us-ascii?Q?xe50HQOF4ht8M1iLgqruoQrWcKzltPP0TFi2apySw/SPvjB4g/VE56LMBooZ?=
 =?us-ascii?Q?J8tVbn9VtMJXW3lQvOlumgH8HtwPFRbZgzRjnO/BB++s3mt1d662QPo8lrZi?=
 =?us-ascii?Q?LqlONYSNLuNiCzCs0cxCcZtZRuGkd3KI3HHk3JHNu5N4JliDJPR/rB2nC/4z?=
 =?us-ascii?Q?wDlgmtxKVJQgx+PAZKj8i7VTx0zCWwR2l8QV3D/GHd1/M7Y481D7X+LD6Z3d?=
 =?us-ascii?Q?6q6ZOmKnG72248/AFOloaKG1HzcQyGXAwGcu7uhhAJxyEbkm98uHmXS2lu5b?=
 =?us-ascii?Q?auuh4/AzFq8bpiw5TnFLXIIOlPGu9G6FCNNdgEMoSV6Bo2AdOVNPlhH2v9Ja?=
 =?us-ascii?Q?Zqx0AE1sBl7mtBeWtLXBdwr/z9GfNlcndG2paxmjXxQ71Ab7idmHU24/ED4B?=
 =?us-ascii?Q?RVW33jP1VdsAx6YFjodTxoPSAydrWA6Juluw33skg+RTOtNEe3SUbs9eM6ZV?=
 =?us-ascii?Q?6/wX5NJtRjwWYGhcgDpbMjYmDM/nPrlSbxJWVa7T1Pi5BM1CvZIZYJxrCdE9?=
 =?us-ascii?Q?wgZO47iQa8zgADwKw7SS/i0iswbdKJ+EcdMbd2MjwYdRywyvOsdOYG/Cb0L2?=
 =?us-ascii?Q?VmLpjRc4h8PyJjEfAo+85KJHbt17JzK2W5QmIBxJv1H48qBICUMK/DneQe3/?=
 =?us-ascii?Q?4TB4bQhhy13GzM23D/C9qGGFQQyBRYZ5EHdD9l7fpjGnStXXPrVxyJM86SiO?=
 =?us-ascii?Q?varZ8QApKA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 49babb03-e5bf-41d1-6919-08da282c4d55
X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6341.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2022 08:59:57.0586
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: pAviPkJZH05wwXlHIzGri1PE0hjkQOYIZ/2B4P4UVBXWaJRUGTLQNw6PI2wsa0QGSH0W4lS4ihwPTEwPCEvbMg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3786
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE autolearn=no
	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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

the output buffer count should >= min_buffer_out
the capture buffer count should >= min_buffer_cap

Signed-off-by: Ming Qian <ming.qian@nxp.com>
---
v2
- don't mess up the VIDIOC_CREATE_BUFS ioctl

 drivers/media/platform/amphion/vpu_v4l2.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/amphion/vpu_v4l2.c
index 9c0704cd5766..0d25ba3afbf6 100644
--- a/drivers/media/platform/amphion/vpu_v4l2.c
+++ b/drivers/media/platform/amphion/vpu_v4l2.c
@@ -340,8 +340,12 @@ static int vpu_vb2_queue_setup(struct vb2_queue *vq,
 				return -EINVAL;
 		}
 		return 0;
+	} else {
+		if (V4L2_TYPE_IS_OUTPUT(vq->type))
+			*buf_count = max_t(unsigned int, *buf_count, inst->min_buffer_out);
+		else
+			*buf_count = max_t(unsigned int, *buf_count, inst->min_buffer_cap);
 	}
-
 	*plane_count = cur_fmt->num_planes;
 	for (i = 0; i < cur_fmt->num_planes; i++)
 		psize[i] = cur_fmt->sizeimage[i];
-- 
2.36.0