From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4405C199CA for ; Thu, 9 Nov 2023 11:18:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="LFpzg58q" Received: from [100.116.125.19] (cola.collaboradmins.com [195.201.22.229]) (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: andrzej.p) by madras.collabora.co.uk (Postfix) with ESMTPSA id 4C5E86607421; Thu, 9 Nov 2023 11:18:02 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1699528684; bh=I504Z+CG3YiZx4Vj5jJplJQXnwlNFB6qyZMvx/v7OwQ=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=LFpzg58qWNb9jJefSQAPJdRVV60nbfvp7R2wUIzcSIW2N9QkRCLFmKRwfrDgu8Alg 4W3q4maR60goIRKz1R9N53+n+g9fjlA4VtdRllKHxdLnpqywQtaROhkG13EPGidoqB qDdL823VyFRpt7hNMzrpQQohW5EbNL1yYp868/cq75IGLDjkgBKloPw1BSC3ZxPMcy UbnQRRIG+ax5xnlMokeOMPk/F7aispaGNIRmMwcOtuyFV8W3Al+k7TeZ/OR9II0HWJ h7WSGoINBSqOTR7wId9VmZnEu2Ul/GxA5TqnW0fHMr0NYdHnUL2Qkkd0TOVO0Apd/a K0BWxOR+w8cGQ== Message-ID: <20023047-775a-4bd3-8bdb-932347e91c66@collabora.com> Date: Thu, 9 Nov 2023 12:17:58 +0100 Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v14 32/56] media: meson: vdec: Stop direct calls to queue num_buffers field Content-Language: en-US To: Benjamin Gaignard , mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, ming.qian@nxp.com, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, hverkuil-cisco@xs4all.nl, nicolas.dufresne@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, kernel@collabora.com, Neil Armstrong References: <20231031163104.112469-1-benjamin.gaignard@collabora.com> <20231031163104.112469-33-benjamin.gaignard@collabora.com> From: Andrzej Pietrasiewicz In-Reply-To: <20231031163104.112469-33-benjamin.gaignard@collabora.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit W dniu 31.10.2023 o 17:30, Benjamin Gaignard pisze: > Use vb2_get_num_buffers() to avoid using queue num_buffers field directly. > This allows us to change how the number of buffers is computed in the > future. > > Signed-off-by: Benjamin Gaignard Reviewed-by: Andrzej Pietrasiewicz > CC: Neil Armstrong > --- > drivers/staging/media/meson/vdec/vdec.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c > index 219185aaa588..1e2369f104c8 100644 > --- a/drivers/staging/media/meson/vdec/vdec.c > +++ b/drivers/staging/media/meson/vdec/vdec.c > @@ -167,22 +167,23 @@ static void process_num_buffers(struct vb2_queue *q, > bool is_reqbufs) > { > const struct amvdec_format *fmt_out = sess->fmt_out; > - unsigned int buffers_total = q->num_buffers + *num_buffers; > + unsigned int q_num_bufs = vb2_get_num_buffers(q); > + unsigned int buffers_total = q_num_bufs + *num_buffers; > u32 min_buf_capture = v4l2_ctrl_g_ctrl(sess->ctrl_min_buf_capture); > > - if (q->num_buffers + *num_buffers < min_buf_capture) > - *num_buffers = min_buf_capture - q->num_buffers; > + if (q_num_bufs + *num_buffers < min_buf_capture) > + *num_buffers = min_buf_capture - q_num_bufs; > if (is_reqbufs && buffers_total < fmt_out->min_buffers) > - *num_buffers = fmt_out->min_buffers - q->num_buffers; > + *num_buffers = fmt_out->min_buffers - q_num_bufs; > if (buffers_total > fmt_out->max_buffers) > - *num_buffers = fmt_out->max_buffers - q->num_buffers; > + *num_buffers = fmt_out->max_buffers - q_num_bufs; > > /* We need to program the complete CAPTURE buffer list > * in registers during start_streaming, and the firmwares > * are free to choose any of them to write frames to. As such, > * we need all of them to be queued into the driver > */ > - sess->num_dst_bufs = q->num_buffers + *num_buffers; > + sess->num_dst_bufs = q_num_bufs + *num_buffers; > q->min_buffers_needed = max(fmt_out->min_buffers, sess->num_dst_bufs); > } >