From patchwork Thu Sep 14 13:33:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 139604 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp364922vqi; Thu, 14 Sep 2023 06:56:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDkATZ8RO995zwrVIN2iNJuWabkXJcwuTMpqIUug7wC7G7mFHtx51oVlPlxUOu18Ib2wmn X-Received: by 2002:aa7:88c8:0:b0:68e:3f55:73d with SMTP id k8-20020aa788c8000000b0068e3f55073dmr7165520pff.10.1694699776329; Thu, 14 Sep 2023 06:56:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694699776; cv=none; d=google.com; s=arc-20160816; b=eMSNEA1WiibPR/Fo0nHzNbCJdrrcP1ip2VPAhDXq4Mt7kjILjhUXwFoQ8Q67jF/VlP lUPnfp1cHlW1UTdO6Srm94430ark/tjKl07IPo2kb1NeSU6JLWqU/WhTwSaCqJpYriwZ bUzGFETHMnsPzE1rkBg4Dl8qCXWDJl8sNzcY/Wqz/P7IY+mydRhUDeImdc3DoIIlwTZ0 TDW7aDYBS8y5dP7Ufah/C0ZI0n4M2LZvkkcSKVKzbpmN7dT1Lldatwc/IDlXZ8ZaX0Mt Jiu034Kk65OeBmnf8culbvrAb9rMJpcDWRa/XsRrAg/mcBe8g3vq0c2Orh5D1S7jQcl/ py9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EOLwZeOQyt9Z2OpMXoM+CKH/9zJiFeP4flDrP3qjOLw=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=QzAeFrm3jUlqrjxA48D8rVMg23iFU1F5TVGV5zESo0ihnnGid+dnj7ev+XbCpO2GK5 TBg3jibGi2GWAgG3CVcLxnoIAViJ98uI1J2/6XqXzFWVilrl8yaZcmqXYaWdYfmO6+MQ +tzZ+vyXfK1xCtcTmMrhzSbuznSCA0NfJHN6Sasrr8qitN/WH9d1MRN6eimev7HLBNcW /ZkygZB2QVOBxWxORZNz+TuChV6WcBXt4mAeQnE/fIKfHLQDfe4pn2R7gPXPTHzGHG2o NVKU3Tw8GZc/FhphEOJKBAJRlGu0x1/X08VdwZ83fVA4p3kiDm9jpF03Ggavv6Ex6ljA 6aNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=nsLr5+8m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id p16-20020a056a000b5000b0068a55b8e380si1738308pfo.230.2023.09.14.06.56.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 06:56:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=nsLr5+8m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 01D3888D6A05; Thu, 14 Sep 2023 06:35:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239307AbjINNfB (ORCPT + 35 others); Thu, 14 Sep 2023 09:35:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239475AbjINNeM (ORCPT ); Thu, 14 Sep 2023 09:34:12 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FD532689; Thu, 14 Sep 2023 06:33:49 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:36f2:37bd:ccbb:373f]) (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 D66786607383; Thu, 14 Sep 2023 14:33:47 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694698428; bh=NPGIQWBbvKHkPrDtzyz0rTHCYJ8HXTuAbKhvtuCEFls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nsLr5+8mLvfOrgpNrxeRPFIZBpS7RDRjBEkq2keyOtri/Y8m9Doex7VZ08sCyT4AS uvsYBd/LNNaNa9EPqNFUhrdzadnCHcDCg3IbX2B1H3WguvsspTanWkkz4ISydPd6CK d6EdGU0B6m+RJd1TeOpfeIP1Hmm2K55LkjG1rYXZIpIG4SP765J3hsLDdCll8bzCJK BGhgRsPlI0FHlHuTn9EWaOD4Z9WZAwhXeHS5cLhEtQbwIVuLxKvubCRxJqOnHsJmS6 Li5AvmHOLLYsA/qf9VW7iszfL3vITXQdk+V/QKvqbo6oyyPqGrY4WVZv5AsmJbzFHZ Vdbln3Or/evjA== 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 Subject: [PATCH v7 32/49] media: renesas: Stop direct calls to queue num_buffers field Date: Thu, 14 Sep 2023 15:33:06 +0200 Message-Id: <20230914133323.198857-33-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230914133323.198857-1-benjamin.gaignard@collabora.com> References: <20230914133323.198857-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 14 Sep 2023 06:35:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777021512445951386 X-GMAIL-MSGID: 1777021512445951386 Use vb2_get_num_buffers() to avoid using queue num_buffer field directly. Signed-off-by: Benjamin Gaignard --- drivers/media/platform/renesas/rcar_drif.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/renesas/rcar_drif.c b/drivers/media/platform/renesas/rcar_drif.c index 163a4ba61c17..020845689ed3 100644 --- a/drivers/media/platform/renesas/rcar_drif.c +++ b/drivers/media/platform/renesas/rcar_drif.c @@ -424,10 +424,11 @@ static int rcar_drif_queue_setup(struct vb2_queue *vq, unsigned int sizes[], struct device *alloc_devs[]) { struct rcar_drif_sdr *sdr = vb2_get_drv_priv(vq); + unsigned int q_num_buffers = vb2_get_num_buffers(vq); /* Need at least 16 buffers */ - if (vq->num_buffers + *num_buffers < 16) - *num_buffers = 16 - vq->num_buffers; + if (q_num_buffers + *num_buffers < 16) + *num_buffers = 16 - q_num_buffers; *num_planes = 1; sizes[0] = PAGE_ALIGN(sdr->fmt->buffersize);