From patchwork Thu Oct 12 11:46:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 13419137 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 15C16C41513 for ; Thu, 12 Oct 2023 11:50:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DQ9p5Q/QjFHD45XrJD3PtvNlpp0c91MviQemvZqfjXY=; b=2aGV10RnVpy8HB vtd0Dgv1oO93bpK8980PY5r1Z2Uh1RnUWe3aXig/zWGGQCb2NdzJe8M/S7omRZFbvfyDulOA19HA0 rHN55Ty1qH+RaM2kaNVIqIKZ5ZrEj1zYnsAL/TRN+P0bFzzFOoU0hOzIYCLzs6sG7JC+FewSuG1CJ Z1kXI9uaftePwQw8oJzbv1CShiXtFxJGwMQE2GFxSgDf9/+9jSVKP1oRH2BHSGRZNdPOZ0Q9BCGUF z6I2JngFDOx3OqARc+NyfSvslLs/yTKcNEKO/B6wlOAyvQmTAVtGRm5V+J0iYzwh29HjcSlJRO/t7 2x+OWfwN5GoygIrp0nvQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qquDG-000rdG-2i; Thu, 12 Oct 2023 11:50:47 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qqu9t-000oJh-30; Thu, 12 Oct 2023 11:47:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=3H7aO0A592LjQ24S0E6A824+PevC9tGJHZ/klkXuv6s=; b=VcGtbBxrlYSP0MutrlKvcVZxzN 4tBYeoD7vtcAQ4jncTUh1OLMjfS1OEzEmkM9KJnO0mNs+RzSnlc/GjzFVFDoDpfjvOHF23TOTHIqS 4v6FVZzQRyn+G4Cxl5lPv5mo99KHVUAs9UChtwd5bjkrCpKsM+PhDzPva+X0sbtgJENsZtF/hADax n+1YAlSDvN2Aoo4FGwyGbcxhm5MJ1LZ9EUoLlERoZfWAUiQzY1ZzzpGitZfexIx5deyDVJgQ9OgzI WsFd53VZsgHTSNWIbpAB8MqSvkz6BpKGlLMCqDMVmOEPqjMlCbIwgMP4hKipLRV+AeAo8egVj8Qxj pp+D68/Q==; Received: from madras.collabora.co.uk ([46.235.227.172]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qqu9g-001nJ8-0P; Thu, 12 Oct 2023 11:47:11 +0000 Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:7ae7:b86d:c19a:877e]) (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 4A4ED6607385; Thu, 12 Oct 2023 12:47:04 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697111224; bh=NSsT5y0sZ7mP+MM3A0B4dMDIfAFW8bmEdwcgMfSAIYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a2ltNEdLuXjdQ/dkYvVFBvKSBS6dV31uotYvl/1pbWi04aQ3fZPw4uqDgC/rfS4PP eJhYvxsq0STkwS3kmVgiYPtZaYSnlAacWoHAKYw5y5FS8rK3NY38P6YHXYB5lNce9t 6h1U57TwT17xSoakkle1mbycjhD4XOMO2fMwjz8WGz/Vf9xP9P39hJFaUr7OxCfkhI 4M3YLu2oOJtmv9lE3R8bu6MICCv0LJhytQjaUu8+9uh2rG8ArUFiEeNGVZhRlDgz6E Roh09VQe6IkaVLnywzEo6lPyzcEGWGyBIkZMFR4ZbIBOHxYOQrQ6qX+gVwMDTtdx7f EFhfwQv9BwY6g== From: Benjamin Gaignard To: 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, Benjamin Gaignard , Rui Miguel Silva , Laurent Pinchart , Martin Kepplinger Subject: [PATCH v11 28/56] media: nxp: Stop direct calls to queue num_buffers field Date: Thu, 12 Oct 2023 13:46:14 +0200 Message-Id: <20231012114642.19040-29-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231012114642.19040-1-benjamin.gaignard@collabora.com> References: <20231012114642.19040-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231012_124708_857673_3EB15C38 X-CRM114-Status: UNSURE ( 9.62 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Use vb2_get_num_buffers() to avoid using queue num_buffers field directly. Signed-off-by: Benjamin Gaignard CC: Rui Miguel Silva CC: Laurent Pinchart CC: Martin Kepplinger --- drivers/media/platform/nxp/imx7-media-csi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c index 15049c6aab37..4c467fb82789 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c @@ -1245,6 +1245,7 @@ static int imx7_csi_video_queue_setup(struct vb2_queue *vq, struct device *alloc_devs[]) { struct imx7_csi *csi = vb2_get_drv_priv(vq); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); struct v4l2_pix_format *pix = &csi->vdev_fmt; unsigned int count = *nbuffers; @@ -1254,14 +1255,14 @@ static int imx7_csi_video_queue_setup(struct vb2_queue *vq, if (*nplanes) { if (*nplanes != 1 || sizes[0] < pix->sizeimage) return -EINVAL; - count += vq->num_buffers; + count += q_num_bufs; } count = min_t(__u32, IMX7_CSI_VIDEO_MEM_LIMIT / pix->sizeimage, count); if (*nplanes) - *nbuffers = (count < vq->num_buffers) ? 0 : - count - vq->num_buffers; + *nbuffers = (count < q_num_bufs) ? 0 : + count - q_num_bufs; else *nbuffers = count;