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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6349CE9A04C for ; Thu, 19 Feb 2026 09:13:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=eHK54JdIRdC4jTfzyCsM8Bh770V0IesgOloqlLe/JDs=; b=VUR8rECGeiG7KtGWvrmhY0y6/r 4Jcjvtw8QPaL6kV6vMGIkSylqfKbPduMWLaI7j971sbYYYaMANo7fmqa9Gw3W/nJt9Y4snf8r/48W hZ/g0InH17PqaZlSPs/LXsw7Me8mcSnJTiomzLN3M29qtrS1g0tlBAFRpACyxjJ6OSMSIdJBJN7Qn kya/OQlOxT033OUP9xACYoPLdFz9yaDnT5tCTReLzia4Lj6/jpOv/mvQIHikTAcWEt7S3Id53pnl3 IUh2i4duIrj72YCK8a3PN/XlxLMTUZcP/dbUyr1eA4Nq22QY9R1Cb5FjUZNG9RoAprIXAVcP0Tn28 B5/mClyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vt05u-0000000B9lR-2HeJ; Thu, 19 Feb 2026 09:13:10 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vt05s-0000000B9ki-0ERp; Thu, 19 Feb 2026 09:13:09 +0000 Received: from killaraus.ideasonboard.com (unknown [83.245.237.175]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 542E2673; Thu, 19 Feb 2026 10:12:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1771492332; bh=HSw2h+PZEBOcIa2i7rTmCujXGFzGYpL5hEUHndKzeRQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=HszjY5/rLUzrykPGKIPj1SgQOmYuEhYgV3T4IEkVnLwJIeAbNYAs4QbThIoAl2BIy U/3Znrgq7n3AvNy2REVaTYa4cAcnBgJaWR3WZjQiIeSiTw98QYl4nyV67sm+VIl2Y3 rqjBLKuZTQObnUI94nmkGXUS79sj/23DLxbFbHww= Date: Thu, 19 Feb 2026 10:13:01 +0100 From: Laurent Pinchart To: michael.riesch@collabora.com Cc: Dan Carpenter , Paul Elder , Mehdi Djait , Mauro Carvalho Chehab , Heiko Stuebner , Sakari Ailus , Hans Verkuil , Bryan O'Donoghue , Collabora Kernel Team , stable@kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] media: rockchip: rkcif: comply with minimum number of buffers requirement Message-ID: <20260219091301.GF520738@killaraus.ideasonboard.com> References: <20260216-rkcif-fixes-v1-0-b16db20b6d68@collabora.com> <20260216-rkcif-fixes-v1-2-b16db20b6d68@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20260216-rkcif-fixes-v1-2-b16db20b6d68@collabora.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260219_011308_242461_AC3DE82C X-CRM114-Status: GOOD ( 19.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Feb 16, 2026 at 02:49:57PM +0100, Michael Riesch via B4 Relay wrote: > From: Michael Riesch > > Each stream requires CIF_REQ_BUFS_MIN=1 buffers to enable streaming. > However, it failed with only one buffer provided. > > Comply with the minimum number of buffers requirement and accept > exactly one buffer. > > Fixes: 501802e2ad51 ("media: rockchip: rkcif: add abstraction for dma blocks") > Cc: stable@kernel.org > Signed-off-by: Michael Riesch > --- > .../media/platform/rockchip/rkcif/rkcif-stream.c | 41 +++++++++++----------- > 1 file changed, 21 insertions(+), 20 deletions(-) > > diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-stream.c b/drivers/media/platform/rockchip/rkcif/rkcif-stream.c > index e00010a91e8b..5a5ab9e7e86e 100644 > --- a/drivers/media/platform/rockchip/rkcif/rkcif-stream.c > +++ b/drivers/media/platform/rockchip/rkcif/rkcif-stream.c > @@ -106,19 +106,6 @@ static int rkcif_stream_init_buffers(struct rkcif_stream *stream) > { > struct v4l2_pix_format_mplane *pix = &stream->pix; > > - stream->buffers[0] = rkcif_stream_pop_buffer(stream); > - if (!stream->buffers[0]) > - goto err_buff_0; > - > - stream->buffers[1] = rkcif_stream_pop_buffer(stream); > - if (!stream->buffers[1]) > - goto err_buff_1; > - > - if (stream->queue_buffer) { > - stream->queue_buffer(stream, 0); > - stream->queue_buffer(stream, 1); > - } > - > stream->dummy.size = pix->num_planes * pix->plane_fmt[0].sizeimage; > stream->dummy.vaddr = > dma_alloc_attrs(stream->rkcif->dev, stream->dummy.size, > @@ -132,16 +119,30 @@ static int rkcif_stream_init_buffers(struct rkcif_stream *stream) > stream->dummy.buffer.buff_addr[i - 1] + > pix->plane_fmt[i - 1].bytesperline * pix->height; > > - return 0; > + stream->buffers[0] = rkcif_stream_pop_buffer(stream); > + if (!stream->buffers[0]) > + goto err_buff_0; Why do you move this after allocation of the dummy buffer, to then add dma_free_attrs() in the err_buff_0 error path ? > > -err_dummy: > - rkcif_stream_return_buffer(stream->buffers[1], VB2_BUF_STATE_QUEUED); > - stream->buffers[1] = NULL; > + stream->buffers[1] = rkcif_stream_pop_buffer(stream); > + if (!stream->buffers[1]) { > + stream->buffers[stream->frame_phase] = &stream->dummy.buffer; > + stream->buffers[stream->frame_phase]->is_dummy = true; > + } > + > + if (stream->queue_buffer) { > + stream->queue_buffer(stream, 0); > + stream->queue_buffer(stream, 1); > + } > + > + return 0; > > -err_buff_1: > - rkcif_stream_return_buffer(stream->buffers[0], VB2_BUF_STATE_QUEUED); > - stream->buffers[0] = NULL; > err_buff_0: > + dma_free_attrs(stream->rkcif->dev, stream->dummy.size, > + stream->dummy.vaddr, > + stream->dummy.buffer.buff_addr[0], > + DMA_ATTR_NO_KERNEL_MAPPING); > + stream->dummy.vaddr = NULL; > +err_dummy: > return -EINVAL; You can drop the err_dummy label and return -EINVAL directly. Except you should probably return -ENOMEM as the failure comes from dma_alloc_attrs(). > } > -- Regards, Laurent Pinchart