From patchwork Tue Oct 17 14:47:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 13425405 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 403BFC41513 for ; Tue, 17 Oct 2023 14:50:21 +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=+o+Dm3WCUCsJfe1uUgiCWD3WvlXEsPccr6K9tnGXOqs=; b=rP5nKQhAJpDY14 YdynorZtkibQjo9JqETbcZiNPqRm3Mty9zm1uL0jBTIgWkBZDnt7i6OV025Bvd5dY1NOlBaJa12ZY cYB/bZ9gBrCrmmq7uAIVmUofp/Z951eVQqLNw1h220FFoQ7UbnT0BtMajVHRkbarGgyIuVMBxpWgd Yy3b9ysGjFvQw8BOmmdBodCZyxbtLWSz5VQGEQFKwvrsUWXOgCj6Sj+cEE2BF4Nn8GNj01I4xco6f mQXtNO/dc+/hrYwgDytMOgq24kRKfJNXZv2ldN+4mC22JrnTSK49wNd+TK4GFU4UHuKFch6tHb1tb W/4BRvWuYEgoeaIgA8rw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qslOg-00CasZ-2m; Tue, 17 Oct 2023 14:50:14 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qslMj-00CYu2-2s; Tue, 17 Oct 2023 14:48:18 +0000 Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:7205:da49:a7e8:59f8]) (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 164906607359; Tue, 17 Oct 2023 15:48:12 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697554092; bh=vK+TMJznRBSWjc0ShVXFJZhaWsv2b7OPcb28GLqTu0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QqaQsRK+UlCvxbpWzbSKC+l2JRvjkT5F0JSdWyi/7YsfBn/CJQVoMOpW9CynbdPif sqjrsNj0NDFRdfpHlKdilRyt1j1dwa478TNZJbdZFa7+U6QMEfhCNv/BkOWo/A8G98 S0RRA/1TRwH0+kespELs+jCeNQQCyEUPgETWP+yzZ5VsWXM/trD7XsHbNORqpWaUhB fr15V0QPMcTaFlpSfe+PocHDX3mV80CbrjeTxaWVgh/+sNlG0T/dzQA99db9e9MstM 4JMYo8bxoKF6FMvDSramPE9BQoMLCe6hDlsgcZzNBBaQ7KgfPgxk77xSWlaW+Yt0dY RkS3dQnqWBuJQ== 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 , Hans de Goede , Sakari Ailus Subject: [PATCH v12 17/56] media: atomisp: Stop direct calls to queue num_buffers field Date: Tue, 17 Oct 2023 16:47:17 +0200 Message-Id: <20231017144756.34719-18-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017144756.34719-1-benjamin.gaignard@collabora.com> References: <20231017144756.34719-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-20231017_074814_085190_2421703F X-CRM114-Status: GOOD ( 10.94 ) 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. This allows us to change how the number of buffers is computed in the futur. Signed-off-by: Benjamin Gaignard Reviewed-by: Hans de Goede CC: Sakari Ailus --- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c index a8a964b2f1a8..09c0091b920f 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_ioctl.c +++ b/drivers/staging/media/atomisp/pci/atomisp_ioctl.c @@ -1028,7 +1028,7 @@ static int atomisp_qbuf_wrapper(struct file *file, void *fh, struct v4l2_buffer struct atomisp_device *isp = video_get_drvdata(vdev); struct atomisp_video_pipe *pipe = atomisp_to_video_pipe(vdev); - if (buf->index >= vdev->queue->num_buffers) + if (buf->index >= vb2_get_num_buffers(vdev->queue)) return -EINVAL; if (buf->reserved2 & ATOMISP_BUFFER_HAS_PER_FRAME_SETTING) {