From patchwork Tue Feb 6 08:02:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 197240 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1387478dyb; Tue, 6 Feb 2024 00:04:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IG69rgy9IkKUaG9JzKvdEfx7E7vSRC9CxECE8nNa6CInk5US/VKMTx8PjUGDZxZC44PHNy2 X-Received: by 2002:a05:6122:2194:b0:4c0:292d:193c with SMTP id j20-20020a056122219400b004c0292d193cmr1974161vkd.12.1707206650226; Tue, 06 Feb 2024 00:04:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707206650; cv=pass; d=google.com; s=arc-20160816; b=HkwnWZVE58SE6TKkDdoYmRYn5xAk7+3aQ4xMe3pg+9kw8ex3SRRF+EK9hIEIaymbm8 JnnDiUfPdBBBdykJ7gevxrdKtXFeUawDYwnZhQdu9+zpew+Chrq5rIlY/txb9xhplgO6 BPNlBfZSKy6WF9QEfGsobMnp8jMW7nntbvyJ3KrDLiP0jJ4Tln0PfQsOjGq9H73+teoG U1UonaI1qRRs3U22gpf5giiZKzS7b+tQQnTXjpKRKtvEtxdQYNUbOiI5frZ/vGwxuk1h I+QUqyLhCfyTtXTtiICIt/xHdiHWwgpT4dKc+cOxQC9ZQHkVHkNihbmBD3RtRg1nkRTt 44Gw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=hU+42YMwPJJ0l/S2v/Ojw0WaAKKoj+rFoFJf35lO9RU=; fh=3xi0gMs/xcNZkjoWOKaP4IA1lQ5ct+Pt3vjVIWLZVro=; b=Q7WuoOohl/M5kl0XLCpo29DALir0qBwwQ5zu4/vcpzR+SUH3P29Tupr6c6AbdEjwbb c5d+psnieAgR24wfRn4yV5x9i4nn/O+/pUx//C5JvkNnsOGDfeiE9FuhZdwIsDxozV5w JJvw6sfttLG4WxZe4y+DXIRLd7hpOLZdofDW2XBDGjAQ8BKuBJujCca2tLW5S8K5e56j FcTqVAMELJUa2n+fIpOdgb1lr/ufzCFGKgGR5mWMJQHuSyQX77NJzHjKbDCDa7UeNCOP C7TcXnnflXAqcAUU2fohqdPIvjV+OdJS14foEcuolxoFIcPe0vsm+DtorYW6p3NdYgaR bvJg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=HSJ+Ip0w; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-54459-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54459-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com X-Forwarded-Encrypted: i=1; AJvYcCUWDoA3QGdz8gbJ8n8MTBmmjCxh8nnbE9uyT+zL6e2zVM4WeVlK8l9Q5PcCucHliADSnh8xmyRAsub3sTxcdkYYVjVybQ== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id k1-20020a0cfa41000000b0067a8bf10affsi1777293qvo.220.2024.02.06.00.04.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 00:04:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54459-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=HSJ+Ip0w; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-54459-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54459-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 09B611C2370D for ; Tue, 6 Feb 2024 08:04:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 13AC812C80D; Tue, 6 Feb 2024 08:02:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="HSJ+Ip0w" Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (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 57BBD12A159; Tue, 6 Feb 2024 08:02:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707206555; cv=none; b=rYBpegD4Rw/8mNcUGxzESjzNuXniQ5pro7qfLTIlZ+s/P6GFUBxRz+eoCTuorKVaCI2BP7xqxNZW3w03dT3tvKfNuXRte4wI/efyPWWXZKgT4Ph6VOEuUD6uuqt5Ns7VGNqa18xUKEgC2JUpbbvR0kAlRV+n90JgbRh9S/WYNq8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707206555; c=relaxed/simple; bh=qivh6TydDKfcZbVPYc7spMw2cRqVCzEb9YVNhr43HUY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZK2xGS+2hH+DVG0YNt1rdpyB36gjrOkc94tiOaGnZim7od/2VKDZpgF3KTPmHb2iMNMhO/3kSR6kqCEcWgtgeBmODuNDtLXnbL9dKfbeIi4NyAARGvGNRF7e77c193MK7I9XDFNjU6fxfe7YLPTTujJnd5I/46hTC9mLlShYwtg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=HSJ+Ip0w; arc=none smtp.client-ip=46.235.227.194 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1707206547; bh=qivh6TydDKfcZbVPYc7spMw2cRqVCzEb9YVNhr43HUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HSJ+Ip0wnif15x1TS1JFO1HQlTerrdbXJxROlF4qMpi03mQWSgJt9Y7ESvK68OjhT BYrNlMujMm/8qyU94NaT37ocW9/flsodnflK2nJsM3VBDEUgGirT53ZQ6IlgptK3Rl RBcjg8p+tf0Hyv8rTHMKjq+CpPMm1J6GC9jIA2NjxBM6lhnbRC8i5CGSAmivR7TgDr W6chRb5VoYw7d93cCHzLaFAbTXZR5x8lVbBCuTRPVqOxwWjFnUjcmv8ILXpEI0yiJk pKCf/f+dbsovpucP3qm8UlDG3bsF5tuziTjDx7JzRuf9aeW84HNURGvWfg7CkM8ipW uevS0aHd3F5Rg== Received: from benjamin-XPS-13-9310.. (cola.collaboradmins.com [195.201.22.229]) (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 madrid.collaboradmins.com (Postfix) with ESMTPSA id C9BDD3782072; Tue, 6 Feb 2024 08:02:26 +0000 (UTC) From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v19 3/9] media: test-drivers: Set REQBUFS minimum number of buffers Date: Tue, 6 Feb 2024 09:02:13 +0100 Message-Id: <20240206080219.11951-4-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240206080219.11951-1-benjamin.gaignard@collabora.com> References: <20240206080219.11951-1-benjamin.gaignard@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790135920606699796 X-GMAIL-MSGID: 1790135920606699796 Instead of using 'min_queued_buffers' field to specify the minimum number of buffers to be allocated when calling REQBUF use 'min_reqbufs_allocation' field which is dedicated to this purpose. While at it rename vivid_create_queue() parameter. Signed-off-by: Benjamin Gaignard --- drivers/media/test-drivers/vimc/vimc-capture.c | 2 +- drivers/media/test-drivers/vivid/vivid-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/test-drivers/vimc/vimc-capture.c b/drivers/media/test-drivers/vimc/vimc-capture.c index 2a2d19d23bab..97693561f1e4 100644 --- a/drivers/media/test-drivers/vimc/vimc-capture.c +++ b/drivers/media/test-drivers/vimc/vimc-capture.c @@ -432,7 +432,7 @@ static struct vimc_ent_device *vimc_capture_add(struct vimc_device *vimc, q->mem_ops = vimc_allocator == VIMC_ALLOCATOR_DMA_CONTIG ? &vb2_dma_contig_memops : &vb2_vmalloc_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_queued_buffers = 2; + q->min_reqbufs_allocation = 2; q->lock = &vcapture->lock; q->dev = v4l2_dev->dev; diff --git a/drivers/media/test-drivers/vivid/vivid-core.c b/drivers/media/test-drivers/vivid/vivid-core.c index 159c72cbb5bf..11b8520d9f57 100644 --- a/drivers/media/test-drivers/vivid/vivid-core.c +++ b/drivers/media/test-drivers/vivid/vivid-core.c @@ -861,7 +861,7 @@ static const struct media_device_ops vivid_media_ops = { static int vivid_create_queue(struct vivid_dev *dev, struct vb2_queue *q, u32 buf_type, - unsigned int min_queued_buffers, + unsigned int min_reqbufs_allocation, const struct vb2_ops *ops) { if (buf_type == V4L2_BUF_TYPE_VIDEO_CAPTURE && dev->multiplanar) @@ -898,7 +898,7 @@ static int vivid_create_queue(struct vivid_dev *dev, q->mem_ops = allocators[dev->inst] == 1 ? &vb2_dma_contig_memops : &vb2_vmalloc_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_queued_buffers = supports_requests[dev->inst] ? 0 : min_queued_buffers; + q->min_reqbufs_allocation = min_reqbufs_allocation; q->lock = &dev->mutex; q->dev = dev->v4l2_dev.dev; q->supports_requests = supports_requests[dev->inst];