From patchwork Tue Oct 17 14:47:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 154367 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4224778vqb; Tue, 17 Oct 2023 08:44:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNImMSV0HUn1HeNFt3gKmU3nRCljIF0zlFgtdtrqCTDj5S9Ob5KW8H5UsTwyr+qtuuGHOs X-Received: by 2002:a05:6359:7041:b0:166:d98f:89b with SMTP id ua1-20020a056359704100b00166d98f089bmr2633879rwb.1.1697557459114; Tue, 17 Oct 2023 08:44:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697557459; cv=none; d=google.com; s=arc-20160816; b=ynhdRpKLk2bPpRqI4UBoM53DcD/aKeSqmxLOo47NYYAs+JxMU8JR2rcLBn0R0kusWZ cnKgwM7TVl9dFxfy9LxLuS587BUl0Q4OBZrt1quU4F0J/VwfzQ3uROeaVZ1Bke45a/+/ mOnX2yKIJInvEWrpXGdOmZhOn1CEouYcJiWWOe3iwHIe5S42wHsOJATuoa+14/eZhoWb b7IEXqRQQSFAsBVYgTxd3TVHbHxsr8OX4dLcHHr2gWUm58/5go+bj0FtGPrkXEV/d1R/ dyxPGjHc4INpRw06Y0Nq4Bgu6ETrZg+H8IWPn2JDFYo7USEjxeEi2EArVIV3JRCsc2vR uo5Q== 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=9ilPvtEnUL69w5rR7RXUzxNBn6AmWm95qKJTNwVlds8=; fh=px7ZZE7zN+iLImfXStSrbDHf67f84nNBK9ImQdNvxt4=; b=dfJPoBF+ICmgHqoQcUF7ueYHpAQoaLWpreOxiZ/ypS7gnufTABjoZmFccKzoEOKKoz 942nxoN1rLzTtJeJd3odXRkui6iH82As+0vgli6odpI6Dy+DOd+p3uuqdaCUQxDfiWsj fmKU+wOOVTq1JRiLPLCcIvlk6+2N5rdAEkAXk0HwN11T9R6TwbfVEEbDnF3s6km/Mu3B A/IMCxaqJmu2qptaVbz/macP8ZNd80RDWZZwkMKD4GpagOPS3ED/mQZwR2FzIUeBlYQM p0BbMFarnWkJqIj6U3S/lF6uaTfaTfbwGjDB7SY7ofDohVqf64oAcqBm4qStjCFZN/J6 4VMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="AD/Pl8C5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id o3-20020a056a0015c300b006b618af5cd5si1976547pfu.300.2023.10.17.08.44.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 08:44:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="AD/Pl8C5"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 391888025411; Tue, 17 Oct 2023 08:44:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344124AbjJQPn4 (ORCPT + 20 others); Tue, 17 Oct 2023 11:43:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344318AbjJQOsb (ORCPT ); Tue, 17 Oct 2023 10:48:31 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0C5A1AD; Tue, 17 Oct 2023 07:48:24 -0700 (PDT) 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 CC2E86607367; Tue, 17 Oct 2023 15:48:22 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697554103; bh=4+G+ZvYPKr/Dnh+XVk1Qk/BAjD/ZzHkZphjgv/jA4CU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AD/Pl8C5XYpEYERlgScQlBCeYSobkd5BQbAx7O/zBNm9vOOVh4ql2NVYhazOis4fi oofj0PqV/hBXs/rhcY3TugHdtx5VlDxdTYTcnsWBwhduTmp/xLyboinAYgrSv9CGdQ 6hWThQ6Ow3+K2kp6LL2yYe8sb42RTDMHcVnO07AB8f11XiMx3lQszkv/d0MyN7tuwv D9TVanqFRnZcw4iWCzRW9gyKqXfikhbyXzYOetatzq5V28fQkA/Oxiq8qTgT1MJY9k yUUtk9BTqrUm+hbZYSk7+2iTxNNytrXOtLo4NOTlU/olasrzFvtQ+MKOJe8CQIsxT0 0LDvVwkLCCg/Q== 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 , Fabrizio Castro Subject: [PATCH v12 37/56] media: renesas: Stop direct calls to queue num_buffers field Date: Tue, 17 Oct 2023 16:47:37 +0200 Message-Id: <20231017144756.34719-38-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-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Tue, 17 Oct 2023 08:44:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780018010559448218 X-GMAIL-MSGID: 1780018010559448218 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 CC: Fabrizio Castro --- 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 292c5bf9e50c..f21d05054341 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_bufs = 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_bufs + *num_buffers < 16) + *num_buffers = 16 - q_num_bufs; *num_planes = 1; sizes[0] = PAGE_ALIGN(sdr->fmt->buffersize);