From patchwork Mon Nov 27 16:54:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3285611vqx; Mon, 27 Nov 2023 08:55:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IG+5Wbl/J3Vg4Q4tTk1Mkn6tIPg9mUjmW5jZrIgia2SeH7FEYyel6tfPWoy5tkN26vHJHJt X-Received: by 2002:a17:90b:3907:b0:26b:4a9e:3c7e with SMTP id ob7-20020a17090b390700b0026b4a9e3c7emr13626211pjb.4.1701104115277; Mon, 27 Nov 2023 08:55:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104115; cv=none; d=google.com; s=arc-20160816; b=vysHnGteKpDqBrT2CIA6smSimkt4MCdU6KAIYuz0M2wEGZtEr+27Q/gJatyzpKEMmb eIAW3wj5aQX6/kqu6pwXhRBUXcaDRc2F7jIazJRHMPw5BHGFM4qHdfPMNw96m+wrXfB5 c/vWpKQMlAn9TdEMpTHikMMSseJDHzneR9HKOouLDZEoDHuZYrx1WS03fDohdBl7vEEi ApSSHfepGpI81OsMxIFRidCj3U5jod9VF8J3TqEffuM+C2F4ApxzDKtW9JkkWSg01ZCk F9sWszV6bZlIy87k9/g7i5tPXsRbvZOCG0aKHQugWuY0V7fFNB0ePgv+9vFitRkZ1IrT XzFg== 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=0yiQpzibG095Fq2flSkJZvi5vIisv0vS0LGTbWEzw6g=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=Bjn5R1JFEixnqLMAMvSK+IO3zrxvIeroVsqrRMLykIMGgYjtHTQJhH4j9F4YvobrWv C5bv7/zdTCYzeP9clMPrQtpDiHMU+224/GPRnbQ+cQ0AMmSYYNJ4ZxBf+r4CTiQi2w9X pAe/stadRvD6U6EqSN5Ya1tt0ILQf5TeawN2z+1i4e/5gSUkNijJsE37b6i9As4Em1bK ST8cXx/XIS58LfqsDyR1vPS2A32B7h7ZQlzN5xAu9eBXvRi8L4Y3V3yJmnHriN9U/EFl e1EWKb8ejldrzaRU70DvKsf7n35aocwzRj8ivjrl9h7hIGkNuA0TyWMDbOBtXIFDBe7z GDxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=mZH1E01j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id o17-20020a17090aac1100b00285a62cc148si5431865pjq.134.2023.11.27.08.55.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:55:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=mZH1E01j; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 0E0CF806A12E; Mon, 27 Nov 2023 08:55:14 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234167AbjK0QzD (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233612AbjK0QzB (ORCPT ); Mon, 27 Nov 2023 11:55:01 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60DBE19D; Mon, 27 Nov 2023 08:55:07 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 7F2CC66022D7; Mon, 27 Nov 2023 16:55:05 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104106; bh=7RGpb9eXUi6lQdxW/1vzQwvC1+GPAwIhQ8xVVzZPHxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mZH1E01jZ/S5Hq899zWgoDmRG3t+rsfwswbnQ3j9cmRv8JM0v38MqPuPY5/2B40iD 1WRWKwwnTEOngzDCfrIk5/KqBhzjaIaXbQmp2tUux612pDmybPPKjAHh1mpC+j4eei cl+3OBHY/39B/Mde6CvN9xUD5YU+UPJn+COl/YdBjjnUX16/q+HSJLxS/ke7/2JawY BRb1K8WbapOpUdL5zN9Gbc+cZqKhHXu9b1TwtlKT7gAnr/Dhww53zxW8b64YXq16bE ARZQfGTzdGRO1ny4wbMK7kJRhXuvgz8C757X0smbHbyN9LedmbhV+rGFpzWjwr1k2r 6D2TV0Ov0syGA== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 01/55] videobuf2: Add min_reqbufs_allocation field to vb2_queue structure Date: Mon, 27 Nov 2023 17:54:00 +0100 Message-Id: <20231127165454.166373-2-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:55:14 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783736949102456211 X-GMAIL-MSGID: 1783736949102456211 Add 'min_reqbufs_allocation' field in vb2_queue structure so drivers can specificy the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. Later that will help to distinguish the minimum number of buffers needed to start streaming versus the minimum allocation requirement. Signed-off-by: Benjamin Gaignard --- drivers/media/common/videobuf2/videobuf2-core.c | 1 + include/media/videobuf2-core.h | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index 8c1df829745b..c224d13b3105 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -866,6 +866,7 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory, * Make sure the requested values and current defaults are sane. */ num_buffers = max_t(unsigned int, *count, q->min_buffers_needed); + num_buffers = max_t(unsigned int, num_buffers, q->min_reqbufs_allocation); num_buffers = min_t(unsigned int, num_buffers, q->max_num_buffers); memset(q->alloc_devs, 0, sizeof(q->alloc_devs)); /* diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index 5557d78b6f20..17cacd696ab4 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -550,6 +550,9 @@ struct vb2_buf_ops { * @start_streaming can be called. Used when a DMA engine * cannot be started unless at least this number of buffers * have been queued into the driver. + * @min_reqbufs_allocation: the minimum number of buffers allocated when + * calling VIDIOC_REQBUFS. Used when drivers need a to + * specify a minimum buffers allocation before setup a queue. */ /* * Private elements (won't appear at the uAPI book): @@ -615,6 +618,7 @@ struct vb2_queue { u32 timestamp_flags; gfp_t gfp_flags; u32 min_buffers_needed; + u32 min_reqbufs_allocation; struct device *alloc_devs[VB2_MAX_PLANES]; From patchwork Mon Nov 27 16:54:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170282 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3285686vqx; Mon, 27 Nov 2023 08:55:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IF8GCxVK1Q0mQZ/bz8oGukFeuYINF3F6aBjHz5A8h5kJTAXovXeen/mIaCeb6ICbGtFyYPf X-Received: by 2002:a05:6a00:2e21:b0:6cb:d24b:878d with SMTP id fc33-20020a056a002e2100b006cbd24b878dmr14689429pfb.2.1701104121274; Mon, 27 Nov 2023 08:55:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104121; cv=none; d=google.com; s=arc-20160816; b=nPudZ46VpeF/KMsJP+39palGtqNIXaBs/F0ochxQ+MsLw9PIpbY+iCQQhYzNfutn82 Gon6vS3MYFK9MeXPmURiV/WQG44tXEa7tIi/sKox9Iz06mrxC+bwEUpmt0Xiu7YDR64E 6Ffk4XowRig7mVBt61hpeHOJk7bPDIdaqGeitimV9jNgVI5iOOg8BnN4GbXA5HJqDmEJ oX1rtLg61fX03zIjTeru7sxxnmiaCZ/C/5DohZ1qbAZwaOdzfvLARRBlAAeIneLGCaLh PABuPYX4DdYL/KVtPNQZbWNztd1h4K4FIVwpbCDVYQUXMkvvys9btw+7GnJUc9Uozeuz LIMA== 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=brE4U0MBFQYaN3ax1ap1kube4NNrhh6VTM094gsw0Ow=; fh=LrFbirJS6dVckvARB5mSs0DnIkUwHaiQ0oU4cagcglM=; b=LWgwdUdaQpV7dqXikKJ+zhuFnMyNJ6Z1pffGI7cPKZeYfCydEg5drl5/N5AOnbc1DB NW6W+KjelXE9x4UmfO+JpFTV2HgTgdXrZTDV5Mx2p/+xAo/pj3peVvlBjOhTDjrkWnVs kf1ADT0uvCmZOUWS5AEcIwB67WRINMLPbAji3lDsJ8Y/cly9gJBTDok8gBbpCAqZLzN7 wcuCh7k4bL3ms54kYV+an5SAg8tFyZ+Z+UWVUGsHpuAwVIHQsYgbjMcnXPteTjGUu3lD BsR7pxRQpjOPg8TwjGV8U4szt/1oP7RsCYwGXdguxznQ/frXlCaPDGUl+xzbN9P83AZi 3a3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=DJ8DWfOA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id bz42-20020a056a02062a00b00584aa817597si11111527pgb.101.2023.11.27.08.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:55:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=DJ8DWfOA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id EED8A809FC98; Mon, 27 Nov 2023 08:55:19 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234224AbjK0QzH (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231576AbjK0QzB (ORCPT ); Mon, 27 Nov 2023 11:55:01 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CEDA1A7; Mon, 27 Nov 2023 08:55:08 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 380146602F1C; Mon, 27 Nov 2023 16:55:06 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104106; bh=hMnzJg8JCOvJEFop4t5B+/fXIKwF/ZeHN2PahVubUo0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DJ8DWfOAk5ZVh/lWQNcvxt16s7JqWogG64T70sEsSIqXisXkPcvlUZAkjQ5VUJd4i g/Z5xBXkwIfF4RaswUK/Ms7ils5VoQA85dZ1nLrgLKDgnTRv8sWq7jlurIviWw4CAC x5O34NILjMdCFnuLMBU+AGZrEpyxoL6YB2j/6rQVfMNk9K4ai+6I75mvpYaTLzbh1m DnmQ2liuBcE6Uribks/5sdCzb+pB9bsL/WGU7nkR1RbKo+zex11ZFDAQtPI8W4NTxP ze2B8xXv7It9VlEdl0EvAr5+cSku9MDSL1tg1fU3jjIJIF+GxGs8tAxVDv0paCFzQe vAgIUsNUjvs3Q== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Shuah Khan , Kieran Bingham Subject: [PATCH 02/55] media: test-drivers: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:01 +0100 Message-Id: <20231127165454.166373-3-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:55:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783736954721061187 X-GMAIL-MSGID: 1783736954721061187 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. Obvious test-drivers don't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. While at it rename function parameter. Signed-off-by: Benjamin Gaignard CC: Shuah Khan CC: Kieran Bingham --- 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 aa944270e716..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_buffers_needed = 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 353f035fcd19..b4e888ac6016 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_buffers_needed, + 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_buffers_needed = supports_requests[dev->inst] ? 0 : min_buffers_needed; + q->min_reqbufs_allocation = supports_requests[dev->inst] ? 0 : min_reqbufs_allocation; q->lock = &dev->mutex; q->dev = dev->v4l2_dev.dev; q->supports_requests = supports_requests[dev->inst]; From patchwork Mon Nov 27 16:54:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170283 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3285715vqx; Mon, 27 Nov 2023 08:55:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IFeiWLa/j8haiDEBDdYmeLcatOGdoDb5/LN6KRYxy/CgJueZqULKDIRtGAKL8fL/0Lqc/GL X-Received: by 2002:a05:6a21:99a7:b0:18a:b5c3:55db with SMTP id ve39-20020a056a2199a700b0018ab5c355dbmr13094104pzb.50.1701104123252; Mon, 27 Nov 2023 08:55:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104123; cv=none; d=google.com; s=arc-20160816; b=Y+RzdOM0PRLefo2ZSg1iF8q4qFcWMqJONvgnfpNayOoAnhdwhR96bbEJRUp59o/pu1 Yn6mCfLQG5SleFah0aG5ivpNuJOt0dLIF7spoj3GOor9BEY8mH9r+V8A3JLfu1gFSHrZ lEEljh6IdCVL+gtWLxGDOV7uxTyy15Ka4iYf1sc3c50A3kfBloikqx1zxWIxbE38VV49 K25RskGeY+RjdfnYrbVTuHdEjC9GuSRLAQpRAfYPatFaC/A2YujmfLpY+kxh3SZroJak b8qEGqBThcr4S6eJsaW11Spc9jVwHT/81rG6s8X51TVK61wQJjd7qZK8T/REkK9SgWQ3 BJIg== 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=h7nQZfX9OtjgTs7QQhqChecZ/WuyGB4RhDFeIepqy3w=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=Zd2mZVuB4eXG7KaA9jpCI0k/fjDdtSCTK1jqRU3i6onhUKu5FD4JVufsgftoJiFobb NLNBnTAPIYGu0qN6yHh8THbzcCTF9GgC4XzACSOfUbWzDgWG174fBM/Bru6jQDSzXi+9 iIQFFknn26Zv5URfw2GfTUWFQjQRJ5E8az4Hd1pW4DmDWSTR3vKBNuIXOqB2gWJsiLzv vvNfpQOOlOqYOtZavppiDG4pylNWOpCk6t5fipp2CTtO8DbgNnuLVWb8Wg1DLzolZ8et hcozvfVjlmAhN+HfH9hDpDhJyX0yWfL4SvObCwTx6d62tHM8YbwfDuV/kCbuHxhwZUqf 70mA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=h6HUoXxA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id q21-20020a656855000000b005c2188ccb4asi10256553pgt.698.2023.11.27.08.55.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:55:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=h6HUoXxA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id D8B26809FC98; Mon, 27 Nov 2023 08:55:21 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234232AbjK0QzJ (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234024AbjK0QzC (ORCPT ); Mon, 27 Nov 2023 11:55:02 -0500 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 A81371B5; Mon, 27 Nov 2023 08:55:08 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 0450966071A9; Mon, 27 Nov 2023 16:55:06 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104107; bh=RQZKjikW6Ece6fRgXGbXCqiDnEcXizem8w9dbLVAl84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h6HUoXxAS1RaL+324Vn+8xbiV+Lrc6tIB616nDIi1Bub1y5qVeNdc0RS27ndLvP4A pGhpZhy6/Fqzlu7mAHYip/0Uz6aOMChuuHMzQTnbNTI3yTuDV4KcuRWWgqcbovk4jD MgYnYbWeAeXOBIu4NSATm8wEf0IOdyfT8ltNcz8FrSOQl6x4bGrH5ouLTjHK0hlbIV yGZflYB0oOw2UXATQS6pPpRmIgWJx7Wf6WTNq+U+GsnwoC60DW780Xv6IUtdWHQSBc M9i7fZN1QAB/yAOzvw4dhleXlTfl3qdwkmEZmxgyfPgrsstKehbQnWGRS8NnXQ1q+t ZFsITfwPpSeDg== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 03/55] media: usb: cx231xx: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:02 +0100 Message-Id: <20231127165454.166373-4-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:55:22 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783736957140440413 X-GMAIL-MSGID: 1783736957140440413 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. cx231xx driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard --- drivers/media/usb/cx231xx/cx231xx-417.c | 2 +- drivers/media/usb/cx231xx/cx231xx-video.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c index 45973fe690b2..66043ed50c8e 100644 --- a/drivers/media/usb/cx231xx/cx231xx-417.c +++ b/drivers/media/usb/cx231xx/cx231xx-417.c @@ -1782,7 +1782,7 @@ int cx231xx_417_register(struct cx231xx *dev) q->ops = &cx231xx_video_qops; q->mem_ops = &vb2_vmalloc_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 1; + q->min_reqbufs_allocation = 1; q->lock = &dev->lock; err = vb2_queue_init(q); if (err) diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c index c8eb4222319d..df572c466bfb 100644 --- a/drivers/media/usb/cx231xx/cx231xx-video.c +++ b/drivers/media/usb/cx231xx/cx231xx-video.c @@ -1811,7 +1811,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) q->ops = &cx231xx_video_qops; q->mem_ops = &vb2_vmalloc_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 1; + q->min_reqbufs_allocation = 1; q->lock = &dev->lock; ret = vb2_queue_init(q); if (ret) @@ -1871,7 +1871,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev) q->ops = &cx231xx_vbi_qops; q->mem_ops = &vb2_vmalloc_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 1; + q->min_reqbufs_allocation = 1; q->lock = &dev->lock; ret = vb2_queue_init(q); if (ret) From patchwork Mon Nov 27 16:54:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170285 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3285771vqx; Mon, 27 Nov 2023 08:55:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IG+dvecQHjYhwJeZNBayaO3UmxrTid8fisWMyDpriLtE/64vQGvE8NvcGRfc/QrozzJkrgs X-Received: by 2002:a17:90b:3b90:b0:285:c263:9f4e with SMTP id pc16-20020a17090b3b9000b00285c2639f4emr3744313pjb.22.1701104130473; Mon, 27 Nov 2023 08:55:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104130; cv=none; d=google.com; s=arc-20160816; b=MjGS9BTx8p+AQ0MfEqRiZio9u4JAcf1u6wRs/W/77d25nRrJKwfZHd7ey7aGkCASCv mN31s+vmZEVTy8IVvIWVOsentMBvI0o6E1jMIJMB0ao6M5SbOV+fb3Ctk22YX312YJ4Z mqgMdtGABk9+54tbISt/6HSjpbyj0+oZHq1f3g/wCVrDSHhIWciKldKESKN96lKTMTyG M0xvy1j8LX3ixYK6Fxg1xRgRNsZdquuiFBHI52PIwX/xbTytL9Lp7lFIpDpXwwGIbBDI yRKD7XdihYGnxjeI4D26e6tggxY0nDXRoyQFXVrOhcRi4mJBY1aWd0+5hFbsN0XFubXq sk6Q== 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=+HcsJRDXaTlPPrQoBj0PF5orj8T5RajAObx8/Ai3TGU=; fh=X7Ma/cemRPsjpK6kVEx/6P3iPO1SzFjCnWIIn7w15JY=; b=fVsKQe9I9c4fqZCA0U6TSiw0wxXAD4N0YT170ctjinwAyWQQDsS5CWIvHz2FzF1/6k JZpdIM+q18sxAeLVIEOpwYWk7W0EjNNvnHfAgq3WJ97pMrwfZwIelMgcK6FHdSzbkprc Gu3kYuEuAoHzWrErn9U9FfLfeyPf0cZGcq2d5YXpNZKTrDPa8VlYCUir/HFNnGTTmBsK X2yOG830SIRF3tSzOztp2dev92LafQ6xwcdZW2CAVhKsvR4SAZRrTHwqhfRNkFY7BB16 vjax3yqR6jblGiC8dF1q6rx4x0CDBDD8eKIyg9V2bdp8n02q8VIUbopnHE1EODWBetUt Z49Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=WBbok1Zw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id z17-20020a17090ad79100b0028555ec82easi9069489pju.57.2023.11.27.08.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:55:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=WBbok1Zw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id 22B1F8158319; Mon, 27 Nov 2023 08:55:23 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233918AbjK0QzL (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234106AbjK0QzC (ORCPT ); Mon, 27 Nov 2023 11:55:02 -0500 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 77E2D192; Mon, 27 Nov 2023 08:55:09 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 AD80466071EF; Mon, 27 Nov 2023 16:55:07 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104108; bh=nXea1hVd1CLJC4QjmTPo1Qmgjq3TpB25wTNYX2076fw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WBbok1ZwVmzcYZ6qijikokOfeNVx1QY8q/v6QMqMKEShjboAWMnVi1KcNOilv/t8u ZGA/Y5dZbaa/+i79WxGiAt2wbRQE6bOJvd0ao1gRx7SIQ1BDzCgi61+Ctc132LkxBk OsX5mifJ6HyfdcolBMSvdvawfw5+tN1BzsTKRNbodDmZd0wXooyb0bqBoq8fYyPmdC Q6O+EvfitG568RQT8EMQzzcm9kKBH2w7MJMt6RXJtUnosr5XO0wqZfo4ikFJgTmytD QaRkTe6R11Hb8saK91cMDMCEr55N+m3J0afxeTkWn2hIx05xBMfQhubNP2c+qySLux WxX7gsXCjBTLQ== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Michael Krufky Subject: [PATCH 04/55] media: usb: dvb-usb: cxusb-analog: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:03 +0100 Message-Id: <20231127165454.166373-5-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:55:23 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783736964415208538 X-GMAIL-MSGID: 1783736964415208538 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. cxusb-analog driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Michael Krufky --- drivers/media/usb/dvb-usb/cxusb-analog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/usb/dvb-usb/cxusb-analog.c b/drivers/media/usb/dvb-usb/cxusb-analog.c index deba5224cb8d..a038d97dd62e 100644 --- a/drivers/media/usb/dvb-usb/cxusb-analog.c +++ b/drivers/media/usb/dvb-usb/cxusb-analog.c @@ -1632,7 +1632,7 @@ static int cxusb_medion_register_analog_video(struct dvb_usb_device *dvbdev) cxdev->videoqueue.buf_struct_size = sizeof(struct cxusb_medion_vbuffer); cxdev->videoqueue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - cxdev->videoqueue.min_buffers_needed = 6; + cxdev->videoqueue.min_reqbufs_allocation = 6; cxdev->videoqueue.lock = &cxdev->dev_lock; ret = vb2_queue_init(&cxdev->videoqueue); From patchwork Mon Nov 27 16:54:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170284 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3285759vqx; Mon, 27 Nov 2023 08:55:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IGO3q7L0Z0Pxvd60nrimdMHQ+VbOI62ar1Bue2nZP8E4Kk/e7lUuS2KsvSuZ/JbDtECs/Pe X-Received: by 2002:a17:902:c18b:b0:1cf:b2a9:fc00 with SMTP id d11-20020a170902c18b00b001cfb2a9fc00mr10985142pld.9.1701104129214; Mon, 27 Nov 2023 08:55:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104129; cv=none; d=google.com; s=arc-20160816; b=cEnsbsAiEM1oaOrc5+9gTd+JpjsMD0C6JDyh6ixl6MITj5cSNHK0xTWZwva29BMOGQ QLkjsUoADxbcwEDSUBWbL71Dxdc5UmWYo8T3wY346ovCiOuZ0l3ORacvrveWDicmgKKL dDEVhP8jCkzuxTDC6rG/vZx0CwT9TO4biQnuGF8Rw3XzqVYrD1gCgf7AKPy5Vor/RYNm EkdCKS/KZBvcy1oxL8p1sevShkui9gPKrAHp833yYAnoGcum4fuFK1p3J4itRGq+aR7X SHWlAH/GQQ5zcKd5Tk6ex9doTduuopLMPXyJ+Z9kOyDoGzzmjHiJch1g3+X0u28rQt5D fMqA== 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=hlUou+za8CPzr8eWcT5B2w6W/joBp/pDK/2ILYJZvR0=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=ljGTK0cP06hOsjfZ2lTVYbrfSWShtd5Tek6Bj/Imzd6ism732VzeUlyHqqM77oOmkf zWTeKbnGsvwy1Mx0mA98DAtMRAGI5P6QdkmBFnICsONNWmlpSs0gFz+nrL2uwGnEGXOr QuR95iUmQH3OIjsTJo/aWJap+X5PRbq8zUZ8XtO82/xpRroSIaJDWLPZrpdy29srythc iAnhBV1RSmiJWbQI3OCbZZyKSrPh0niOJZb0Hdz+q9KRUHL42AMxKah8zwPtkBrkjzpm SZDf53yMgceC4N4hcire6mi/GEnLorNEAQmIZo5Xs24bHQDTMhbD8sOSqh2XcAkS+GWI 2xVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=D7tOhGoZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id jf3-20020a170903268300b001c4062a0e43si9592998plb.169.2023.11.27.08.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:55:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=D7tOhGoZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 13A6880A2640; Mon, 27 Nov 2023 08:55:28 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234250AbjK0QzN (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232335AbjK0QzD (ORCPT ); Mon, 27 Nov 2023 11:55:03 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1688819B; Mon, 27 Nov 2023 08:55:10 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 6F1FE6607286; Mon, 27 Nov 2023 16:55:08 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104109; bh=cSCDQ8wlrHHxZIMdX6yERM4DP0+7F96unl/YfCpM+80=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D7tOhGoZPJaPsvWVJ8Atsd6mk6513xTTrg+4o38gsdrIl/awNv66gZx6u/lM7Mor5 oAj/uQLEdUP+btCuLOhWctSfo4Sgf3d3ylSPAPamYDjXGJYmxEiHmEKGI/5s66uG6C /ABdvLoH/nQunEo7/CoO0uArFNtKbtrPp4a0gRCYvXLeecADD5YVEE3VQ91CJ4Mnlo BX4UukdWNVV9zhGeqnuITExTYnjqBTnb7FuhrHLogkE/DTzdcd+P1zvysRrFq4UlrZ 0wxqEn63/UXygAX7ShNebkQyb1AtQRkzF4gajpJVeK5p24u3aeZHOka7GFPWY412DV rUFsMOW1ruqLA== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 05/55] media: usb: gspca: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:04 +0100 Message-Id: <20231127165454.166373-6-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:55:28 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783736963453452807 X-GMAIL-MSGID: 1783736963453452807 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. gspca driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard --- drivers/media/usb/gspca/gspca.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c index 770714c34295..7b701275f76d 100644 --- a/drivers/media/usb/gspca/gspca.c +++ b/drivers/media/usb/gspca/gspca.c @@ -1257,7 +1257,7 @@ static int vidioc_g_parm(struct file *filp, void *priv, { struct gspca_dev *gspca_dev = video_drvdata(filp); - parm->parm.capture.readbuffers = gspca_dev->queue.min_buffers_needed; + parm->parm.capture.readbuffers = gspca_dev->queue.min_reqbufs_allocation; if (!gspca_dev->sd_desc->get_streamparm) return 0; @@ -1273,7 +1273,7 @@ static int vidioc_s_parm(struct file *filp, void *priv, { struct gspca_dev *gspca_dev = video_drvdata(filp); - parm->parm.capture.readbuffers = gspca_dev->queue.min_buffers_needed; + parm->parm.capture.readbuffers = gspca_dev->queue.min_reqbufs_allocation; if (!gspca_dev->sd_desc->set_streamparm) { parm->parm.capture.capability = 0; @@ -1517,7 +1517,7 @@ int gspca_dev_probe2(struct usb_interface *intf, q->ops = &gspca_qops; q->mem_ops = &vb2_vmalloc_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 2; + q->min_reqbufs_allocation = 2; q->lock = &gspca_dev->usb_lock; ret = vb2_queue_init(q); if (ret) From patchwork Mon Nov 27 16:54:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3285821vqx; Mon, 27 Nov 2023 08:55:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IFQ0a1jD+yVGGKzjY66IGfY+F2cn+TCwPmfx7rn4D0o59jM08DoD/3TD8Uywe1d0E1bR6kz X-Received: by 2002:a17:902:d50f:b0:1cf:eacb:a12c with SMTP id b15-20020a170902d50f00b001cfeacba12cmr703214plg.65.1701104135147; Mon, 27 Nov 2023 08:55:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104135; cv=none; d=google.com; s=arc-20160816; b=pFu8FJMa7gnlsmoe7gmzdAAxtMkOrgd4KkBYMVboJIfG24PdWTTXbt+zyOtRK0aU/1 MEiXWJd6DzRTM5K2vpMklMKtorb+K+g81pH+oSs/c/1FG+bXg2wLLdOysVvXmhXLfAF/ tYjZXVM3JHOQ94rUzb3Neqcur0K1GLKvPWApYkNOK51jf/st47SJImKokjQqACviIrpp tDfsvFTy/LudkfnjQRZUsEn6UZR3dGnq250Hs5HKhB7KLKbNxldja+VWY1vEaCB/RGTR mwDFhznblbqLtfndWRDVKcSrBgF0Ydkze5+1ztq5s05iGIibCLQ3qjlhopfllHDRwXqV uupQ== 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=5kuQBBk2gkYeMtccwPB5aoKoN9z3E1Z9HaVe75INAeg=; fh=p007ZZnBoIZCdm2IGyLxFZB1GSDa400lEu+i15yUK1w=; b=Wr4G2Jg3CbyxBdxPcPacTIR2MXdn7CHtbBy+jzpzDJ6Hbgu+BhT1kMI5UxqmvGyAyA zw2sttLiry1t4RdFTG/hic2wf0lr+fBnlBrAr40P9wPsgLqv0PdQkFMwk515ow5Wvuy5 2z69lf4LViK4bDpozMnXYWo2q/a4Q5IX9aGXeCPOAkGWGsmlfjgDq6mfnmbDQtMZmikt 85A0GcO4DkONK6D+Y5CAb8hMyV3Q2Fqkr5qCG5bSqPovpOe2nDbxZdLxuWC4AzwEjVIp hrHg4lZj59HmPGA9QDi8bFgVaiziEkSkYOJf3wDUnnT0wzmS3OBImUc2Hp50ZptFp6s+ Ni0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Vpjk+xeW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id jo6-20020a170903054600b001cfa7f91403si7100031plb.183.2023.11.27.08.55.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:55:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Vpjk+xeW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 860A68158320; Mon, 27 Nov 2023 08:55:27 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234256AbjK0QzP (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234214AbjK0QzE (ORCPT ); Mon, 27 Nov 2023 11:55:04 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6FA6198; Mon, 27 Nov 2023 08:55:10 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 237A166072A7; Mon, 27 Nov 2023 16:55:09 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104109; bh=CXOqINnxnCzQ6XOL+VA2AacFLu6JKWe+Zb7RZAzp+MY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vpjk+xeWjjWP+R3N2SKM7woEQxBddVhXmlMwS3d0XkmMR9tHChI6HMPtT76eZVEGq KJjCRoykTj4IatyWsm9Z9aUQE4UWPj2h8ain2VdzOA7oHZMmej8UFS0YQuBTSvNial 2YdTFMo+0i2XSDZeogZXKs9/sVscCNm4SEmrQgNui+yp3QTAgFroSE73sHIg1TKVf/ NOzPbr8by7halFECH/emHR+T8pNaqeXCWfxrxXrlS3RPnPfAqHmv1vBUNl9VCrDXXV Vr1LE52EG94i4bmz9DywsOdMD45T5Sb53ELbT7JavhlUajhQimVCpnVLEkgfM5jLOr UjnbE5+ZuJxjg== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Eugen Hristev , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea Subject: [PATCH 06/55] media: atmel: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:05 +0100 Message-Id: <20231127165454.166373-7-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:55:27 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783736969193274449 X-GMAIL-MSGID: 1783736969193274449 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. atmel-isi driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Eugen Hristev CC: Mauro Carvalho Chehab CC: Nicolas Ferre CC: Alexandre Belloni CC: Claudiu Beznea --- drivers/media/platform/atmel/atmel-isi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/atmel/atmel-isi.c b/drivers/media/platform/atmel/atmel-isi.c index da58f33b6b0a..9c156771568a 100644 --- a/drivers/media/platform/atmel/atmel-isi.c +++ b/drivers/media/platform/atmel/atmel-isi.c @@ -1244,7 +1244,7 @@ static int atmel_isi_probe(struct platform_device *pdev) q->ops = &isi_video_qops; q->mem_ops = &vb2_dma_contig_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 2; + q->min_reqbufs_allocation = 2; q->dev = &pdev->dev; ret = vb2_queue_init(q); From patchwork Mon Nov 27 16:54: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: 170286 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3285804vqx; Mon, 27 Nov 2023 08:55:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IEcB/RhAQw0EgiOcaKtcdBD06x4aJ3tQMKlMAPWKaYqSwqsBt5Jo8FUqICxJLBstEXsWPSB X-Received: by 2002:a17:90b:4c50:b0:285:8407:6152 with SMTP id np16-20020a17090b4c5000b0028584076152mr13118541pjb.8.1701104133508; Mon, 27 Nov 2023 08:55:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104133; cv=none; d=google.com; s=arc-20160816; b=Lbc53P88YKmxnTwM7fFVIRdloZPE3tGRrOOr/U/JAevvgq1oWSffVDyqriDkjSBCpX 2U0ikOZRxkrJmsi5V+hn+47qS/MIGqLN95XcSdKpInRi1lqyLV/sE6yg35edWJpnS5QT d2sVAd9jkPOhCXgfZp2raJIdg3cLz8AU1zbkIPNua1yLzYyf+GIt7Np++/r7WGMEdNPQ btE5Xbmy8bNBYiyXIP42VVjaB3aCFYSL4BrD081TF1TsKy59fs9M+ZYCPA+BA1Estoqm ZPTypqjDs2i2QdQrsDAYEZvw37F042mwTotktPlAy6CwD2dgxOQB/yn+Xk6PonvO001a TtXQ== 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=AhjIXxKjXIo+//Gfnu5BSdpmu3n4Y38cNlNXOJwZXXM=; fh=KCfvR5L/qC8y371BdWVn9YX2NmJfGi7lDCPnlhbGkas=; b=p8dHX8utjxzRDjVNnaz1oCxsAZ1ptHWFJbQERZjBzzvubQDZpE/KdFpa977QJno5FY lOd9d29JidTWV/ctjKe5DQBddejgR2YP31YkosekvJUR/iktD6PLuD1nR76fJXRHl/j1 973AtpAWHC8ggQPJjOP5jDj+cVCLpQcVVazvyiYzJyF6VbGKxqu6fuALx5H/V65HFOJU gCPXnjc/Wb9n5kmZSXoNPJVz04oFJbo+I8weraiDCFakGufeDYaVFBkJf34iVk9M+dg9 fA45PsTaLEZtBRSflVfxlLaXB15oCV6FC4kTuIDh5yTEyg/hvb83QC3S9zitKddU1Ee7 eH9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=okc0FZ7T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id h3-20020a17090a130300b002806cdeecc6si10679384pja.35.2023.11.27.08.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:55:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=okc0FZ7T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 3A18B80A187D; Mon, 27 Nov 2023 08:55:32 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234261AbjK0QzR (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234218AbjK0QzF (ORCPT ); Mon, 27 Nov 2023 11:55:05 -0500 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 E6ADD1BB; Mon, 27 Nov 2023 08:55:11 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 0396866072C1; Mon, 27 Nov 2023 16:55:09 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104110; bh=fG8KYI7BVcY4T+xVPe1Um4HGw++yjE8jKZBIAJBoZlg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=okc0FZ7TcnIOKXeJLnL2uTUwCwKyTO6cS1aLjFdac1E4ZKrZwt3bTF/ighydvER8N ADY4RmMXQ8JqgohutdfrYL3oh7WEZuyVPzqQ1Q81My7g/TG3K0vB50IudIAJ/mEPeH dguTHusau2bnbf3UU85pnxkZanK+mhfD1IOHHtUENOzPfedaPJ4Y8bU5WzRgc3V12L yWAiBVsKZGBIMfTw+j3EUIwco2urZjuTWOty9AbSJx7iKfO3u9HRGRe8EP6f8CKNBc LwL/pozPg1KZV+PzopLCbBaOWH3Da9+PcPNcltYbTI4zvCpBPYhze/yyx0FB7yaCjK 1PykHWF9j1vfQ== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Laurent Pinchart , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Subject: [PATCH 07/55] media: imx8-isi: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:06 +0100 Message-Id: <20231127165454.166373-8-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:55:32 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783736967551740360 X-GMAIL-MSGID: 1783736967551740360 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. imx8-isi driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Laurent Pinchart CC: Mauro Carvalho Chehab CC: Shawn Guo CC: Sascha Hauer CC: Pengutronix Kernel Team CC: Fabio Estevam CC: NXP Linux Team --- drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c index 49bca2b01cc6..81673ff9084b 100644 --- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c +++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c @@ -1453,7 +1453,7 @@ int mxc_isi_video_register(struct mxc_isi_pipe *pipe, q->mem_ops = &vb2_dma_contig_memops; q->buf_struct_size = sizeof(struct mxc_isi_buffer); q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 2; + q->min_reqbufs_allocation = 2; q->lock = &video->lock; q->dev = pipe->isi->dev; From patchwork Mon Nov 27 16:54:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170289 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286355vqx; Mon, 27 Nov 2023 08:56:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IH72Te/jhFA28+v9GAhgwqtXYBoFGE75+9aCLo9HhyEgpMiWi+fCFOtevROT1vI+8I0pbJR X-Received: by 2002:a05:6a00:2d1e:b0:6cb:a28f:85c2 with SMTP id fa30-20020a056a002d1e00b006cba28f85c2mr17633710pfb.16.1701104188382; Mon, 27 Nov 2023 08:56:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104188; cv=none; d=google.com; s=arc-20160816; b=mrkpzL770Y+3dtjd1LYBuS6KJelbZf4LieU02B2EI+krLChWrFztTKJ3ie4bNr/RJR TH4fyLsA2Hp0MmzkrFyBKeIlXV5IplFlhOF32K9T9L+aZo+uhj502xO8kGSbzlgn/mpr LkRdh6/jl25dHE/0qRmNf0odXkqwjcOe15DfuSYLr9kqBPQ5irbfnPPCJ6wiczNRHhcf M88EF659mmDvoM4+OvLpEocbLy2MGYajKTHyh/80ZRNbizUg6285iUvAo+2i832CXTBc H8J4Nco0CeS9s3PseT6+daHpWQ8SPTd6BG97YM8RRfIA5uVr5BahCdy7iIZnFBekbCJy wFUQ== 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=69GNzU8E63rekDh2ISr4W/HGvGSMPIVwrWRPEEl79Qo=; fh=4DqQzjgLUBPepKVvQj3wI6wj/GVnu7m58RDvugRHeZI=; b=umFcU2yU1I6FR+Wmo4dAvQNspeR2vdPXTv8elaKvKW7KGN76lIXy+LPk7pnJQzAJjY xunTIdCVna0mqTeDM29qKYNZs1nFaajdh1jwyUCuq05w64r+psMQU8nGSMLHw+DUsQ2U t3plT+jVa1ZFfcTTkdNoZQLIF5dIRsnx/VbjTD8MnUFs8/gE0UAOlaMq0DG05TTqRYRR AzGVllKdCjVi2cUZ4gAnQM4CkFCSuDkp0PUYM2+fQpWd81XAtXb3ng8Ank4bjEhE5ODW RJzPDoAyYH55/BFwsNYHLctbp+RoPk6VVCgStXiqJczCmciNN8qj7hmExIoUshbJoWV0 6ZVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=UyygRunY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id f22-20020a056a00229600b006cb8ea1f1besi10611886pfe.65.2023.11.27.08.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:56:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=UyygRunY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id E64C2807C7FB; Mon, 27 Nov 2023 08:55:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234280AbjK0QzS (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234220AbjK0QzG (ORCPT ); Mon, 27 Nov 2023 11:55:06 -0500 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 F313919B; Mon, 27 Nov 2023 08:55:12 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 E9E7766072EC; Mon, 27 Nov 2023 16:55:10 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104111; bh=/omb2mE5oy70HH/kBxdqmwaLlWf6cHg+GYUl9K/Xqzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UyygRunYjRkADBLKm+WPF/uWjoPZcVap4oKYXcLdaRC88jMZmnDU+EfLGW7qTd5PE ymFjgeVJlgGiAt59YziOGCV821Io/7/yu4OJGU1nOEfM1ZSR6lPcRQrZBofG0xAPNR RloGvqNXRoGjpoYltJJjTGRAtwvYlE4QxeV4LuBYrfuZHzyrx0tFB8qlLsHOK/zfx4 4eWJByOcHtfS4j3e8OgsW2eHI/aeJMJG0wyasx+YcTt6eH2+YE3xejO5KPWkBBj2tX bxwCjvK2sJrjCcZg+0TxE8KqYmnHZwT+1oYFYFL3zb+V2DKWurp/PSI1g3bZVRB4wF ww/bxPqt7IzEQ== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Rui Miguel Silva , Laurent Pinchart , Martin Kepplinger , Purism Kernel Team , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Subject: [PATCH 08/55] media: imx7-media-csi: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:07 +0100 Message-Id: <20231127165454.166373-9-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:55:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737025379249959 X-GMAIL-MSGID: 1783737025379249959 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. imx7-media-csi driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Rui Miguel Silva CC: Laurent Pinchart CC: Martin Kepplinger CC: Purism Kernel Team CC: Mauro Carvalho Chehab CC: Shawn Guo CC: Sascha Hauer CC: Pengutronix Kernel Team CC: Fabio Estevam CC: NXP Linux Team --- drivers/media/platform/nxp/imx7-media-csi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c index 1d2464ca59b8..dcc8c54228e4 100644 --- a/drivers/media/platform/nxp/imx7-media-csi.c +++ b/drivers/media/platform/nxp/imx7-media-csi.c @@ -1676,7 +1676,7 @@ static int imx7_csi_video_init(struct imx7_csi *csi) vq->mem_ops = &vb2_dma_contig_memops; vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; vq->lock = &csi->vdev_mutex; - vq->min_buffers_needed = 2; + vq->min_reqbufs_allocation = 2; vq->dev = csi->dev; ret = vb2_queue_init(vq); From patchwork Mon Nov 27 16:54:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170292 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286470vqx; Mon, 27 Nov 2023 08:56:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IHm4PtxkQqiGkwSLCs4NgenRc/lU67szEsI++OsKJX+wCrIClDffH4DsAdE5U3PZOzfEzmf X-Received: by 2002:a17:90b:4ad1:b0:285:9860:8a8a with SMTP id mh17-20020a17090b4ad100b0028598608a8amr9607296pjb.7.1701104198303; Mon, 27 Nov 2023 08:56:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104198; cv=none; d=google.com; s=arc-20160816; b=JNsCqOLJey+lxAhWb+61+zjKssyWBwtODwy7akWhflXfZpeLIP62i6QqVyd5ioC9Qd bBgKStWjdrCqRkVD9fmreDMBSEXeM7EZyD9aMytuzVbRRtea8zhaA+HUxEqFQiii9KQJ PP8aoLRzJP0USv+lGHU/Bg5Ysg0TzqPxDLSPfbL73iie7dkkU473W6N/UpwXdKV/5VJt TArxIttLQ6Sclt1mWxSpmWwLl9cJJ8RQtOuRWc4V7hXVK5NFhe4r7bSpXGwCWyJ1cPup XegrewPFsdnbYbx2xkcP9A4rFO8QeBl1v82ptvbpnWZCpbTedTuCViXtJxDwLgNVVlE7 m6ow== 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=rjflhFi8bsjlj5As2EaObw7/jVfy13HHLVw2Gs63RS4=; fh=SHDo9UqUs2L09c+CFX9UZsoU3+oauFqPePLotxsxoYw=; b=da68tjsijAZAp59uLeEWRm9uZZzXyS8SpOFa5yIicYh2L5UBZJkUJL8UUCraJGJxvM Eo7Fp2tBeHFK00QbaqLpT6IAp6HhMXUjpVh/noL3/myJ/uo1kDfO7gYjlisf7+sTGvc4 K0S5jxS4Ciu7h/DejF5PQx1RtpkNbAu2qSY9C3pS23qHXu59A87TaZG1Cgzz94DhhroR +8ulkW60rWlqq9w8Y06Cg5kL/9kzzK4v0Mu5ddWqk5VpguvujjLiHIrFn5mTx7iU/Ykz l0yb0CD2OJJnlIks9JTyPSXdRQKa654+TLejZRqYQ36wGDDzN5kTS+L8yZxJ5Ca+G9lN 1/wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Lqhg8KZo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id i10-20020a170902c94a00b001cfb971ee04si5118442pla.87.2023.11.27.08.56.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:56:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Lqhg8KZo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id AF7018061C57; Mon, 27 Nov 2023 08:56:19 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234347AbjK0Qz0 (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234230AbjK0QzH (ORCPT ); Mon, 27 Nov 2023 11:55:07 -0500 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 B0F7719D; Mon, 27 Nov 2023 08:55:13 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 060E66607314; Mon, 27 Nov 2023 16:55:11 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104112; bh=bIx0yhKI+ScDV20M08uZHnsyThCdjj2x5yD228Iuuco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lqhg8KZokYkmmqeIECo9Ws1F/frc0ZzueihVGe0Indtr4/7hIh4Tu0gb+qxYqWhQo qntkHXlnmpN8OSJSXBXyk1gDKVE2yDegPQuhNR/1Nd1yCmJte94yWf74OKzvXoNfNb nTRbBSZ7zJ1PpL+90aSl3GwfrtEUQ1Mh+t5n8bdAFqmOGPQ4p2jnUsIyUCLxah2KQ3 ywygheN76NPjONpYpI5d+OgDzuMmigh6vPV6ZpY6g5uYJhFLKVyKLeKi3tvxuicqOs GL9HQOX9fgqOqWE6TEmn799ggdtawQWQkrxUYTDU5cGeJi3MBteQf9Owr6Ancu2+vu XgFhrD89nI40w== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Philipp Zabel Subject: [PATCH 09/55] media: chips-media: coda: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:08 +0100 Message-Id: <20231127165454.166373-10-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:56:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737035990913274 X-GMAIL-MSGID: 1783737035990913274 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. code driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Philipp Zabel --- drivers/media/platform/chips-media/coda/coda-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/chips-media/coda/coda-common.c b/drivers/media/platform/chips-media/coda/coda-common.c index f1d85758f6dd..2b535a31e017 100644 --- a/drivers/media/platform/chips-media/coda/coda-common.c +++ b/drivers/media/platform/chips-media/coda/coda-common.c @@ -2546,7 +2546,7 @@ static int coda_queue_init(struct coda_ctx *ctx, struct vb2_queue *vq) * would need to be reflected in job_ready(). Currently we expect all * queues to have at least one buffer queued. */ - vq->min_buffers_needed = 1; + vq->min_reqbufs_allocation = 1; vq->dev = ctx->dev->dev; return vb2_queue_init(vq); From patchwork Mon Nov 27 16:54:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170288 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286248vqx; Mon, 27 Nov 2023 08:56:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IEGd8PZVK07n0qu3F+7D+kUcTa/0FnpbhECErxAKo+JG//2hyB7uI1y71sYTTbCt5pEechN X-Received: by 2002:a17:902:d508:b0:1cf:d597:194c with SMTP id b8-20020a170902d50800b001cfd597194cmr3098547plg.49.1701104176397; Mon, 27 Nov 2023 08:56:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104176; cv=none; d=google.com; s=arc-20160816; b=JXwsBBIoZ8YNa/V1x98fdWs3xWZWLk6TBK15faSmtHD3pBUObFnqNJ0B6O6bw4eHfY ZIoGYtxqjBvLFdfaokZgsZ1VOGfsZgc2GuHAlBlzes4KNgh1kKLk16Nqk6z+0jc1/WH/ k9+q4gIEt/YHh7tzP9loCvlaq+h2W4UG3CAC7NN0fFFjlSVNSdAp1hnif0BB5NuMOrIG NNHkBo2stp99Gy0mcvmcyh4bSeNujU96rZcgF8WmUXbEWdKQrYXfxktGnBvrWqvoiMuH +XW280OQfsMfrf3jIUsqMZzOe/xlTcr9MHYvk8L6vGZC7fdXHmWIlwnbkrfxK6jJ35G2 O9KA== 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=TJcsik7R2tymvVyWNfffVpAw1YWjqILx1sJaL3wi2GE=; fh=LM2TAi99TCwaoDvh8mQ6zS2Q36YxW2AGxIdsachCDnU=; b=KnqcGp/6XqgsBpJ5OzhkHdAXZBqAqNUGgHq7cR8u5Pj1WtUipsdsJozg82deq7McVN YkeK6KrqohaSQ/rbtEBzpCRcN7WA88ZBcylri4MdtweIrVJl4Uwkj4WOZEfaukE67A4l i8AXRVFj8aPkDu29er5eYpm9dgNEDJdLzojweU3J9+V69P8E1K142dGQ1qQ+4gJVCXUy Z7AC3E4zsXIGJGIC0FXlkfNex8vLGhPOrjhEE0dfsxtho/UuV/45ZNTH0YYDDpSmwxn/ +519IygLsiG3z/O096nlW3QVFnvnL5kPupWnMRUpSokAuyRJBbpdgjnn7cxgRztcxRpv BIFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=ahoEW6BE; 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 p18-20020a170902e75200b001cfd2b08900si2180462plf.365.2023.11.27.08.56.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:56:16 -0800 (PST) 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=ahoEW6BE; 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 4C9CF807C873; Mon, 27 Nov 2023 08:55:40 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231664AbjK0Qz3 (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234247AbjK0QzN (ORCPT ); Mon, 27 Nov 2023 11:55:13 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FCE4D41; Mon, 27 Nov 2023 08:55:14 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 B752566072B4; Mon, 27 Nov 2023 16:55:12 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104113; bh=ayBhyvSUe+u4AtwC/rm89lTriRSE3ewHkfysyr3gsEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ahoEW6BEFCLYt8ukZWa9VOHDQ1+NdpPPSgLK/sNTfG2PMP2G6oYMPBqKgQF+emRS5 GQz5tkAX7r0tWaK9EFKT0dulFvaBrfAivz2AArXK6KnOYQ9TIC2l/Rz5pYtuYULIDi dTyOz9lX6ZJOQLNtvEdtnjAnm57y/J8N+W5kGGZRGAoq6KIMxbAipc8cW0UVMQF49g InY0zhL9GBg2M23GKowCPIUkCVUCLAvZW8G351rowpgw17YEnCQt1PBGYf2Jlg78/V vN8+WHGycSA/NUCvj/mBuLNCSe4h7+4d8ZyhXnxOhqHTVvJlZ935py1NV8Z+cxg0ap N2HnPImvB+bGA== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Joseph Liu , Marvin Lin , openbmc@lists.ozlabs.org Subject: [PATCH 10/55] media: nuvoton: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:09 +0100 Message-Id: <20231127165454.166373-11-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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]); Mon, 27 Nov 2023 08:55:41 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737012735454545 X-GMAIL-MSGID: 1783737012735454545 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. nuvoton driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Joseph Liu CC: Marvin Lin CC: openbmc@lists.ozlabs.org --- drivers/media/platform/nuvoton/npcm-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/nuvoton/npcm-video.c b/drivers/media/platform/nuvoton/npcm-video.c index 267e301f2b26..6c122508be1d 100644 --- a/drivers/media/platform/nuvoton/npcm-video.c +++ b/drivers/media/platform/nuvoton/npcm-video.c @@ -1612,7 +1612,7 @@ static int npcm_video_setup_video(struct npcm_video *video) vbq->drv_priv = video; vbq->buf_struct_size = sizeof(struct npcm_video_buffer); vbq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - vbq->min_buffers_needed = 3; + vbq->min_reqbufs_allocation = 3; rc = vb2_queue_init(vbq); if (rc) { From patchwork Mon Nov 27 16:54:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170293 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286500vqx; Mon, 27 Nov 2023 08:56:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IHuRIieCXVogvQx30h9QitoZc5o2gmw633Cc0Hu8GLhW8+sZr8PjFU0qr7kVb3EPszGYVaZ X-Received: by 2002:a05:6e02:20c7:b0:35c:daf4:6984 with SMTP id 7-20020a056e0220c700b0035cdaf46984mr3855739ilq.28.1701104200912; Mon, 27 Nov 2023 08:56:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104200; cv=none; d=google.com; s=arc-20160816; b=SXFXQ0gwWDdGtb+b+Obfo4CkP+2+5Fuldnx3goqba9P/KvJgVWvIyS2sSj/tl4OGl0 cpvz3skfBHxO0PRISlv4KpsezBLAvBr9G5fgguv+OpYAh0ryRHt9wJud/vtIGszf5idg geAs74A7lufiUmOty/xYfUwn41iiVu8AzrgjBOCFXwqtsNZxTEQsZvJ6r5PFufvFu0LU hhEU8exIPeBMRPEqstbWjJMzSp6bpJnoYw52mMWcCOxzZbokC5oglUb4fjajykDcA+gi /QC2DZBG68OTiHSjc6YZ+HUIN6rm1gI/hTISKKL/53zGLa2n9wxWhAYCQ9SjJgrRvHT8 PxNg== 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=PQJwEtmOmV1WWnAc4EjHXMpTePpnZokIAEbYo6DAeY8=; fh=Q2+fBkTJFlOmvn/gakNfgOGMSuLeah3jspZE8+tcJ+8=; b=tT9Awui1+xQH4/lgKHMTfop6oS7LF+HJXYD88uzyhjsEQMU0D2JM5w2lFqGobhKuhq vdQI98qUUg3ztuvSE8wvdDIaHUWLem5+0qIGlWE5VkavzQd+XoRjYMWYl6fudlqLcYHx XgUu7Er+Z3TGAe9HlqAsUU1EGisVCu+2mKijoqDmqh4xkb5fZR1UsiAcRiH8konXuOep ehUfqSIea2W3C+5DIUhM6wpNVFPQbcQnDdrL6PkIAg0sA1rjLjzX4a7MMqQIP5MaqBJV J6x5P5gaLXrK9PvJQYGEZ48mbuztHpvPHCxyUAWWmsrCwxkcYFaCeRvZ/3x7Vi5oYNzj Nr8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=EJ2rDmOH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id a24-20020a656418000000b005b99c0dae65si10266402pgv.357.2023.11.27.08.56.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:56:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=EJ2rDmOH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id CE33C80A187C; Mon, 27 Nov 2023 08:56:23 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234034AbjK0Qzd (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234336AbjK0Qz0 (ORCPT ); Mon, 27 Nov 2023 11:55:26 -0500 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 5CB93D5B; Mon, 27 Nov 2023 08:55:15 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 8AD836607323; Mon, 27 Nov 2023 16:55:13 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104114; bh=q+PBOieh7TUOZfOTD/eax3kPGizf1naDWVCgdVzk/Rg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EJ2rDmOHuYC+RuIZhYXo8DzC0Rkky/qSkpSFNsGMMVKLXohgncgJ1VcjJ74ikJGtf pY+o9OAvZ02fx9XYYChpfQcBnLpuhwM0fXK8/MYElMkedofzaOuGcYCgGIGgD9L3/t Qfqaciz57Axsq9LOu5/sBoxUQbbYMlFof/CVjj1OHKZnXjIhLO2lhxnpDDLE9KhY1q rCMIlMoSpiJy5nHB+B5Qpfv51KH3hA8Y28gS7RQFBGvGvtaHEvY8HKUFMR2m21KaLd qDYw4OTcBnjIUkRd6LlPfmV7RjT1KDoCeaKCHbUzFubxnZFKp5UK+/Ug0zAxL588t3 o9asdDeXrRa9A== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Jean-Christophe Trotin Subject: [PATCH 11/55] media: sti: hva: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:10 +0100 Message-Id: <20231127165454.166373-12-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:56:24 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737038801030781 X-GMAIL-MSGID: 1783737038801030781 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. hva driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Jean-Christophe Trotin --- drivers/media/platform/st/sti/hva/hva-v4l2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/st/sti/hva/hva-v4l2.c b/drivers/media/platform/st/sti/hva/hva-v4l2.c index cfe83e9dc01b..d7bc25b0d69e 100644 --- a/drivers/media/platform/st/sti/hva/hva-v4l2.c +++ b/drivers/media/platform/st/sti/hva/hva-v4l2.c @@ -1142,7 +1142,7 @@ static int hva_queue_init(void *priv, struct vb2_queue *src_vq, src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; src_vq->buf_struct_size = sizeof(struct hva_frame); - src_vq->min_buffers_needed = MIN_FRAMES; + src_vq->min_reqbufs_allocation = MIN_FRAMES; src_vq->dev = ctx->hva_dev->dev; ret = queue_init(ctx, src_vq); @@ -1151,7 +1151,7 @@ static int hva_queue_init(void *priv, struct vb2_queue *src_vq, dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; dst_vq->buf_struct_size = sizeof(struct hva_stream); - dst_vq->min_buffers_needed = MIN_STREAMS; + dst_vq->min_reqbufs_allocation = MIN_STREAMS; dst_vq->dev = ctx->hva_dev->dev; return queue_init(ctx, dst_vq); From patchwork Mon Nov 27 16:54:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170297 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286607vqx; Mon, 27 Nov 2023 08:56:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IH9wLsbyaW3Ob1S0CP2PNfEo1L6YIJUNjw/oZzpQMTHdJv8yXShM7CFvWPKp1eF+UzFkoqA X-Received: by 2002:a17:902:ee95:b0:1cc:6dd5:59e8 with SMTP id a21-20020a170902ee9500b001cc6dd559e8mr10445117pld.26.1701104210270; Mon, 27 Nov 2023 08:56:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104210; cv=none; d=google.com; s=arc-20160816; b=K6124GUg0iQkchUDiPZL5oc4Zz22SoSjrlO/6MECeCDFY/WqJuNBmvV727wzTpAHeA 9FUGkxYnZSU7Q/5zhEF864fGg3i23aaFKFl1wCLxdOHcjc2TpA4eH2b3v3XI5ULhR/lR qs4m29pI30LKiUNbKfR9htcmfXbLLNimSU7waudaRhLo5Z00wAQyWO8uN0kZKsNK9kEs yp+Nu13wFyTJH/cY/tmjLqXSokmixqW5U96aPvrVBQKst0Zoj5tpXoyN052oZHDfLJSY l8C4ECrZnnBTBjVL8KIo+CuSk2aGcwadJ35IKbpEixI3G87T+FXh/DwrAcgSFaDin31v 8zrA== 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=tWI/ser4D+gUe9Uu+9WaR7BOmLMH4p7k3i3Qv2RY/LM=; fh=6Qtl8iZGoLN6JUWLuXnO6pSSFZd40pa3oPqH4w6wu8Q=; b=YQ0v+RX3tXF5F3qCj7gPC9Uphn6ok1pXN4NVY3Op/Zsk3To1VASrV2f/3iLUKrKHx5 aUYSemCw7oKFPstZCblnL4byVHeePGefbpDvLOPtBSI92luJabodcU12T2ey9FkcA6de iIczcBC1aTkvI6MGEEq3TG7v1C5ZEMyLBY6rH40QJpHSf8yRFwV85ra5MwhM6oxc0w4B tO409XyuQOeqywg8humnALKsZ3aiZvFN12IsFtRH+zNMTJvX4MlczZGzuB4yd3ULWDJt BgyeiTCEpN8bZUtlSinALI6H8EQ80q7p/ulNLGimHl9rvkHA4HGgUVGsPedDRshkygiB w3cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Err5SscR; 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 p18-20020a170902a41200b001cc24ff4197si9591684plq.311.2023.11.27.08.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:56:50 -0800 (PST) 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=Err5SscR; 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 76E56822D563; Mon, 27 Nov 2023 08:56:36 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234252AbjK0Qzb (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:31 -0500 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 S234313AbjK0Qz0 (ORCPT ); Mon, 27 Nov 2023 11:55:26 -0500 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 40433D62; Mon, 27 Nov 2023 08:55:16 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 4ABBA66072A4; Mon, 27 Nov 2023 16:55:14 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104114; bh=TyWnSNSrmM8e46vPb9QIHFcmc4e6SFgOyK7FFQxtbXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Err5SscROifk648ZJExh4TQcnejZoFk5VctUstRXFW7HD/aTCrbJQJX8ZSLDvvyRL MQLLvghzMeFsGURIpqImWeUvuqVd/eyR8Azsb4eHTgSWBKOUcyPuPWfFnhvWe/zshf a0DtV3EBKK37x+NgmCtrbbdsIevIEP65WtQyWnxpmnRZq9ZlZ3eemnDf+sWtBRIyCa rttpbZsQHyXxXKX2GYv69QEk3eyMnHYeAYyQp/VaT1vJJpl0TRoFihbCrCg1NzoNao rFxqDtpQmDWOg0mLYj8078e7FMg89rwT+n01VTwqP2Jy1V9cqPCCXEK006LM0k7fZN 5qi/QTyW5oC8w== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Dafna Hirschfeld , Laurent Pinchart , linux-rockchip@lists.infradead.org Subject: [PATCH 12/55] media: rockchip: rkisp1: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:11 +0100 Message-Id: <20231127165454.166373-13-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.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 (howler.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:56:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737048318880527 X-GMAIL-MSGID: 1783737048318880527 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. rkisp1 driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Dafna Hirschfeld (maintainer:ROCKCHIP ISP V1 DRIVER) CC: Laurent Pinchart (maintainer:ROCKCHIP ISP V1 DRIVER) CC: linux-rockchip@lists.infradead.org (open list:ROCKCHIP ISP V1 DRIVER) --- drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c index c6d7e01c8949..de3d89b1fac7 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c @@ -1431,7 +1431,7 @@ static int rkisp1_register_capture(struct rkisp1_capture *cap) q->ops = &rkisp1_vb2_ops; q->mem_ops = &vb2_dma_contig_memops; q->buf_struct_size = sizeof(struct rkisp1_buffer); - q->min_buffers_needed = RKISP1_MIN_BUFFERS_NEEDED; + q->min_reqbufs_allocation = RKISP1_MIN_BUFFERS_NEEDED; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->lock = &node->vlock; q->dev = cap->rkisp1->dev; From patchwork Mon Nov 27 16:54:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170295 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286550vqx; Mon, 27 Nov 2023 08:56:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IHMguFLnKIX1poTtsqaYwMrhb01qlV/wrrFbyLkO+4C4l96hZBb1HKyyvhtc2sBKmFP+1p9 X-Received: by 2002:a05:6a00:2d86:b0:6c3:7978:f82f with SMTP id fb6-20020a056a002d8600b006c37978f82fmr15878764pfb.9.1701104205143; Mon, 27 Nov 2023 08:56:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104205; cv=none; d=google.com; s=arc-20160816; b=JtfSuhAq3IHlR4wAO50w35amQuloPrEtKmw72AYHHHn2j2K/YrQLvwEKudR6m34jOQ NqmthcfxXxMrKkfJfjP+QwHv0alBBN3rp7PeIL3AI0UkmpV+ierHxjdGHp5ledqCaMi2 pOA/I8Rv2JTQwMMqvj3XAxuzCOjILbuVjZGm6pMZn+Py2qEqQDoEIsIWZvTiR6HxN3Iu R3ug7DUjgIjz4EMhpRbDQHW4etpsTatqp1bRQw7T4Mfh6QMfY1T06Y8OE+fsikKq/nxh 7vBoZr1GlBUCqikYsd7iOvVhRUxH28pdqxgXU76me3yiX+LU6Qulo8KOtzON6+mrYrE2 Y1Og== 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=a7nZ1PRDitkCqjBHsaihCPuzInVMEyteoLUQpBrHmOk=; fh=XADoe4SDokwAxxVUjMbPMzOPT1Su1y27+I89Xw5yMIw=; b=xI9SNf2pPi40Brk1CpQBLEr2I798O0V7tc/wY5FTSujNPkmnGJc4mQPUPK4h4EV/6N aanjjuAPM2QcmxPiS3YDSrx3AjlLju3eHMyjN1N8uszjNanENDHSLfbXBBgMYqZdBGdv F0szJXeXQDCS8wKr8NazhmGI+W4h52+S+5iimeea59UGMnN3Lahjrabr1fNN5Jk8G84z y+6SlxhZ4BvHIs6LbrndiRJ+UbTylMi1UkI0yBE6PP4tK6U0W6YpQS77ZuSbZOAGlCdr 1G0B6yswXWwXHEKMYwaOjhy7Sz1K7Y0TDGzVOFXfNNWI3HJhFs4/pFgEdF/ncytuK1Zb k+Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=aK5Jnza1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id k10-20020a634b4a000000b005c1ce5625cbsi9967001pgl.232.2023.11.27.08.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:56:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=aK5Jnza1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 52EDF8158319; Mon, 27 Nov 2023 08:56:41 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234368AbjK0Qzg (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234354AbjK0Qz0 (ORCPT ); Mon, 27 Nov 2023 11:55:26 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1975610C3; Mon, 27 Nov 2023 08:55:17 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 1F6F46602F16; Mon, 27 Nov 2023 16:55:15 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104115; bh=aaWCiqdk39sHKKb5QCMsk+ktnGuP0FZaTGK54tWrHxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aK5Jnza1wx5sBNowajBeB5DX02ljyxjC4c27B+SImhywaxDxh9iCWLMyGA6/UTFrH HBZ4/iQONttHOownb4AKM+IHPs/4xfuQxikg3zgIwYVlxg04TAra+pMkvVpzbKpNWR iqxH2MQ7+vOr67hiT9DknWQebgDsWq6NEk9vRDN4zSygZkXgQThE1ES8F32RI4TScb 4NiwI1BHAodRWKJmi8XWytuFZ6QVBJUsYU64tamXX/goCVjX19CYKQGlXiav+HheR0 MxlIiIo1fwqnPjis8aD9W9KSfAUC8QxT+f4twZUoucK4OU9AzD2xVEQCvwk62b4+8A b7e83ngdHNcvg== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Eddie James , Joel Stanley , Andrew Jeffery , openbmc@lists.ozlabs.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH 13/55] media: aspeed: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:12 +0100 Message-Id: <20231127165454.166373-14-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:56:41 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737042786466833 X-GMAIL-MSGID: 1783737042786466833 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. aspeed doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Eddie James (maintainer:ASPEED VIDEO ENGINE DRIVER) CC: Joel Stanley (supporter:ARM/ASPEED MACHINE SUPPORT) CC: Andrew Jeffery (reviewer:ARM/ASPEED MACHINE SUPPORT) CC: openbmc@lists.ozlabs.org (moderated list:ASPEED VIDEO ENGINE DRIVER) CC: linux-aspeed@lists.ozlabs.org (moderated list:ARM/ASPEED MACHINE SUPPORT) Reviewed-by: Eddie James --- drivers/media/platform/aspeed/aspeed-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/aspeed/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c index d08aa7f73d4f..c28b10808cda 100644 --- a/drivers/media/platform/aspeed/aspeed-video.c +++ b/drivers/media/platform/aspeed/aspeed-video.c @@ -2034,7 +2034,7 @@ static int aspeed_video_setup_video(struct aspeed_video *video) vbq->drv_priv = video; vbq->buf_struct_size = sizeof(struct aspeed_video_buffer); vbq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - vbq->min_buffers_needed = ASPEED_VIDEO_V4L2_MIN_BUF_REQ; + vbq->min_reqbufs_allocation = ASPEED_VIDEO_V4L2_MIN_BUF_REQ; rc = vb2_queue_init(vbq); if (rc) { From patchwork Mon Nov 27 16:54:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170290 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286371vqx; Mon, 27 Nov 2023 08:56:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IHlsOTvIQBag55rQSVDGK62QofhyOS6s8Zo1/QEBZTVyzFPLLKUtq+FEeyMAfBe1LI6vah2 X-Received: by 2002:a05:6a21:a5aa:b0:18c:35a5:e3b6 with SMTP id gd42-20020a056a21a5aa00b0018c35a5e3b6mr7656490pzc.31.1701104190197; Mon, 27 Nov 2023 08:56:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104190; cv=none; d=google.com; s=arc-20160816; b=UZttpHJ5afCCn8nF4gP7WvKC4qNp7k+udh/kV8OJDESBp9h5MWECkLGoriANwd3+ab NJQK1KXwP/v+kEVBoah0dopC4ZGDGruYzekd83LUoH1tTtUMfWJCM0Mr850JD51rFeri qBzwswQIgb9yEurd9IKbfqAfPWOmsY8DadLpeZbM/+PjuzgY9j3MH7+GSG6OE4uJbn6A uwGc65IkbGap8xhI8vZAfSfiU2Pi7AvY3jz1ctIIStZYBdud2Yila5tXHmqSOe4rU98o rJBTm2h8f7xErTVIiSHih+S62XewxxOGuBtE3TIjWDxNZos4lN2mwemov/yyQYo38+JE Hs4Q== 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=dpcFK+jcO3Q5qSiLbqnlv/bkacyv1jLyDsiO6mCC1S4=; fh=oTBxGcRaftrfJQcSJqf1JrjXWq/M+yCOtUYEywDUzy8=; b=x3TlFCWyyT8D4KBi0FiBv0AxTGQa+3tyGGXe5BtKSt+y+pBWDM7H/2p/9bLhpHzyvl Cq1IPlSTytFqL0FlHdofKEO3XkoSiOJHH+xa1ws27Hq+5iJK7xINl1DIcu6Tvz5oRStx BMnaURHC3c14sNEh3jbpH9yP8h+6B1E04ZOPaeliCESzyBfB2j4gymOd+x+bzWR7N6N2 ByluLrv4jnh7alYVRTWqvLEXFtdar5OSL3mT9jRdrSwADPBh2z0UYieaWx/OmNHR0GtI Gt/kgE9CM1owAUbDbkbNer6ytqTtFpbnnth8ERuyL69yfqhk98J1SVI7fiopJkhq9/yb Nyag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=b8B91Hpy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id 30-20020a63155e000000b005c207717411si10183692pgv.864.2023.11.27.08.56.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:56:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=b8B91Hpy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id 019128096469; Mon, 27 Nov 2023 08:56:23 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234401AbjK0Qzj (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234360AbjK0Qz1 (ORCPT ); Mon, 27 Nov 2023 11:55:27 -0500 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 BD99A10CB; Mon, 27 Nov 2023 08:55:17 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 0568C66022D7; Mon, 27 Nov 2023 16:55:15 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104116; bh=0IW6KaZQ66ctszxERd9LJZiesOlWHkv1oaN5vdBxTOE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b8B91HpyP1Sf3w26/2U8ec9vYjPCdDWxjffLbFaIVAf32m07JWcjIgLw5l3GAN7zo dP6Tb/ovpk5XARCckipAA4Kq1UAslwqwcatQs8OsqO1RRZGaLMtjtO6ivnn4lVEZXg i6zDH8ehUe5HYPKQO7UVM78gtz9SE7IelAHYX5xM81s2CeV/KKghxucusWIH1VoW1x fW3Q14aGoqr1bj5JRO1WL75XK2MBkQ0qZxCPVXSd/tPpxa5jmYj7C8INRJn6KPJ8/y J5pj6QCauCj68sOV9mhlXmlnst2Q01bVkOCxkTj1nMdoc3GTnUo8j6oD+U0TAu2osD pATGmFRvNPJog== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Eugen Hristev Subject: [PATCH 14/55] media: microchip: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:13 +0100 Message-Id: <20231127165454.166373-15-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:56:24 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737027537005094 X-GMAIL-MSGID: 1783737027537005094 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. microchip driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Eugen Hristev --- drivers/media/platform/microchip/microchip-isc-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/microchip/microchip-isc-base.c b/drivers/media/platform/microchip/microchip-isc-base.c index 3fba0e2844b6..9bed33aaf36f 100644 --- a/drivers/media/platform/microchip/microchip-isc-base.c +++ b/drivers/media/platform/microchip/microchip-isc-base.c @@ -1821,7 +1821,7 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier) q->mem_ops = &vb2_dma_contig_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->lock = &isc->lock; - q->min_buffers_needed = 1; + q->min_reqbufs_allocation = 1; q->dev = isc->dev; ret = vb2_queue_init(q); From patchwork Mon Nov 27 16:54: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: 170329 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288413vqx; Mon, 27 Nov 2023 08:59:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IE+2G1/7txwpCWU9js3SgvtVOuAfP/9rNmO1Mm2XqJNHPEDO2qoDZKY2JGswdEdrWSBGtZC X-Received: by 2002:a05:6a00:8c1:b0:68f:d35d:217e with SMTP id s1-20020a056a0008c100b0068fd35d217emr14382852pfu.2.1701104372506; Mon, 27 Nov 2023 08:59:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104372; cv=none; d=google.com; s=arc-20160816; b=V4KfPkQ2HrJlx1nRRR5UAlAJUbRP8xHHgfzR/IldATSk8ajPz4OBPgx3YFwsZgEC6g lq0jdwt7XGA6j7N/VGqcFNlL5w2gTk/GaL4QaEZJPOp/CjAONhjZyJ8mezAP86mIGBeX 6t4x7Wo2AvQAEI4d3GLt1b24TkZLNSeRoJyirbejuoVtqb9e1QGaKskJ7EXPRaalPH3w bar/rhhH6cmsS48+gqSUPr/c19UvNxTI/vjlUgXS+fwIL2qm+LAjHvnmsUzOsspxseEd 1YCLDphqv0MUWNWuixTbh2zBKYkezsGxbJ22pfGnHcfCMrr3D7ZysuahlbI+DjI6MBZG cJSw== 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=UmdKUKadjdEIzB7uJ8HYWF7S0NgQBcwHmEAMCq0az4s=; fh=hmt8g+YmcCjkgsJIFZO3Po9LII+duHmr+8PdaW3eCao=; b=PCVFMX0ydPeQREkHkXm4cEV6GA/zo5V/1Tm52GIQFBd9EyoLyE92/nLvmhmym4rAj0 c9kyDfRUg9/oGLKMCWnq5cp7iGBtCq0Kz7zMWm/8ZeIom+13Ws/CpYOav1Q/azxjftbw VcgJYPizHCDJueKWY906JuiZqVT1sGDUo2VrA9G4pbxA596+MDbcBCZ3CQlKLp4KY6hS f8j1CFvzPQ94ThaRqH7Q6eahTucBKS0XDtGej0m6Pl8up85YxcuAT2uZqFXbF5fotjfH Vx0QDE/QdmL+vxMpjy3Jf1iWQ4PJ3WysZnEouvLi8/+UKwgF5yfgQvLfEIWFHEpMqHjJ UOHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=jwt0rlRF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id bq20-20020a056a02045400b005bdfda8e04asi12262539pgb.733.2023.11.27.08.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=jwt0rlRF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (Postfix) with ESMTP id 11A548087258; Mon, 27 Nov 2023 08:56:47 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234461AbjK0Qzq (ORCPT + 99 others); Mon, 27 Nov 2023 11:55:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234214AbjK0Qz1 (ORCPT ); Mon, 27 Nov 2023 11:55:27 -0500 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 76868D6D; Mon, 27 Nov 2023 08:55:18 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 B5A7B6607285; Mon, 27 Nov 2023 16:55:16 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104117; bh=OM1rMpAHnewxMwYLehpH3RhyuQD/KBKxUNIY9psBF1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jwt0rlRF5iVZMWkF95dc1OcXj7QgqBO+VsnS6mYiSFfym4uFTTI8NqV4IKo9OAOi2 BgLUy2d833QU1yJIuPlXwlS4MBFA0HY55MFYS6lgkk3bHxkhwEx+xErqkm4ur/A1lQ ZQFyRw31dlwXCcpKi+xdvQu3FQ1q7jvp75h4mNw1JddQy/KM4X0qyiRy6krj/vCFiz qV+PnfSpf2z4ZGk2VYpG3gfqTTPxvbLCmsOlvjdqs+HmfiFd2UdukfBxHHAusTxRxt fC/ha/eaO4+z4Xh8XOtXPNbX9co2oTScIZl2imvhFlFYOZapLYuvQovGEXbJeQTMVC ria//pNugEYag== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Ming Qian , Zhou Peng Subject: [PATCH 15/55] media: amphion: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:14 +0100 Message-Id: <20231127165454.166373-16-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:56:47 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737218304060018 X-GMAIL-MSGID: 1783737218304060018 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. amphion driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Ming Qian CC: Zhou Peng --- drivers/media/platform/amphion/vpu_v4l2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/amphion/vpu_v4l2.c index 87afb4a18d5d..1e4c76032d2b 100644 --- a/drivers/media/platform/amphion/vpu_v4l2.c +++ b/drivers/media/platform/amphion/vpu_v4l2.c @@ -649,7 +649,7 @@ static int vpu_m2m_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_q src_vq->mem_ops = &vb2_vmalloc_memops; src_vq->drv_priv = inst; src_vq->buf_struct_size = sizeof(struct vpu_vb2_buffer); - src_vq->min_buffers_needed = 1; + src_vq->min_reqbufs_allocation = 1; src_vq->dev = inst->vpu->dev; src_vq->lock = &inst->lock; ret = vb2_queue_init(src_vq); @@ -666,7 +666,7 @@ static int vpu_m2m_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_q dst_vq->mem_ops = &vb2_vmalloc_memops; dst_vq->drv_priv = inst; dst_vq->buf_struct_size = sizeof(struct vpu_vb2_buffer); - dst_vq->min_buffers_needed = 1; + dst_vq->min_reqbufs_allocation = 1; dst_vq->dev = inst->vpu->dev; dst_vq->lock = &inst->lock; ret = vb2_queue_init(dst_vq); From patchwork Mon Nov 27 16:54:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170304 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286868vqx; Mon, 27 Nov 2023 08:57:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IGDimLXNGwkCB3dwa+n8j/MWCvH4xzV6jc/JgeNNck/IlE+9S5v2Rgxs0gyVE+EIxgMvgLk X-Received: by 2002:a17:90b:1b07:b0:285:9cce:a63f with SMTP id nu7-20020a17090b1b0700b002859ccea63fmr13122703pjb.23.1701104234572; Mon, 27 Nov 2023 08:57:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104234; cv=none; d=google.com; s=arc-20160816; b=ObPf0zIWXu8sRADqqnP5k79SdfHpVKBX6vUNDfoWWICboqorhxwQrxKJ8QTgQja45h jU9lZ54RJfeEjQUZgbcA0jztN9Yj5Jz3McX2vzOaGeV+Vtqcf6k1Y0c2LBLr141MSQgH zc61cappNhennqOShM08Sfr0waHyoKu9GQirbZlpHVN08bd41Q9nbKUtz43y4XfyusS/ TpVEX1WmmflWggfQXGclYr5MKFBstTaDEv582XQtGt2491O8ja8a/R8lPN7SZK6xTInP 5DZS8vPm8bJnmdF1WG35VphRyBzAeI1tPhIgo6u36KVAtPIEgEuCBPJlmQv4PBDMrCLa fXFw== 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=R7bdYxuHqrrYQldMBFTm0qNzsvoyKPpqKObAkfho0O4=; fh=H7hC7LKnmTWoFTtZMGJeAZcVR0zPF+9hBqhRytmaYvE=; b=JStMNjk1ZnhcBGXWGzKKz4UhxjBLkALVSxRatg9iNV/g55Qz+lHGk6UGo212TD0/Mt t27yUrPnsbjscb4ZHR/beHa1oYY4DGwZ/Y+WNzv3is3pF0mPlPS57TumKzJWUCoJ8PPD p8TNpcUe7xVwIrpsU8U+o077c14ukozO910+f9PsYiEWp8M76FI2BaO5NzazlagkidEO gDD1IW62s5fO5V8JRQ5Qz8XBgEJvVdGSqEZ7ebieSAeRA47wRjcqBW2UEo8ISI6JCahX 78e4BHXFW6N/QcMRFO/cN2sVrgKnU8Qr/XjRaUUmSB7/65SEfGkwXAiHpvnut3BDIIpK XqKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=BP2Op9YS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id a23-20020a17090ad81700b0028591f8bed7si7589103pjv.118.2023.11.27.08.57.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=BP2Op9YS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 638B380A2679; Mon, 27 Nov 2023 08:57:12 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234468AbjK0Q5C (ORCPT + 99 others); Mon, 27 Nov 2023 11:57:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234369AbjK0Qza (ORCPT ); Mon, 27 Nov 2023 11:55:30 -0500 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 809D710FB; Mon, 27 Nov 2023 08:55:19 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 7D8A1660734C; Mon, 27 Nov 2023 16:55:17 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104118; bh=8LPqvsmi32imvr5cq2qE0KlaUGmcLFqSO7T1NPpNe9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BP2Op9YS0D8zLzDXZkBB+NgHH/TGXZ9MorD82JkaLJ8ymyq/aAeU1PGiVadVfOBiA 1+WGnqLY2BHPT7t4KhKldiPUXMfophLaLmMPAChEVA/ei9A651k94l9phh08tA3SOh qAJxS/c3gArbOcmxMyTvvx1Obrx7zye7CwIqzmiYYEx26zMeywQWaDAhYb3C//Hn8C SuDCPunz4rsbACg5kCbGwGDKMBQftENynMkA8e+5hY35H0nLMy+chzScrgXvoZ38w6 p9Ayl4MAGbt6lN16Nvtgxxa+3Y9MWta+UDsJnpouNuY3QKxQ6aNf4qiHQRpMEV06G8 WTXTL8vHf24Dg== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Stanimir Varbanov , Vikash Garodia , "Bryan O'Donoghue" , Andy Gross , Bjorn Andersson , Konrad Dybcio , linux-arm-msm@vger.kernel.org Subject: [PATCH 16/55] media: qcom: venus: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:15 +0100 Message-Id: <20231127165454.166373-17-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:57:12 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737073896311801 X-GMAIL-MSGID: 1783737073896311801 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. venus driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Stanimir Varbanov (maintainer:QUALCOMM VENUS VIDEO ACCELERATOR DRIVER) CC: Vikash Garodia (maintainer:QUALCOMM VENUS VIDEO ACCELERATOR DRIVER) CC: "Bryan O'Donoghue" (reviewer:QUALCOMM VENUS VIDEO ACCELERATOR DRIVER) CC: Andy Gross (maintainer:ARM/QUALCOMM SUPPORT) CC: Bjorn Andersson (maintainer:ARM/QUALCOMM SUPPORT) CC: Konrad Dybcio (maintainer:ARM/QUALCOMM SUPPORT) CC: linux-arm-msm@vger.kernel.org --- drivers/media/platform/qcom/venus/vdec.c | 4 ++-- drivers/media/platform/qcom/venus/venc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index dbf305cec120..16b8d0dde10d 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -1641,7 +1641,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, src_vq->drv_priv = inst; src_vq->buf_struct_size = sizeof(struct venus_buffer); src_vq->allow_zero_bytesused = 1; - src_vq->min_buffers_needed = 0; + src_vq->min_reqbufs_allocation = 0; src_vq->dev = inst->core->dev; src_vq->lock = &inst->ctx_q_lock; ret = vb2_queue_init(src_vq); @@ -1656,7 +1656,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, dst_vq->drv_priv = inst; dst_vq->buf_struct_size = sizeof(struct venus_buffer); dst_vq->allow_zero_bytesused = 1; - dst_vq->min_buffers_needed = 0; + dst_vq->min_reqbufs_allocation = 0; dst_vq->dev = inst->core->dev; dst_vq->lock = &inst->ctx_q_lock; return vb2_queue_init(dst_vq); diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index 44b13696cf82..e399d01c208c 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -1398,7 +1398,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, src_vq->drv_priv = inst; src_vq->buf_struct_size = sizeof(struct venus_buffer); src_vq->allow_zero_bytesused = 1; - src_vq->min_buffers_needed = 1; + src_vq->min_reqbufs_allocation = 1; src_vq->dev = inst->core->dev; src_vq->lock = &inst->ctx_q_lock; if (inst->core->res->hfi_version == HFI_VERSION_1XX) @@ -1415,7 +1415,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, dst_vq->drv_priv = inst; dst_vq->buf_struct_size = sizeof(struct venus_buffer); dst_vq->allow_zero_bytesused = 1; - dst_vq->min_buffers_needed = 1; + dst_vq->min_reqbufs_allocation = 1; dst_vq->dev = inst->core->dev; dst_vq->lock = &inst->ctx_q_lock; return vb2_queue_init(dst_vq); From patchwork Mon Nov 27 16:54:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170291 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286382vqx; Mon, 27 Nov 2023 08:56:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IGbOqVIFPyik1Y2AkbW1imWC+IzeIE4QFnOVC0QLGQO/HmCSlm1VXUpPBs2e+3oALf92Gyw X-Received: by 2002:a05:6a20:2d0a:b0:188:1125:88bd with SMTP id g10-20020a056a202d0a00b00188112588bdmr19467586pzl.43.1701104191135; Mon, 27 Nov 2023 08:56:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104191; cv=none; d=google.com; s=arc-20160816; b=TAyDbYBwhvK0S5Mow5ANZ/K3EelU9XoJmnzMvdBzg9/105RcBrOWbxUJcvQV/CFHaa 9J+vAlz0mIoPEezyQwmNTyvW6UACXOXyv2Gf8wEQArOr5vhm6Yz+vY/eJQZWbmrh9n2P o642Lkjt7gcbaWvI9xRu8yQnHyfr1XwddQq+X/eYFFBUwqQzXH+znE8usWWHH1Dn5jvv vftjCakvZ5wNhoD9x26oFUMn5+J3lq5AD8rrFOFMjKtN0LX8BnBcefnGfl1aInGWt0+P XinPWGGCgjgrZG4HLbW6CrYrsY8K7qvu8abHWBfUG5SYgRyC9F4ZrDUa9C5mHSsXPBLA 1ryg== 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=dacwjV9GZ8fbusF4fqlg88GIJyDKYCvTV+c7K23zUnY=; fh=AJvajGurJww4MIiKHtF6oSDbh02msZyVL2eyE+ODfEQ=; b=UrjbAbG44qMBIg3f3zl5O3ZH+qLhWhgdi/eCe/GD6woNyMmqr84KDxjitxfY1tEc81 fWjJK7MrFzUfxMjRZwSvwxZmDT51YyMvnqqv6FIjD0xuDHUDqZCPrRGyHRtGL6BJAzws vBXE2ujeqcx4GfmXOXTdwVHKlcdvdM6KiVuH5awtK7o5jKFd5yC3JjQwS5JB4bSEHLoS Ec+5cL9YRcHHsHccJTSBvd0G42Q01SafeuKCWgug02fOySZgeqf9KWOyHtgb3hgISoOn p/rS00+lUJmQ4JzxWBKU0XCse2+RMImUvmwckyH8qub9T98YYo2/bTNLZbHa5b6oOfyo fJRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=BCsEkgRk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id t42-20020a056a0013aa00b006cb901a87c4si10514705pfg.376.2023.11.27.08.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:56:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=BCsEkgRk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 3A7888158382; Mon, 27 Nov 2023 08:56:23 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234650AbjK0Q4G (ORCPT + 99 others); Mon, 27 Nov 2023 11:56:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234351AbjK0Qzb (ORCPT ); Mon, 27 Nov 2023 11:55:31 -0500 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 D3E9519A4; Mon, 27 Nov 2023 08:55:20 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 7184C6607295; Mon, 27 Nov 2023 16:55:18 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104119; bh=nJOkOwWG7HAPg6iANkaE4/DJj5MpFIvKCNqxFpSa5Zo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BCsEkgRkF4I9+jKVaLVK/3afs96G/4+2+vyjv9QCBgA8jFRYWCAajIW3xxZETRBo9 tgAXP7TuMlICwajFzuuxxPjlfd1iWnVacLHUsfH1f/waR8rkWqVUnyNRRUgsMur1u9 cYcusOnwHTTJnAtWClQFvLYMcs4rCCIxFcdbouVKijEy1uCVut+hPm5bfhq/WaeXd6 jiMtIsdu/kerhiVahdK02NKYg3C4/SN5aTxb6KWs9ODpChLU/SZdSImNgujMG82jjh gr5cqbYm8yNCICgMFsvZsPuA5ulTFb5mNFRjUHiXl+vpvvagIntfjcxN+TRu6S3Hzd nnNt7JCp1E3dA== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland Subject: [PATCH 17/55] media: sun4i-csi: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:16 +0100 Message-Id: <20231127165454.166373-18-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:56:24 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737028448524178 X-GMAIL-MSGID: 1783737028448524178 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. sun4i-csi driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Chen-Yu Tsai CC: Jernej Skrabec CC: Samuel Holland --- drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c index 95b5633b7914..8f071cba2d25 100644 --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c @@ -411,7 +411,7 @@ int sun4i_csi_dma_register(struct sun4i_csi *csi, int irq) for (i = 0; i < CSI_MAX_BUFFER; i++) csi->current_buf[i] = NULL; - q->min_buffers_needed = 3; + q->min_reqbufs_allocation = 3; q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; q->io_modes = VB2_MMAP | VB2_DMABUF; q->lock = &csi->lock; From patchwork Mon Nov 27 16:54:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286721vqx; Mon, 27 Nov 2023 08:57:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IGczNirOikW/qgJgw733UJLGKXB2AJwEgzLulkn3j8tZ5RjwlBTcT0aDqcs+LBnVNsIYTWV X-Received: by 2002:a17:902:e5c7:b0:1cf:d5a3:6b0c with SMTP id u7-20020a170902e5c700b001cfd5a36b0cmr2828966plf.21.1701104220226; Mon, 27 Nov 2023 08:57:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104220; cv=none; d=google.com; s=arc-20160816; b=dleF6MPWicJ7Lz26kDJeKay/cTUECZ8gr1cx9gP8AHcJggtalP3pQaO0/oeBp5XgNF BOl8Av8NS49MVzvd0M9ru5gQHv/P2pu2Kgm1UZWqfDVnh63WaiF6YCHnPzrNUsfQvJaU wYtIXm4TAoRkyyoUijiVEjieUEeJKKknCwslPWn5+IPGo+ZUilpVzuBcJ0bujEiXZZCA cMCjqcpo8ltFeHOj4orhHF9pce2iI5McEtnK6c6zK0rS1mIeB0u9tTfyuLB43+jIgHrm Bs7HYGVYJNcOSv7FVhDPXzt3zyB+4uaweISGjES6R2iLHHSa+lMNuzHW4BgO30ysDwdE iopA== 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=hU+X0RUAC9esVidQ/yn/ESBumqnHQqVWpkWOugkfS6g=; fh=1G14ja0N/gmjq+ba9Y73sDvqtNnP4Tgplds/+tu011I=; b=te1563qvxVZ0EsYNmmNEDu/bwtYbHYEzViHBKXemAxSMHaNEz4f+bR0qhqi/fQP9BX fDrsd+vihoGOlZ0AkYJwtdaktVmu5ZGh+r6CKhSPL10Ka1jBhRgPuPssjlZYHvqheYj0 M4y8hEgUtTTu5ypkDZOmFldvlWLTUOgat/jbnglOGeYLGwGsv7A9o3eJBNLv2qGC+F+W FLP0eL5fDL7hQoz1XdlL1rqOkjorojD+tDvpZexaERC/Ec9a+BVAXLA0DVIvEr7zPiXB eH5QwGCgupUThF+PuneLz5r69PEc6JG4Tck/ZMAKYeoB62PUYcONR3rCmirqpmosOJLZ /+5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=XBGt7xdM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id a24-20020a170902b59800b001cc4689a51esi9712215pls.37.2023.11.27.08.56.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=XBGt7xdM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 46AB880A22E9; Mon, 27 Nov 2023 08:56:56 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234192AbjK0Q4Q (ORCPT + 99 others); Mon, 27 Nov 2023 11:56:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234445AbjK0Qzn (ORCPT ); Mon, 27 Nov 2023 11:55:43 -0500 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 EED6619B3; Mon, 27 Nov 2023 08:55:21 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 0D86466072C1; Mon, 27 Nov 2023 16:55:20 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104120; bh=QToV8lElzrqp6zWG2/Ij9Fy7YYCaGPBAPbmtKiSOV+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XBGt7xdMVEDvZuVk9Ad14jb83KoEdPpGetmdJSap2lBA2z5MJ403Xorerc4Bnbt1J fMUQrg/YddUn0oxlaDoWJ8uL25YiWdqYKXzah8zc76vIuqATvru2IgmKIz3v4O/GE8 md/ixY3FvptKrTjOwT0L6St5UlZvDV4DWTKm6ZOPPpwrEprsmKVRAnQBjz4wtiaNSp U1QUNctewxrMvCLj7IzvCbP3+xTxNvobqU3TZAnO9VZr5HD77oypyU6GEzcibztO5b p4Cat7dlxH/Sx+i9JGbFd3+rIlZJTGjE8ouelk/vcaO0fw0hSNhicljgodjU1Bw+x5 uBbSq6hrdGDEw== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Chen-Yu Tsai , Samuel Holland Subject: [PATCH 19/55] media: sun8i-rotate: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:18 +0100 Message-Id: <20231127165454.166373-20-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:56:56 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737059030162267 X-GMAIL-MSGID: 1783737059030162267 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. sun8i-rotate driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Chen-Yu Tsai CC: Samuel Holland --- drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c b/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c index 0b025ec91826..14cd0afd7c6a 100644 --- a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c +++ b/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c @@ -536,7 +536,7 @@ static int rotate_queue_init(void *priv, struct vb2_queue *src_vq, src_vq->io_modes = VB2_MMAP | VB2_DMABUF; src_vq->drv_priv = ctx; src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); - src_vq->min_buffers_needed = 1; + src_vq->min_reqbufs_allocation = 1; src_vq->ops = &rotate_qops; src_vq->mem_ops = &vb2_dma_contig_memops; src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; @@ -551,7 +551,7 @@ static int rotate_queue_init(void *priv, struct vb2_queue *src_vq, dst_vq->io_modes = VB2_MMAP | VB2_DMABUF; dst_vq->drv_priv = ctx; dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); - dst_vq->min_buffers_needed = 2; + dst_vq->min_reqbufs_allocation = 2; dst_vq->ops = &rotate_qops; dst_vq->mem_ops = &vb2_dma_contig_memops; dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; From patchwork Mon Nov 27 16:54:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170300 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286762vqx; Mon, 27 Nov 2023 08:57:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IGXC0/70Vsq5zvvQsXq0WoTKVhT0j9h/EBUGbFNxOUY6EcgqA//jda5WYywNUZKIIctP5fJ X-Received: by 2002:a17:90b:4a03:b0:285:6f70:3e02 with SMTP id kk3-20020a17090b4a0300b002856f703e02mr14479360pjb.33.1701104223676; Mon, 27 Nov 2023 08:57:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104223; cv=none; d=google.com; s=arc-20160816; b=KcDEtK2N9qpti8pSNSwve+ndPNkB1o89b7rs3p7Nt0AbG1I2cu4VQ4Na8bX/b3vCzV foKrUHmGUBuNrsh9ukoYgioTqscQze9SrNhef00NW8oJAKhPhbktgQiX8o+fbDldHXin B0BzfwWMeY3yU2GFRKta/gv2eOx8eJNGr/6HuWDkT+LqW2TYRwsVIcW/iM+WuAVLQzgA 9B5EIFtC74sN6V/RwIPIDstDq8qUwnOeuOo5SG+3Wf0D34LwFsdDd/bStuhvUNI657hs 9snYQCQ1SrQvC1t4wTsAny2LTHryPRg6qCg9BYQcG/JYJ9mO+gwiRiQR6lBB8CiobrVJ 3pOg== 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=veurVNi6s6aoa+f1h1oB8b9G9+kFGgAmw5qlxaQt2EI=; fh=AJvajGurJww4MIiKHtF6oSDbh02msZyVL2eyE+ODfEQ=; b=GDxYRt11/rUnIKQu9cU6QCQKRCSgVCYQNuXJmMFv6qrpIs+rCz3wi7iYKLkO4pM1k/ iI9c7U186r6xDQ5KiikUTkkJIAoRhlbEiqNBP9iO4zjw7jodhEYhsEOlURg7STVSvGUd L5iVJ0khaTcxoRyyu4nhAZbhDmfXLMSYLxOZ44UsASs/xQHuexoTbgKfLxG8vnmYqq9v 4Z6qJ7+UkaxJ9tXIRSxiYRMcmv+/Rn6tqGSIC8pSfIAfwr3UwyEbQZMS+inNea2kfNPk Oymt1bEWDMvMznR4qmw7Mg0ejbXl23cBaKt/Yu29HaVML844Srl3R2Jzi9zT3KDo37J3 RsxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="QmkVCU/m"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id a9-20020a17090ad80900b002802f5bf238si9849781pjv.31.2023.11.27.08.57.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="QmkVCU/m"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 28B1B80789F9; Mon, 27 Nov 2023 08:56:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234388AbjK0Q4U (ORCPT + 99 others); Mon, 27 Nov 2023 11:56:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234448AbjK0Qzn (ORCPT ); Mon, 27 Nov 2023 11:55:43 -0500 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 E358D1BC0; Mon, 27 Nov 2023 08:55:22 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 C8BB06607314; Mon, 27 Nov 2023 16:55:20 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104121; bh=Gl50yamOqxp5F3J61bdrX38ELoxqbgPRLIk274ynKbw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QmkVCU/mNHbH08K2PA2jaI2xpeSxJuOOVrVYa9HY95R21gu5GweBdW7pOdRQcH8sw 97ZkaSuMlYvGcvZWaIfkrUeK33oPvy53N5merp83DLt/CUymdW3Sdv986VTvkfckbY BvQudmhzSKODBZ5dyEb6bSpshQR6PoiBmaQ6biGTlhD3/RgJK9mtSDxhHZ6CRWC5PU b9oleh9GiLzNgSFmVOKJ9Nj3xyRbK0toNby8SYUtxVwn9+gx8kpTovWdSkHXfcOf36 aKWhVZHgm9eW7jxcvb8bZMqte8r+rePL7h6ZehDPaKj80A6YWzn7oAUah6WqqOhnNc 5tseHh0k29+8Q== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland Subject: [PATCH 20/55] media: sunxi: sun6i-csi: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:19 +0100 Message-Id: <20231127165454.166373-21-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:56:59 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737062044571274 X-GMAIL-MSGID: 1783737062044571274 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. sun6i-csi driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Chen-Yu Tsai CC: Jernej Skrabec CC: Samuel Holland --- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c index cf6aadbc130b..73e721936d27 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c @@ -1010,7 +1010,7 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev) queue->buf_struct_size = sizeof(struct sun6i_csi_buffer); queue->ops = &sun6i_csi_capture_queue_ops; queue->mem_ops = &vb2_dma_contig_memops; - queue->min_buffers_needed = 2; + queue->min_reqbufs_allocation = 2; queue->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; queue->lock = &capture->lock; queue->dev = csi_dev->dev; From patchwork Mon Nov 27 16:54:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286810vqx; Mon, 27 Nov 2023 08:57:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IGi1QhEZOKYv7BInRjNvL/4vp5eVRBdCeU2N6fH8285bfeIG3+WImVBJ04eQFuGocdDZ2ET X-Received: by 2002:a17:90b:3504:b0:280:5b33:d30 with SMTP id ls4-20020a17090b350400b002805b330d30mr13255706pjb.44.1701104228986; Mon, 27 Nov 2023 08:57:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104228; cv=none; d=google.com; s=arc-20160816; b=FBwBmaKInn+gdyBLOZazO63QgbLxgEn2dDFAUov46rkgetRjWOpWL7AN+3aQiBpKyO S51ShrMNt0b3HoLlB/Evj/82odwAoAGPzXeaOoVgyCsQqEl7VQtvU+GAxZrGevYnXc1e glmt93LkLgJ5xAQcwPDOHGMYm1r8BNN5TTo4/QzWIW4lSLDwTt+m786TYfO1XTkFTp+g 3huns4ViTZF88OXM0Iu37s+OPjKIt4u3fRc1GvVkE9ucfjSEW2zG5T7xrwAqlyQMLRdS UucvKrtDI4n7Jbtw8ssPs8pImSKRRkEGn3rG2xB3MuaayzIr6Ulg/IUYxCha4o0LLSWg dmGA== 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=s85Lk+29LziFIMEI0Bj41m5lt3osUaPcMsm7NOkdxoM=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=fkHTWVT372jWFKZU1pSsGmSXKmYKGlC/ioVOHq1pvrdnKLwK6e36rbBIL3Ik6zWAJx SWzkZXrd4NsQJKnN2CTsU+fANE0fKj1Y1tLwlDSCPiMpnrAO/wiK0/lL9woN2tMiG0tq 1GhcoHQhFGOfLPQ4XHV7sMp4w+P4BbAwlBEU1+CLtvX0bTcvKSDGjSOvLaUjYZsGarvc sHWMdA9bo76NnN8fi+daSY+uk/9fB2sWc/owVMIn55xgarRmLEv3RKqDtnbH7BdRZ+6z NcNjN1aHmjWvq5OQ0at6qYWsivHX8SGgH6qjdQHFGN+BQe1NclBrKGWgdaYaysk6MJ9a 9WOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="n/wP1EJ+"; 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 gb5-20020a17090b060500b00285e7d48fdesi843483pjb.4.2023.11.27.08.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:08 -0800 (PST) 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="n/wP1EJ+"; 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 7F7088098ADA; Mon, 27 Nov 2023 08:57:04 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234479AbjK0Q4X (ORCPT + 99 others); Mon, 27 Nov 2023 11:56:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234481AbjK0Qzt (ORCPT ); Mon, 27 Nov 2023 11:55:49 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 563E31BC8; Mon, 27 Nov 2023 08:55:23 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 98F9C660739A; Mon, 27 Nov 2023 16:55:21 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104122; bh=xU5t5lXDyNc7SbgcJxDjwWv/JGjLx2P5DrRCeKKrrB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/wP1EJ+piINx+lJsUpzunRoD05oSZyG2UdLFhXS653XIRx1GPz65n4PYYppZZNgN cLUA1A/P0pFwdqWCKcLN6I4JSg7/S+IlpKxsLgVDTItARf2zJWj1bYfc/mBwo2Lr3G asWjj47Ifceq5sLD/Ns5wh4XwmJC79uZR3gpaqGYXhEguFIfX+o0htikg1PuP1GkdG Etw45V7y4XIOpJxZFmAcK8lyDgwzhE3nFSLOQoMH+B2eEA4bQ4XSf3u088SA/5jdOS J/rU6r0PqfnUmGj4i1H0n2GDyuEta7yI9za38218FR3mylHZhyPQCRAzPgG1GelZHm JuK1J2F8WtY+w== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 21/55] media: i2c: video-i2c: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:20 +0100 Message-Id: <20231127165454.166373-22-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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]); Mon, 27 Nov 2023 08:57:04 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737068107775821 X-GMAIL-MSGID: 1783737068107775821 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. video-i2c driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard --- drivers/media/i2c/video-i2c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c index ebf2ac98a068..ec20849cd306 100644 --- a/drivers/media/i2c/video-i2c.c +++ b/drivers/media/i2c/video-i2c.c @@ -795,7 +795,7 @@ static int video_i2c_probe(struct i2c_client *client) queue->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; queue->drv_priv = data; queue->buf_struct_size = sizeof(struct video_i2c_buffer); - queue->min_buffers_needed = 1; + queue->min_reqbufs_allocation = 1; queue->ops = &video_i2c_video_qops; queue->mem_ops = &vb2_vmalloc_memops; From patchwork Mon Nov 27 16:54:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170294 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286536vqx; Mon, 27 Nov 2023 08:56:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IGgbK/gAevk4U8ZSXs/MC/56sczFlsxlh/rSu4rSP8APjh9KWN+Tb7IuxFpFfTtCINza/OB X-Received: by 2002:a05:6a20:430f:b0:187:6dab:578 with SMTP id h15-20020a056a20430f00b001876dab0578mr13247098pzk.40.1701104204132; Mon, 27 Nov 2023 08:56:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104204; cv=none; d=google.com; s=arc-20160816; b=PNr+MHAWkBQASHgfOrZv2PZGp8gjL0Fxj1Pagcr0X9D/oN0aBLYpNo9IdO3R1ec7Nk wuKK7YvQ55l797Pg2IEN5RpQncUjKtvar+z0wnXDJmkHcqBRAiDEUHQvDE0Aw7Tly9UA fFQcxd99NNvHEUtwFyPQmPUQBp35p5nl+21ZTBIRR7s29+9bTSDBz8Eh6+UOryri4n6I GJWvNvRCmH0uA2SXWYsGYK7I00m2a7iZb58yTA52LgZZW+E3EgSRHfyMSlXiC6KY3Lzs jrEcfobMNXvuy2kmu043gucr6tR81l0T7czYcKSEWT1ouww9ylO+4tyvghPtFzZEAhHU T19A== 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=iJxn6Q8+z+ay9hkTDlzR2SYep383opqOW5xdD/yFaM4=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=J5vgQ0OSGfnKZ9afMfrjDS6O6t1tBNiSlbA5t4WpTDnXuT/u+8rYxIsNZNLOuARjsa TKryZNDOE0wj3lT/Vni0wTmOssg39VlSvhPA/qjmKlkOG0Jev4D3u0oZGq5+1jSdWM29 1pe0vK88dRXidDf8Y5WYvbtopShvtc6wALHt9BWzpUDluls6If3LcW1j7t7TMEdga65U xOC9Oy7OdXf09F++rvg+DrhCLUzSNAVasSls1mU4qpXCqxV6biSWbqaVFNNrHHAzLaJd EeLKhIQmu7wuPG8NbJMR3BFkmmF+IIKlekp5L8c4u5o2ZIPz7Yip+BHgoekbqPaBMlmf mhXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=VwQOmNRl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id 7-20020a630d47000000b005c1754b3d4fsi10011495pgn.159.2023.11.27.08.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:56:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=VwQOmNRl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id D485C8075038; Mon, 27 Nov 2023 08:56:38 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234738AbjK0Q41 (ORCPT + 99 others); Mon, 27 Nov 2023 11:56:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234489AbjK0Qzu (ORCPT ); Mon, 27 Nov 2023 11:55:50 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14E951BCF; Mon, 27 Nov 2023 08:55:24 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 4C8D666073A4; Mon, 27 Nov 2023 16:55:22 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104122; bh=GzHBqgRhyPfMPwV2bftblzOdfFiQq/5ns8Cr3Xl9iGs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VwQOmNRlKbCStX02pa30QUDD67AudKdZI1SlNcUxNJACh3pt3K0319v5P/3pqBJ+/ rOCaSGAvVwD1fDvqioLcIjTLJkZzAHKeVHXXJyBQQ+acixMmcN2zWoKhK3ze/3YaaT ctl4B2rNH1jl1ZopwYPGmVbMGwhwZaWRwO7ywUPYTCm5+rmIek9NI7ghu3msn+HGIf hubiyhwkLYrFJ6hq7gZg2fxIjJ04DvQQvKVdbPfHdjVV7/zXBpGIxen5JDtlnvC9dt /r36BuglfcX64lvC9WyeGYXHvcM6LG77JbN1NiM0EvlKQKCyMP0MnsbTA6jjVX5Ciz 1NtkKacnCdDnA== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 22/55] media: dvb-core: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:21 +0100 Message-Id: <20231127165454.166373-23-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:56:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737041998149468 X-GMAIL-MSGID: 1783737041998149468 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. dvb_vb2 doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard --- drivers/media/dvb-core/dvb_vb2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/dvb-core/dvb_vb2.c b/drivers/media/dvb-core/dvb_vb2.c index 167ff82a6fed..e6253cc41ae3 100644 --- a/drivers/media/dvb-core/dvb_vb2.c +++ b/drivers/media/dvb-core/dvb_vb2.c @@ -171,7 +171,7 @@ int dvb_vb2_init(struct dvb_vb2_ctx *ctx, const char *name, int nonblocking) q->io_modes = VB2_MMAP; q->drv_priv = ctx; q->buf_struct_size = sizeof(struct dvb_buffer); - q->min_buffers_needed = 1; + q->min_reqbufs_allocation = 1; q->ops = &dvb_vb2_qops; q->mem_ops = &vb2_vmalloc_memops; q->buf_ops = &dvb_vb2_buf_ops; From patchwork Mon Nov 27 16:54:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170296 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286565vqx; Mon, 27 Nov 2023 08:56:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IHAvK844rxfnoxO/6uhFd4YsoW0jencvtkmGICRYnQjWKGS9ZfdYdQfji+eIbPcpYTGR+08 X-Received: by 2002:a17:902:d2cb:b0:1cf:ee3a:2398 with SMTP id n11-20020a170902d2cb00b001cfee3a2398mr274175plc.42.1701104207238; Mon, 27 Nov 2023 08:56:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104207; cv=none; d=google.com; s=arc-20160816; b=CPLkqcUVVcF79uiCfVKTn965ZdFgV2Qkv8Xbj5Hrjy3djQuAz5Js8w108Nj16D3Acp YPdo3AXF36YYWMNbM5KIBHqmO7u49tqK7+Ts0A1hdf2u1KOJ1x518OZYN/HaECkRfTlE xsA7tV+qnI+YmA8x3bKnCfLkOFqX0u1x3deMgK5QAbh5Z8ugnma5F3s5PmRtQwZByxe9 mg3lgOu3eg0eizoNi4VuabtxiXjblUB18AeOtXzng4z6q7euBQPWF37khtZ8tU+Uusk5 IquBrlmQrKIeSQpSy7WsqXfMyhpgkxN0iUmx6zVNHsiyIOomnMRGMZJWxGJEVfFSt7r6 vXRg== 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=ADI8VjVV8V4EYN4YnsNdJvskS23NQXnwZKDfsOil7gs=; fh=/Xvn0vQpphySb5WxuS8HmvvD+PZOyxDMUVOMoBZ/BGI=; b=cO+cn4EHoT2QO+8aNvZHYneEgqtz7+8nuCUVAfMVT7LBUWf8Ke4PzQLbB3xn5ZQBdr M5ZoIN3eBGtKTzggmEI8LqhgHAWgJYnqVddLJtG5TqxlFNIJxvsWjCJ41SrmIH5lK16L JCk5OlOJ2hp77p3JRxyALqrAs+HKEgz49K2mSD19EIchGx8lmPK0G0dqT+Ds6Hw7I84H sAIWk5HCfW+Rlg5RagDWmsi3Qcw2W2Kv5y8tCbkbKpbcjblX14rTl9aqq7hVRTvveLD/ 6GYstPb1G0EOI49+MCjEVnA/75AK0sw4nuN1scyoxOHGdz7jDyLkHicFRHHLk8npD428 w2Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=oLGIy3SC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id j33-20020a635961000000b005b966a6960csi10217195pgm.786.2023.11.27.08.56.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:56:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=oLGIy3SC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id 7DC47809645C; Mon, 27 Nov 2023 08:56:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234553AbjK0Q4d (ORCPT + 99 others); Mon, 27 Nov 2023 11:56:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234495AbjK0Qzu (ORCPT ); Mon, 27 Nov 2023 11:55:50 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 025251BD7; Mon, 27 Nov 2023 08:55:25 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 0260066073BB; Mon, 27 Nov 2023 16:55:22 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104123; bh=ORlm67uM5fv255axUnsY7LF5+NRgLL1FXRZ/tIF2QjU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oLGIy3SCfICUtd7xWL7fyPuo1zGdVydo4Iy1+Qb24tLeTC1ONiJGIXEqEKoRP5URg BZxpun+/9Ypo+UHvaC0YGQLXW6IDdw6noE1wfieLQqA1W2SYT+zfVUE9Cy4NNR1qjW /NUrisiu1BMMfcMIrj+x9dFAXL1HJ9Nx86NU7uHz1epUFpR3SbijDOj39E+WRGVo7D WI8jCSQbS7WGgQTUNaQInnERCDkcvyWOBterqwpgnx1kjzEI1FRUZqtF+v6sKFIYG5 H+0vpceGHBJmknKWFjeJrD6Y4LKijtNNq5lwLGlQptq7ML7DrTFGGc+gR0LJ+uUUvf iDjXx3yFLeT8Q== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Steve Longerbeam , Philipp Zabel , Greg Kroah-Hartman , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team Subject: [PATCH 23/55] media: imx: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:22 +0100 Message-Id: <20231127165454.166373-24-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:56:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737044980212537 X-GMAIL-MSGID: 1783737044980212537 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. imx-media-capture driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Steve Longerbeam CC: Philipp Zabel CC: Greg Kroah-Hartman CC: Shawn Guo CC: Sascha Hauer CC: Pengutronix Kernel Team CC: Fabio Estevam CC: NXP Linux Team --- drivers/staging/media/imx/imx-media-capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c index ce02199e7b1b..5bb1ebd35d89 100644 --- a/drivers/staging/media/imx/imx-media-capture.c +++ b/drivers/staging/media/imx/imx-media-capture.c @@ -1022,7 +1022,7 @@ imx_media_capture_device_init(struct device *dev, struct v4l2_subdev *src_sd, vq->mem_ops = &vb2_dma_contig_memops; vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; vq->lock = &priv->mutex; - vq->min_buffers_needed = 2; + vq->min_reqbufs_allocation = 2; vq->dev = priv->dev; ret = vb2_queue_init(vq); From patchwork Mon Nov 27 16:54:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170298 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286678vqx; Mon, 27 Nov 2023 08:56:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IF+pHP6RPKG+u7aZ+2G4R2Nd0kA2CgRxBklcyirUUocZ5mcDSGWloSo/9fNFV4rZqzu1RRs X-Received: by 2002:a17:90a:d98b:b0:27d:2663:c5f4 with SMTP id d11-20020a17090ad98b00b0027d2663c5f4mr16399657pjv.47.1701104216438; Mon, 27 Nov 2023 08:56:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104216; cv=none; d=google.com; s=arc-20160816; b=xQOc09KFOzqbYJ8tzDorm6NoEQTUhnYxueI3DS919tloC/tXUivqyFLdRXWpGDi3xx icl5vufVOlm4FqRK3i8m/SWtud+aQkaRGDHwchVynyIfwGlKQYNY8HsSzN5O6cALjz/v zkhl3XSsm8cmLMLVDXRS+eD3ohd2k49budqgPgt4ihXCGMn9oBdW4vKD+AH+TtNe7yAg xvRd4GkXvmQaupX/a7A2dB+Wrm8VXrVzSgDl6NLgTLTTyKyrpbUVzJp5tmeHUcyoEb0o Ne4ONm4YWKzBygdfMuB6VILJBfKiLFyI8ymiVArRnrvxHqJ1+6sOK49ZNmBV+vDmjW/w i9mg== 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=+4XwxGCRZJCdp6qkqE8kFCfZvzuuHfuT8/NVUQruYUo=; fh=p007ZZnBoIZCdm2IGyLxFZB1GSDa400lEu+i15yUK1w=; b=u8njVrYDILMfWL9WiOCX+hvqyVdou+kZJj0poQNiVe1ut60yh3UYNwZrwxsgCgl6mc q/qWHnGMnOPhSznAd5pgN2O0Cqd5AEkX5QWXGfWojQSQoi5alH5Z9w3+jmwlwvUg7KBP TDYZnXHY7hVtNn9Pc1S2q/mUINQInCxItFMRI9cPTtcPqmMKW+OKQM/+JUtRh16/QeYe 2eCSn1nvrQytPTX7TM2VOwGZ8UYh3qcjUbdIwl0ePXPHbd4U1IZKsIJQAjsUY6OexjK3 Hl3ITDEaIWYPZZLQr1u5PtJ8juiFtpPOkypaCzCxnfBfzgxONt+TXCkHMmsGUDJp0VRe cEkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="Q/A0oatc"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id d6-20020a17090a8d8600b00285196ac998si9712729pjo.104.2023.11.27.08.56.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:56:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="Q/A0oatc"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id C505580966C0; Mon, 27 Nov 2023 08:56:46 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234684AbjK0Q4g (ORCPT + 99 others); Mon, 27 Nov 2023 11:56:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234503AbjK0Qzu (ORCPT ); Mon, 27 Nov 2023 11:55:50 -0500 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 CCFC41BE2; Mon, 27 Nov 2023 08:55:25 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 06FA466073C1; Mon, 27 Nov 2023 16:55:23 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104124; bh=cnLy0TbF/AfysmCQDbLYpAUN3cPkSiq05OZ3x+S4YnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q/A0oatc8YQfUvE4g3WNR5Iwa75SEj9b1Z75m/AmFMsMVVf6lGEeItRKQ7yjbPJ5b JvtkRawLZ08cpIxRcnJqyYtSInPApW54sNBQRPDN//py4BFi4Cpt2GOGI8qKbXpUjX wXz5IEFgS+NMHvE99jV6OGzbkAQvJ9XGYxiBEGKBavIU2CUDjtN98+bQ1z2xIesq4p /j/nZGg4ysEhLjc1pE3f0sAaYLJfhJHi56DGddzeSWPwwjkv6GNk9qFQjy+e4A4yJd PRzqqFMTTjTseaIiorvCOUx+bHBye7+QiVw7uJ8jRbCOag7gQw+hekNAoy9sRqFwDO MzDjSBSwDfEog== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Eugen Hristev , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea Subject: [PATCH 24/55] media: atmel: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:23 +0100 Message-Id: <20231127165454.166373-25-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:56:47 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783736969193274449 X-GMAIL-MSGID: 1783737054833865236 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. atmel-isc drivers don't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Eugen Hristev CC: Nicolas Ferre CC: Alexandre Belloni CC: Claudiu Beznea --- drivers/staging/media/deprecated/atmel/atmel-isc-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/deprecated/atmel/atmel-isc-base.c b/drivers/staging/media/deprecated/atmel/atmel-isc-base.c index 468568b5bb7a..dbe611d03018 100644 --- a/drivers/staging/media/deprecated/atmel/atmel-isc-base.c +++ b/drivers/staging/media/deprecated/atmel/atmel-isc-base.c @@ -1871,7 +1871,7 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier) q->mem_ops = &vb2_dma_contig_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->lock = &isc->lock; - q->min_buffers_needed = 1; + q->min_reqbufs_allocation = 1; q->dev = isc->dev; ret = vb2_queue_init(q); From patchwork Mon Nov 27 16:54:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170305 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286957vqx; Mon, 27 Nov 2023 08:57:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IGjELMlr/etGBdM+76/CzWTT4GZlfTw8O1IssddRolEeJZ5+fQxM1/ltZQ8pxxI4mgs88OQ X-Received: by 2002:a05:6a00:2d96:b0:6cb:6992:4640 with SMTP id fb22-20020a056a002d9600b006cb69924640mr13251429pfb.26.1701104241759; Mon, 27 Nov 2023 08:57:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104241; cv=none; d=google.com; s=arc-20160816; b=vtFlgNi2G+ZpLCjZOUGGv67O5TfO1wAKTJXBM92FgEVfIPzEroKH1NuC4BmTYgQNcP 6/U4HjLdfY9VciPDYet0zg8hRlUFy6iptICg1cWbvRGnVNFv7JphF3wXQrfc6HSjUXCu j8ioc48fA/12KnToCt/mzQbq2FACMzL3lzd8NIRJbpZyFIjuvwpm29KOapmMs9tqGbXB Qc197KlPj2YoTHIIg9yvd7A3ZGT9FS6BWsgVc6K52G5zWJgtIvKrBWJR7g984RCx10U8 LQWnWFkcF8MqdwOkkS+8vtX3pcwwdK+yWX+oOaCAgTtItC8NPu8tYv9j7J4pMrAzDnwz ui5A== 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=1XNjA5g3U0JbnDTKlqfvTFEyE7v4Nf0ogJ8ykq5NAvo=; fh=kHaBZwgUF1FrZPBMSZEmpAMyWRf4p+095v8m4+7t5pQ=; b=b5EGWiNEH7TTzxXpgFD/xGyf3g+K2z66ekEyWUH5iKK+XQE3C75XzbJBt/1zm0a2kA pS6VgM2AhUWb+SBYf2mm0jcU+41+yAaf577GXfoa+X1AnvGEJVpOyyep+OVcWM+Bp8RE fE2QFt8S27aYqpDa9oXFdr6D2hFOYQOnJIXMJp8sjJL+iu+Y+ABAPpyKfPuWS6tIB+sb 4bT7h/8GRAFD8d6GJ7jQ4BWdhZcIRta7DbHh1SCCPTX/6fqKU5pVI0VbusKvdwweiokL iWm/nJtgNquQI5GmUUJ2tLzYDjBhLl1uO6NFpbXRF4SteO74FDRixAzkviWvoxP9ZyX9 G+rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="X46/hfSc"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id fd11-20020a056a002e8b00b006cb7f9dd0b6si10543417pfb.214.2023.11.27.08.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="X46/hfSc"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 2EB72809E73E; Mon, 27 Nov 2023 08:57:18 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234488AbjK0Q5H (ORCPT + 99 others); Mon, 27 Nov 2023 11:57:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234522AbjK0Qzw (ORCPT ); Mon, 27 Nov 2023 11:55:52 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB2F71BEE; Mon, 27 Nov 2023 08:55:26 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 D177E66071EF; Mon, 27 Nov 2023 16:55:24 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104125; bh=6fLuB21NqZHQ9MYfFVjrs/3zUstZGwJ8LCc0NS9LFcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X46/hfSczoQezSpEDoB4gMCxWcrCu/PmrdfIbxsUqXyLgcUdVBnZCapFmnqB78f/N Rkq0xLW3LBtfKdyUICWd/b22L5v1j8lzrc8Y5msfSqTshXC+m7zfUGixwUhDoCz7wh wtJi0FY7JsF8dAf6NKcZYSliw+At0lUQSi71uRC9PhERPgdTULw3A3YvhiXSWBliUU gA0Fvzm0vNwLT70tWOxUAbChhbJnIzkp/Rp1vwpHGUnJ6zDMzRdOtc1O1ObkkQzdVi NxoaXijoa0y2AxYoW/ASXNaHfye9kIX7lSDtOKvdorglQxUxcxLoXJVbTkboPYDrtS azWDc8ZE0l/Rg== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Sakari Ailus , Bingbu Cao , Tianshu Qiu Subject: [PATCH 25/55] media: ipu3: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:24 +0100 Message-Id: <20231127165454.166373-26-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:57:18 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737081663119677 X-GMAIL-MSGID: 1783737081663119677 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. ipu3 driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Sakari Ailus CC: Bingbu Cao CC: Tianshu Qiu --- drivers/staging/media/ipu3/ipu3-v4l2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c index 0fe2b858da83..197326fbcc2c 100644 --- a/drivers/staging/media/ipu3/ipu3-v4l2.c +++ b/drivers/staging/media/ipu3/ipu3-v4l2.c @@ -1198,7 +1198,7 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe, vbq->buf_struct_size = imgu->buf_struct_size; vbq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; /* can streamon w/o buffers */ - vbq->min_buffers_needed = 0; + vbq->min_reqbufs_allocation = 0; vbq->drv_priv = imgu; vbq->lock = &node->lock; r = vb2_queue_init(vbq); From patchwork Mon Nov 27 16:54:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170309 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287174vqx; Mon, 27 Nov 2023 08:57:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IFpuzMya288z3uQFdLpCzDqUmFZXJO5P+KuC2g4yvRJCV9ky2++XXQ7XEN3KTpgp7GdHEkS X-Received: by 2002:a05:6a21:338e:b0:18c:8fef:22d3 with SMTP id yy14-20020a056a21338e00b0018c8fef22d3mr4708660pzb.34.1701104261190; Mon, 27 Nov 2023 08:57:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104261; cv=none; d=google.com; s=arc-20160816; b=lIgqBtLf6CrOLgKPBkdmKJh/4EIQcRegEfA9i+vwFFbK7CXe1uMTD+Gm2wABCyw8J1 d4ZA/z9B1Fdz6ftAIzmlS8oz0+hke+epHanc6Xd65cegm4NZ2HPmVQb7r6kihl98QLwX 9mzkEgxFTmrgG4Wd/NOtVg5oJT/+POV8/vM01RbiC1XFnOZJ1lD8eSsNk/29JTbpMVnj Bl8dtVtfqVfsq6F41YYqpB56TExSIuYm7xCKMDNUvpV5yJkRjGBleWkd3rN66RGq914h HtMxo2HQLK5KWTKlGOO4/ULsKngXx4h1/78UdU75HBdUmrdEcLjHEQN6uZ0YcCFmN/2B qMTg== 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=SBNW/YJK6K2G+hVicyPPcdl/GrazYVOqhReu3lahIKo=; fh=F9Wo7Upi5maJ0HItWiuBb8O8KHF00eEKEUtSOxJDMGk=; b=WZiRU/C8zvEN0/tb/pIMNQ+PORAn73QpoiF/6f8QFTieENRh171FsisQrjA7gouY8n algD5trdLe84wD7tqpYMPpp/oiTJ6h/nRp55RlKLpNVVNInfoVT/DI8CyJYrNhYmrAjF afXJeof+Jh/L0/Fpg9KK2ur/NSG9s8UO8rOtj0lmLdgJn5yOj6XBBoYBAgnfG4DExlSG sHtRWrz8CnsduTNtfm52cDsvrmFq2UMVA0HlqKWvp6HihDFdPUqwyXSJkux0XTlGDrtN 5cE0hA1P7j8u1bfwvYO1NxOjAv7FzbzJbDSZTQ2jMG2dndnDeYvnxSVWOBhnDV3Rp1Dx Pm1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=LdlQSF8T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id c13-20020aa7952d000000b006c4d5ca7fe7si9773134pfp.366.2023.11.27.08.57.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=LdlQSF8T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 66D9180615CE; Mon, 27 Nov 2023 08:57:33 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232971AbjK0Q4m (ORCPT + 99 others); Mon, 27 Nov 2023 11:56:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234540AbjK0Qzx (ORCPT ); Mon, 27 Nov 2023 11:55:53 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF5231BF5; Mon, 27 Nov 2023 08:55:27 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 AA81A66073C8; Mon, 27 Nov 2023 16:55:25 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104126; bh=yTw2OYKem5rJF2Nwf34/Wc4CllCCaoPD56PNsk9nNiI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LdlQSF8TUQUtEtQEX4FNz/sBA53t5NMSXGsZ7LoAxMo5zdnlfbOxs1MNTBy1JrjfA xCwqsJ/8Kry0SJi3u6Dpp9FextBN6RG6fN9a32XVoqePLvzxR9KiFPS4D2pnePmpRo BmypuumCDQykRPHnKSYMKZ3yvhyHoGQMsiGEODDUbc28DDz4RoK1UOiY6oftKGz6fV AJv4rNy63G6mMHKUcxHfbHSVhpUYe2irMrL8EOccFCwsWd9nZOmnV3SBpgcSqaswfn k7tAGqOsC14HEO1SsGqxPT6+5Tqe3lTwQccVH8KfoH9wUw2pZ/f/LQJzU41nIRDLgb Vm6Zkj3oOjoKA== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Jack Zhu , Changhuang Liang Subject: [PATCH 26/55] media: starfive: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:25 +0100 Message-Id: <20231127165454.166373-27-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:57:33 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737102112841592 X-GMAIL-MSGID: 1783737102112841592 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. starfive driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Jack Zhu CC: Changhuang Liang --- drivers/staging/media/starfive/camss/stf-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/starfive/camss/stf-video.c b/drivers/staging/media/starfive/camss/stf-video.c index 0b305f21eb53..25038e37e8a6 100644 --- a/drivers/staging/media/starfive/camss/stf-video.c +++ b/drivers/staging/media/starfive/camss/stf-video.c @@ -513,7 +513,7 @@ int stf_video_register(struct stfcamss_video *video, q->buf_struct_size = sizeof(struct stfcamss_buffer); q->dev = video->stfcamss->dev; q->lock = &video->q_lock; - q->min_buffers_needed = STFCAMSS_MIN_BUFFERS; + q->min_reqbufs_allocation = STFCAMSS_MIN_BUFFERS; ret = vb2_queue_init(q); if (ret < 0) { dev_err(video->stfcamss->dev, From patchwork Mon Nov 27 16:54:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170306 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287117vqx; Mon, 27 Nov 2023 08:57:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IGi/M5UBUjyKROynW1F3KMIK6w57mxjDvQjLYRYoBbjKO2SC/DdAb7CNcAgai2uuTQrORvP X-Received: by 2002:a17:903:184:b0:1cf:bd98:633f with SMTP id z4-20020a170903018400b001cfbd98633fmr10000491plg.30.1701104255484; Mon, 27 Nov 2023 08:57:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104255; cv=none; d=google.com; s=arc-20160816; b=JQbnvkpQiqFYkeXNFxkZ2OrDkVyDRLY+U3qG2q2oeYv9Bta5y8f0QQEMByvyzfgngZ RV+F7agV/2Yfp2+lk3puT3IQ1KkpwvANQnypJ8LXnmlPzHAv92hP/ZFT5+B8bb8tESv9 OQ86aXWYx+2OGEmPBjk6Q2mE0i1zeh20Cwg4XK2uwVQk61VEKSnfFsfjzhsJBgLrIQhm x8nSybCVkmH4BR9wQ0PYMSJy47EgM3vNzJ3T/7Bo/34EMclTD4u/t9bFZKch3bAikK6X v5Jok2PKsBSpkwOmcUMS254nrLeMfPhxRY9X88Y26/dP2DCBiPwVvZOZoYUEIvLFnMkW sCYw== 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=4+ZaZqPZwgPild56G38jJn8a5yioVH70h4EBqMd0LDw=; fh=bQ/9cLuVXnxkmkl6uvGq10tPVYRHKGSQEztRUXZtt8Q=; b=AUs47mMJKOuWWQWV0NX0TYyOt+Ssss8VpI21Xa6FVuX7mdeDasRnkpjaczjXzcnB3L argx0GJ8xeTQ2pLRqP57izQKJgPX0GrHy+nVXj/MxHovJHbe0HxrGS8njy4ks8Ej88ts UE/+3A9C/l1wVRIAxdakwBaGyp9HlWye/lSyZ3v5omNF2oACB2Vmu1mU1ictzysKFEPV /LrOqP4ergNMo1vHj6qqmxfxxiAregLqO3mDldd0LIAzPID+qvFQikufH9B6jZw3vnEN EeA16/4lk/qlwh1Vmp0stmKuRKOpN4zCm2rrjFaoK91dtEKPm1SvVPCgYKqRy01NsDLr SsJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=AiG+Ejb2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id bd7-20020a170902830700b001c60c5bbff2si6784274plb.201.2023.11.27.08.57.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=AiG+Ejb2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 4CDF8812E369; Mon, 27 Nov 2023 08:57:29 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234418AbjK0Q4q (ORCPT + 99 others); Mon, 27 Nov 2023 11:56:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234549AbjK0Qzy (ORCPT ); Mon, 27 Nov 2023 11:55:54 -0500 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 7E9F91BFE; Mon, 27 Nov 2023 08:55:28 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 75A956607286; Mon, 27 Nov 2023 16:55:26 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104127; bh=YIgkAExbbbECDPnkaD6N0lG+VUJuWN8PC9JRmzX9TCI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AiG+Ejb2+mNZ23dQ58fH8HeFPy3hJ02mlj2Hi6rxIeY+Gy1a8/QIAfOk23U/takDW v6q5IkEXN2y6tQf+omLSLpcCgvsdNkad61xg1wUI87O6gd/fMVHJPt7beMBJxoFrzv o3zi6w3FT8MG0PcMXFjmkzio7deWNDtDOAOgQxgjwDHJYjxGTvkbAVGKotPtggFhjH nEwfKFLrFCHpdhjTGSVVIYW9HnpEUsKJSQJhbxaToNiZ+59Uk/fYnCZBuMuMOIXmHs 95pGFhjthjI/q+XLSrPOYxKfQ89KGXqn3gvvCg3f+9+VRpC04Qij8+Svm2OuMVLuVw WvZajJW/poNYw== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Paul Kocialkowski , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , linux-sunxi@lists.linux.dev Subject: [PATCH 27/55] media: sun6i-isp: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:26 +0100 Message-Id: <20231127165454.166373-28-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:57:29 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737095730867267 X-GMAIL-MSGID: 1783737095730867267 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. sun6i-isp driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Paul Kocialkowski CC: Chen-Yu Tsai CC: Jernej Skrabec CC: Samuel Holland CC: linux-sunxi@lists.linux.dev --- drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c | 2 +- drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c index 1595a9607775..f47f9946c19f 100644 --- a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c +++ b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c @@ -660,7 +660,7 @@ int sun6i_isp_capture_setup(struct sun6i_isp_device *isp_dev) queue->buf_struct_size = sizeof(struct sun6i_isp_buffer); queue->ops = &sun6i_isp_capture_queue_ops; queue->mem_ops = &vb2_dma_contig_memops; - queue->min_buffers_needed = 2; + queue->min_reqbufs_allocation = 2; queue->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; queue->lock = &capture->lock; queue->dev = isp_dev->dev; diff --git a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c index e28be895b486..259f6bfcb620 100644 --- a/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c +++ b/drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c @@ -489,7 +489,7 @@ int sun6i_isp_params_setup(struct sun6i_isp_device *isp_dev) queue->buf_struct_size = sizeof(struct sun6i_isp_buffer); queue->ops = &sun6i_isp_params_queue_ops; queue->mem_ops = &vb2_vmalloc_memops; - queue->min_buffers_needed = 1; + queue->min_reqbufs_allocation = 1; queue->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; queue->lock = ¶ms->lock; queue->dev = isp_dev->dev; From patchwork Mon Nov 27 16:54:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170307 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287132vqx; Mon, 27 Nov 2023 08:57:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IFwUjsIx6e5ieGzWqo9CUD9bJVgRIJwATC/GWiGPVywa6hAH3fEZvj3d9gjNPuV3iO29ohf X-Received: by 2002:a17:902:e546:b0:1cc:fd1:c85f with SMTP id n6-20020a170902e54600b001cc0fd1c85fmr13414315plf.22.1701104257047; Mon, 27 Nov 2023 08:57:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104257; cv=none; d=google.com; s=arc-20160816; b=ugWHzfp7lkr3OAFbzVcsxrCu043kQAuGKeiJhS9hB0ddA4vRiwY2QzRxdWfzse30f4 kw1L9fddy8cqlFp/8nYSkJoX3qP5nJbZOYm3ZdHrjgIgxtqza0YnM3xTpHAocQsEycDI 2zHsmceyb0ZJDzMOmgNKRCPnb2kvKGm2Cx/Nuro0aSGBPJESQ4l/cNhtZv3kMJ1KMHGu ibvN5OpZPeuEO46o+5dFhT/2wcm2drJfPaggy1yfGloJsxV/wXvu6N3HsgdmBaOGoPhU UUUABuj4TDcNd1OncCeEAvVdN812MDMtaUoEKH9tuG2UzayNY8pp0Pgym8j4j/kYRn21 9+Zw== 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=E8VASTGKYNzs0VNEa2tnexy5Sjle0G+s5PMumLCcJok=; fh=zm4txbpfUsJumpMlkWLe6vVGkxT95veg/rgxlf8o0Y0=; b=SnLetPbuaPxwJo1xyQ0bZ/cVv57JPW2VtWNAh31aZfOPaQmFm/XOIIxQG1TtIIuFJ5 J5ey6tD12agHnCPUR/hmNTdpnXCIU36OXOrOLFI0+dHF7Bn9pob9FKbPMYFrV2TxlvCA cz+pd1P7urSAkFvpz0uJSJ5X4jnh2jDJ0tjl6GaE8zY7b+BsmvieL4cwgeHQsJU/Ove5 n0NY4ED0vq7ORA3psuVb2GJhaEuEguHz4tUDZuFOuJo6goeBSpXV/UhVkyiEZBVwMzOW DuYk7RJ8okq4x9Dbh6a3wto9Sb4FeDuPehPQH7zBqYno52YWti3j5kcU46oJmpZ+2qsZ QCoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=k3YZYXRH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id t11-20020a170902e84b00b001cfc35d12f4si4109164plg.140.2023.11.27.08.57.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=k3YZYXRH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 9B887805649D; Mon, 27 Nov 2023 08:57:34 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234575AbjK0Q5O (ORCPT + 99 others); Mon, 27 Nov 2023 11:57:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234568AbjK0Qz4 (ORCPT ); Mon, 27 Nov 2023 11:55:56 -0500 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 4A6151FCE; Mon, 27 Nov 2023 08:55:29 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 5FE7666073CD; Mon, 27 Nov 2023 16:55:27 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104128; bh=PJOb0upzYk5sy+kA9Qk465u2DFL4NHA2Gb2jqg1/r/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k3YZYXRHqyULkbuXDy3Xg/N7u6yLlC9ch+gaajxQbo5EMxlKvmHEEU6TlyVFoYK/e tVgdrrRXlnj7YYHNo7+/hTVR6g8ifxG86PJXCsiOuQdYLloUVPh4pVrK/kr55HaXLa fZsUIMUastnZ2yqudoE2JxwbB1LQyDR3Qs749Y3OxoTuh+eS2k/Ci0JHpyPdISDPkr UV+sXv1ei8pw5aasuxbLqsi7898BCZJHC5C0E7cFIFLX998z42g5qaF43w1NMv4X+A l/52MGE0X34FEhPsa5u5g6W7EIgN7YW7DmwZicDihlQclalSrEGYQfpcvwuvWzFmQ4 /o9PEMC6M/zrQ== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Thierry Reding , Jonathan Hunter , Sowjanya Komatineni , Luca Ceresoli , linux-tegra@vger.kernel.org Subject: [PATCH 28/55] media: tegra-video: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:27 +0100 Message-Id: <20231127165454.166373-29-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:57:34 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737097617045729 X-GMAIL-MSGID: 1783737097617045729 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. tegra-video driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Thierry Reding CC: Jonathan Hunter CC: Sowjanya Komatineni CC: Luca Ceresoli CC: linux-tegra@vger.kernel.org --- drivers/staging/media/tegra-video/vi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c index e0bb59ee3c09..b8242c8c0497 100644 --- a/drivers/staging/media/tegra-video/vi.c +++ b/drivers/staging/media/tegra-video/vi.c @@ -1174,7 +1174,7 @@ static int tegra_channel_init(struct tegra_vi_channel *chan) chan->queue.ops = &tegra_channel_queue_qops; chan->queue.mem_ops = &vb2_dma_contig_memops; chan->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - chan->queue.min_buffers_needed = 2; + chan->queue.min_reqbufs_allocation = 2; chan->queue.dev = vi->dev; ret = vb2_queue_init(&chan->queue); if (ret < 0) { From patchwork Mon Nov 27 16:54:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170310 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287229vqx; Mon, 27 Nov 2023 08:57:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEm++ShonY7rf/qQlYIXvcPadysAXBKGxhACxhLaXjvbR+wH4sxn6huu6WteOxuFmkm96Rz X-Received: by 2002:a17:90b:4a90:b0:280:3cc4:f052 with SMTP id lp16-20020a17090b4a9000b002803cc4f052mr11699074pjb.17.1701104267180; Mon, 27 Nov 2023 08:57:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104267; cv=none; d=google.com; s=arc-20160816; b=HIOIaMhQhryfu8fMPY7TphGSOPASeSKN+E2VXye40t9RztnUtznOtGeO0wmaeimJSS bbvwIjrn7+JThxCXqF1wIwgxYDNg8/t/V4+BraQ2jJ4N88TKRhuc9XgsIqJZ93x2q4yR 4BOJKhN2h5Yp/gxjGTSmWhBVatYfTq9DGxJbx5/lSxA3RVXbKw8A26Kqix+ZdfBZh7PO kV7a7KtKxKv3sSLSTdsPEP3wL6aubcaxvm8NonG2Ut9Rauu48hkzAjFoULvodgSP1X08 7flcC+cRs0EwkUNZY7hss62uSjIFKfAdGgd9IpMIrh5r5M6goEmQp9uOe+RqfOuN8Yna cqPw== 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=fdum7wSltugB6w4S+a1kz9mLcK15nDPO0jA2/0NKaP8=; fh=MoA/KwnmaAdqA04K4vaZuIAl9GhCiDkX32OevKKEBOE=; b=0ubNKn2rb0ZAgQ7I/kJ5iIfteINmPXwqcVkMD/1yoHhWPfcdzjKoxsoRF9sPpSBZ+C P8P2vD7aUNnY/ymgLg6Atvz3PUXKmdQ6UrZigJnTI94zsvVaLGlCfHRwFwZYCvcRP3M+ oQ94EdY73IKpqzshV0v8x2rPKGqlHIVescoIOug6bNc7XUZXtb/Bf9I1gCCoWVcut5zK TJJKzip1nIN6SsE7xPWuQYQRcgwp2OiIWYJWT/06rDLQPZ2RD+3Txf6FgxiQfAovf3n1 SvEXK9sOp74AWtD2iWSUF2bfSM73ydcO9KsyIxBOeNJemKaXzdTXKy0FIj2FPtyj/d4U 6Ukw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=fRzBKxgr; 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 i1-20020a17090a974100b002859aae3eaasi6853718pjw.66.2023.11.27.08.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:47 -0800 (PST) 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=fRzBKxgr; 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 DA2E7809B738; Mon, 27 Nov 2023 08:57:41 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234603AbjK0Q50 (ORCPT + 99 others); Mon, 27 Nov 2023 11:57:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234606AbjK0Qz7 (ORCPT ); Mon, 27 Nov 2023 11:55:59 -0500 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 B75621FE1; Mon, 27 Nov 2023 08:55:30 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 4AA3E66073D3; Mon, 27 Nov 2023 16:55:28 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104128; bh=XHY1AINeJ9MzBkkr5zEpq1g8COVMpemGzWI4pwBIFa4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fRzBKxgrAEff3sfYNfYAcyeBEFRcIZrXZKo61JA9EDYMcbJwB04bk1fuUxcfcZ5l0 4tKCk8SikbcntXrdTatdABcMyFpWo/AHSfOmXAPdxgmjMeMMTZ2Rd4Y39aXZUHzjFy e/DkVwxYdtxfMHjP0WPzzxz9fUGk0gqJF8JKrYSG/7lNvd1ITu0XimopKmRxIKkBCB AVBshSRIqHZ2eUUTKzkGEpAY+v9NSwHYdmTcVpKWTI1nxps0VGnlg0fkWaJSalskuc uO5GWVmJdhhVLcCttxQ72Hq3bD1BwbKMg3Ya/9RYe6H66teaqherQjJTek9Sls/1Vl gjehpR0o3Ae9w== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , "Lad, Prabhakar" Subject: [PATCH 29/55] media: ti: am437x: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:28 +0100 Message-Id: <20231127165454.166373-30-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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]); Mon, 27 Nov 2023 08:57:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737107632973227 X-GMAIL-MSGID: 1783737107632973227 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. am437x driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: "Lad, Prabhakar" --- drivers/media/platform/ti/am437x/am437x-vpfe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/ti/am437x/am437x-vpfe.c b/drivers/media/platform/ti/am437x/am437x-vpfe.c index f18acf9286a2..c2abb7760225 100644 --- a/drivers/media/platform/ti/am437x/am437x-vpfe.c +++ b/drivers/media/platform/ti/am437x/am437x-vpfe.c @@ -2234,7 +2234,7 @@ static int vpfe_probe_complete(struct vpfe_device *vpfe) q->buf_struct_size = sizeof(struct vpfe_cap_buffer); q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->lock = &vpfe->lock; - q->min_buffers_needed = 1; + q->min_reqbufs_allocation = 1; q->dev = vpfe->pdev; err = vb2_queue_init(q); From patchwork Mon Nov 27 16:54:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170308 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287164vqx; Mon, 27 Nov 2023 08:57:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IGVg4cRVWAD9wENBtrqxh8h2AQXSgzLoLIAOKY7FWXgO3YP3XsfiJNiUXUlhugB4fxhcI26 X-Received: by 2002:a05:6a20:231c:b0:18a:181b:146b with SMTP id n28-20020a056a20231c00b0018a181b146bmr10273994pzc.29.1701104260169; Mon, 27 Nov 2023 08:57:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104260; cv=none; d=google.com; s=arc-20160816; b=i1qLBNkB4A2QF5wh7gt6BjBWSMCBrbBbfeuXJEWg4oXBTrW7dj1N03FAaow8eSoLtw daxsDoW7Y/SQWmd9ItmBfuUVMq/Vj8ERor7+SuZmUWWkPhpYIWFCC7vthLx4iFSCEiYx 5bDdsPz2EANEFEbQsa/LXgTEwehMIDM6Hi3sU8R7nYm8siC5BjKFA/M5eH5rxn+jINDk ozkTyNOtODk+YhkLEY76kUH4Ws/qmSdoF0IRSkkFy/ulzzbAf/utePl6xmse2ZWBDJxC EOIJ9r7QeokGqAP5kikW5zbQ44G8HOinmXDHQTCgDq/5s+MKGh73fqczzRHRprq9dt++ /Nvg== 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=YO8ZbCK4F96297U70V/VyU3CrIjv/eZj30bPJelfNO0=; fh=Ii5lzIwlPwiIG77j6pgmC0MBzqe9ZH9Q/2bd7fs8CXs=; b=mqYN3fwquuWqb+B+xRwKA7IzHfvJb2jUADll9uW67KQDsBvysxjQu5IUIRAiIVOa4v o7R67ulKKNRKFR2el6UST2G2/qfglwRNtbuulctVmPhTncYWSog+7tj//NAjgvJX2CG8 ZuTb9XvoWlzc0G4jRdhQvTOQ4wNhZ4nIOEHkdfD/AJbqo49+Ssxx+fudQAW95aGDXcEV ZzUi0DutwX+b3xOcHtVHNU7Eg67N1yv5+2MlUvbiv1zXF0hqPuKM2ncco5ElmpgE19jw MP4okOx6vAk5Zwh/nuZJ5J8frIY5v3OFhenjkgakv6jux+FuJXWDsLXbpDVSdxTXGH6I i8EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=EYVQNlDh; 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 g10-20020a056a0023ca00b006b3aded7e97si10751351pfc.305.2023.11.27.08.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:40 -0800 (PST) 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=EYVQNlDh; 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 15930822D555; Mon, 27 Nov 2023 08:57:32 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234587AbjK0Q5V (ORCPT + 99 others); Mon, 27 Nov 2023 11:57:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234600AbjK0Qz6 (ORCPT ); Mon, 27 Nov 2023 11:55:58 -0500 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 E09A51FE0; Mon, 27 Nov 2023 08:55:30 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 0844F66073D7; Mon, 27 Nov 2023 16:55:28 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104129; bh=3CZsTTbHLtC5vyOvtssRJvLsPSp78mQlLUyr4UEzOZ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EYVQNlDhTIxKDHnmG/Ekj99JD5kgVrukW22yr4FR3JKkFJU6WKYy2ELTie1khIxEW KyelEo7dOIjQRLCscyLgl3qFCVbux/fWK6ENMHTGzu0FdhiHrjucE1mvsXbMhWrGzL LGJ93g37lbE/Ky/0csRdacUDH2wGwJVi5FqvGJAl7Sy8EP2BoVrPew50Mmy29YMfN4 f7sDclJ3eyLKuP1Y7CHuq8iCBxqYBq9Cscoq7sAviNjetQpcbbBMizPSZev3xtnJBr T5IRo07rQWHE7usTvfd22nmZLmkOOGz86nuXUa8Y+evAoKVBarFSMqYIUBDH1HuSky 8/lu3VxwGRZ9A== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Benoit Parrot Subject: [PATCH 30/55] media: ti: cal: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:29 +0100 Message-Id: <20231127165454.166373-31-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.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 (howler.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:57:32 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737100636624130 X-GMAIL-MSGID: 1783737100636624130 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. Cal driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Benoit Parrot --- drivers/media/platform/ti/cal/cal-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/ti/cal/cal-video.c b/drivers/media/platform/ti/cal/cal-video.c index e1c5e68e945b..04709dac7221 100644 --- a/drivers/media/platform/ti/cal/cal-video.c +++ b/drivers/media/platform/ti/cal/cal-video.c @@ -1010,7 +1010,7 @@ int cal_ctx_v4l2_init(struct cal_ctx *ctx) q->mem_ops = &vb2_dma_contig_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->lock = &ctx->mutex; - q->min_buffers_needed = 3; + q->min_reqbufs_allocation = 3; q->dev = ctx->cal->dev; ret = vb2_queue_init(q); From patchwork Mon Nov 27 16:54:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170314 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287486vqx; Mon, 27 Nov 2023 08:58:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IHm83xegvhZq75m9ErYYuX2lZwQwvNu6vkXu/HTfpmBfC6Tv1eafTgb9KI0CAQJRlwNlV4A X-Received: by 2002:a17:903:2444:b0:1cf:da41:729c with SMTP id l4-20020a170903244400b001cfda41729cmr2508705pls.56.1701104292275; Mon, 27 Nov 2023 08:58:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104292; cv=none; d=google.com; s=arc-20160816; b=nvE5EXLZyq6KEtdjjaLQc/idXThBMDj9abcK4yMD6T0ubOsYfdWfE3Ji8RbxecHfM1 863+ak0pOBgzx9FDTM2uXE/Mex89cYMxkrN62qpzIc8Nxn/wMMk9mfKAE6GJLKNlv57w YF/a27ttaHamGoFoHWzZzv3G1ZXLiZ5P5bAjWmzhjYoQxpHJ/k1VWpDCg+ZHDcKIsADD 9OcqxyfgdwH23Q2R6W1b9X0csaA7Cz1ZaAoXimS6USYpo/A8Gl8VSd8ipPS3KgAOwPsK yg3Zy8BsaO2nDN9O6dw4acaGcfLnrGp8NjERbU/JKZNTZsRWi5XJMCWHDYFVMVfWBBDQ WnHg== 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=/g42JCkaBWEc/j5+KXREw+c4rxU/Bq4juX+Ct1BthFE=; fh=MoA/KwnmaAdqA04K4vaZuIAl9GhCiDkX32OevKKEBOE=; b=Xb/Z5+G8iGY57Vr9QpHmCgUL0z2s1IhoRgGwVQnVjhlBIg7zYCnCQdZ3VJ8FGroKc6 w1vfa729uQFq1b0yHm8GxFvuiydgNq/g9AuDto+SiMpG/koZOJiHFcKEcYaaPHBhxP3t W/NDrDglV93j+xCpczpgEjJHxhocJC7e0Zjad9FCn0GIV8RM2BgI6EESID8HwL+n0ZQR OKovhXY4oOGy3t/UEoxMqJ8q2gJjirBJCcatqIy04joARTz+/RJDc6K1flawmACEmjXm axI5qCZU4BTeiQeuHLtG0mdM2VmRXwGaeCYEFDOekYk2086G8wVsBe028KlwbRXaRLq5 oX0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=c2gVJHwe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id e6-20020a170902d38600b001cfa8f0e365si7024531pld.305.2023.11.27.08.58.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:58:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=c2gVJHwe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id D179980615C8; Mon, 27 Nov 2023 08:58:03 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234643AbjK0Q5f (ORCPT + 99 others); Mon, 27 Nov 2023 11:57:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234629AbjK0Q4B (ORCPT ); Mon, 27 Nov 2023 11:56:01 -0500 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 AD9D51FF7; Mon, 27 Nov 2023 08:55:31 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 C131A66073DD; Mon, 27 Nov 2023 16:55:29 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104130; bh=BbsAaug6qXnV0oQEB2d1Bjx3d9aAtffDIgQvK76wdRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c2gVJHwetDI8l8Qh9LeoES0puBKsmLoshT4N1Q4J0HFqUZsvJdXMzCeWySiDyD2aH fEnuewQHs1uGaY7lTSx/5Rv+wCzxQC016UImFRv/C7gRoj6ekuzB2siAL+kK9HhYsm rN9ECZQU5mxm5tyW7oMHUNKZLfSHfuuNzPU0ZX36ReJn4DFf2wGrP6U93jS9GupV82 vXnMYvVNVN2Q+KFKdzMlN2GGWiskyZnutsgS8ckxR+p8bcjpMhP3o2+prSP//8/szf HUerogHaXTm2GxtSm7bCQOlyzU8LKeFCuXrnPeWst9eDr4mC3bWMjKP3A1P71iFiCC +cV1CXLK5mNpg== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , "Lad, Prabhakar" Subject: [PATCH 31/55] media: ti: davinci: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:30 +0100 Message-Id: <20231127165454.166373-32-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:58:04 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737134409746263 X-GMAIL-MSGID: 1783737134409746263 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. davinci driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: "Lad, Prabhakar" --- drivers/media/platform/ti/davinci/vpif_capture.c | 2 +- drivers/media/platform/ti/davinci/vpif_display.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/ti/davinci/vpif_capture.c b/drivers/media/platform/ti/davinci/vpif_capture.c index fc42b4bc37e6..1714d67ea702 100644 --- a/drivers/media/platform/ti/davinci/vpif_capture.c +++ b/drivers/media/platform/ti/davinci/vpif_capture.c @@ -1429,7 +1429,7 @@ static int vpif_probe_complete(void) q->mem_ops = &vb2_dma_contig_memops; q->buf_struct_size = sizeof(struct vpif_cap_buffer); q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 1; + q->min_reqbufs_allocation = 1; q->lock = &common->lock; q->dev = vpif_dev; diff --git a/drivers/media/platform/ti/davinci/vpif_display.c b/drivers/media/platform/ti/davinci/vpif_display.c index 9dbab1003c1d..e918b6c8e645 100644 --- a/drivers/media/platform/ti/davinci/vpif_display.c +++ b/drivers/media/platform/ti/davinci/vpif_display.c @@ -1169,7 +1169,7 @@ static int vpif_probe_complete(void) q->mem_ops = &vb2_dma_contig_memops; q->buf_struct_size = sizeof(struct vpif_disp_buffer); q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 1; + q->min_reqbufs_allocation = 1; q->lock = &common->lock; q->dev = vpif_dev; err = vb2_queue_init(q); From patchwork Mon Nov 27 16:54:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170311 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287341vqx; Mon, 27 Nov 2023 08:57:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IGQBCjwfUnWaWPNSiocXZXRrojU4kAZfr3sMfjv+QeWxB8eXVX0+tZeePvVFKl14RQvkNIw X-Received: by 2002:a17:90a:49:b0:280:6b5b:3f40 with SMTP id 9-20020a17090a004900b002806b5b3f40mr10734061pjb.8.1701104278037; Mon, 27 Nov 2023 08:57:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104278; cv=none; d=google.com; s=arc-20160816; b=smuG+QJ7vri1aAhHDuOl8CSEp+F7UAMI4YAV+wFLCVWXVFMjIv24hgJkOX7hH0NIsi h2FKHd9JB8oHXfyr94SBJ3lADxIovEchBrgLPlHSYmzOd8Wh2s4yc1Vc6M/5P5HAp/JJ oHm6lrdjJ3IqahZjNGs1ZVuLss+TWS42FIf4XYgLAKM0NMYBCG/PxQKI22rAAxCj4ile TH3PWcHOu9yyZyLv04iZ1eZ+Xy9nD2mO75aDQNGaS9cPZccCzsFqQU4MvCB8TwzpMZGk mG0w3Sg/PSPgmcmqlhcLYTG0YAHHt26qvVoMNkae2U/x31ZaDEq/LJahLLnsPtWZcF7A QJcg== 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=PbkRfZSSZ4srLIlz7mtfVunyM/RVCejLVDmj0XSYABo=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=CScI8FIHeqgQAmYwRrlNBegKM5eSbZqwLd9MHZ4/42doGh85+yUwHd5EwNxuw4fMqv 1l/ZYxdi5WeRrRgRvx8LDlxRslxDOsAlAopmSleEa8BPi3hw1ootQ/UNf/Lf8Db7oDRP t2EQ0CPzRJKoOL7U4k8pQXO7NXTDIvk37+YjxOY+8Zg/DSa43w7AWlaSLzCy6yqIfU8A acpStIfs+5EcAHOvP8td4xYC79YEwP00GqQ6vwaqnOySlPMSMYW27iMWSb6u6/5pVPN9 gjgw2IVP6d71BzcM2G34EITp/2fTU2hUmsYxsNAK00DvyP6Lh2odhikp0Tj4snZ0V0xm rmtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=J7Mw8BYc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id az22-20020a17090b029600b0028397f87e96si11133811pjb.143.2023.11.27.08.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=J7Mw8BYc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 225EB8165393; Mon, 27 Nov 2023 08:57:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234616AbjK0Q5b (ORCPT + 99 others); Mon, 27 Nov 2023 11:57:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234630AbjK0Q4B (ORCPT ); Mon, 27 Nov 2023 11:56:01 -0500 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 717462102; Mon, 27 Nov 2023 08:55:32 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 800036607332; Mon, 27 Nov 2023 16:55:30 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104131; bh=6CSGRDiRO2lms0wmXZEstJJokqkWndIp5smKK5ehYIM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J7Mw8BYcjh+HAx9EHuD5fXzhsVfCxdRCEtvz6kxPPisGcj/BjvZK0XvHWOdNU65Qd it31XKO2UrDstoCrnrQT0G1QxAI2CaPBB9k8A7g8fYXE0K+T3LdwZ4KwStLepJpSC/ hJiahT1bN4TTma3pTkZ1zjLRTQK4eQMjmmZAoTl0JtFOG4xk2hdW4xDTuR2YIcA8Wu BOH6/Oy285pZ3z5U1wse4tYdhb4lsbxuK47nAAk3uMI9k7+zb40ffFYK9iGR/gnoP1 oiAWMuN3Y3uM2lz67aCyIZYMMwYABSCocGAikiGOHdgPhpKaoDwSRq/pYkPGNVPSmJ tZ1xh73ZqnCOg== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 32/55] media: saa7146: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:31 +0100 Message-Id: <20231127165454.166373-33-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:57:50 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737119485623669 X-GMAIL-MSGID: 1783737119485623669 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. saa7146 driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard --- drivers/media/common/saa7146/saa7146_fops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c index 79214459387a..db4d725a05d4 100644 --- a/drivers/media/common/saa7146/saa7146_fops.c +++ b/drivers/media/common/saa7146/saa7146_fops.c @@ -387,7 +387,7 @@ int saa7146_register_device(struct video_device *vfd, struct saa7146_dev *dev, q->gfp_flags = __GFP_DMA32; q->buf_struct_size = sizeof(struct saa7146_buf); q->lock = &dev->v4l2_lock; - q->min_buffers_needed = 2; + q->min_reqbufs_allocation = 2; q->dev = &dev->pci->dev; err = vb2_queue_init(q); if (err) From patchwork Mon Nov 27 16:54:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170312 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287342vqx; Mon, 27 Nov 2023 08:57:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFPGrusf03LhEJvVGs0zi97HwksuX9kkOyjAdPUvCSTQUmVxcXz/CURIDYjPd2yvG0WiK46 X-Received: by 2002:a17:902:aa45:b0:1cf:bdc4:bb47 with SMTP id c5-20020a170902aa4500b001cfbdc4bb47mr5162341plr.66.1701104278033; Mon, 27 Nov 2023 08:57:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104278; cv=none; d=google.com; s=arc-20160816; b=BfMX8G/Cx6VWYiGVwdBMZASJmo1Jed8eqaZUrwV9EZIBUgcyDjM0GXcIJOKv+Bcf60 q+gGNwEn68p81VTwl0j/8qMsnn7MGyvIWEGn77Gd++BbXkI3PvvgEwmr1SkSrpPQZHCk MgMJQG3eQWWZD4xkIbbKHRp0ouD/sANbZkxQqGpDu5smqPbRlcC104qJVwaE0WV5sZcR 18p99sfBTwdMxHspPNIv6zaIolSCwIelV2pVmjMBWPz6Ogk5qEajhnE6fthq4eowz9Y2 Qsjg5BoZ/5V/8yTOh3UoClCNAGw1711NCtMqaWLDMRQxGtfxitgOtb/dNRJf4zyLDWuc JpJQ== 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=9rawPFukRzai0Q4IpcayICIdBQEgAaEHr5Sxruhp5Pk=; fh=xugcPK4xWIcD66ZmyCFLAsIM5D0wF9VR/ShpnfNB+9Y=; b=g3fzrdrd84f5oHLROVTnXuum7nMNY0G5LMW4ssLmW1TckijDXqnzJFnhTSZtIgeX9/ 4tHSyMvspOTGLoUKPQdabf5uEVodG1XICZ3AxNbqoybRrdOGq355WTqM8UJInxQYplND zxubzgbpk2pItE57SBtq9IkUZWltksRQVNqy+TiEk93vv8rY5+4Pzi/o72rTr35oFVnb gpegKbSjjqG6W+UQiABGBU24CtXWQBrXnkpnGxV7euXCqbUXzndadmmaRviRl8yUR3o3 7oyUUxK1sZpVfHSqS08wRF8ljMKgD74NUv35oGfjP7/iTdyWq9nwSbd7mBMnK26Bevqr qwMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=bUW8uWS5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id a5-20020a170902ee8500b001cf5c99f036si9895437pld.90.2023.11.27.08.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=bUW8uWS5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 5E1CB80564B4; Mon, 27 Nov 2023 08:57:56 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234708AbjK0Q5p (ORCPT + 99 others); Mon, 27 Nov 2023 11:57:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234673AbjK0Q4J (ORCPT ); Mon, 27 Nov 2023 11:56:09 -0500 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 8E840210D; Mon, 27 Nov 2023 08:55:33 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 3586B66073CA; Mon, 27 Nov 2023 16:55:31 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104131; bh=zWGO+xQMxELWOf7KdTdR8LG3JTriZNDDb/EP2aovBFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bUW8uWS5GW0QXyBTRzhuFADv/y2EtdYvOtkMLrer7hDPeWcEz2eOSftisYiD15p3q rGznA676mshUPeo1Vt77h7d8o7lH9BfYqnhBFPaUg92Fx0LtkyXgsWOxYZHfYsCG6W lluewMKI+WXpr/nfDPLvWH+OvFxxSrA+su6FcnSC/xfYTSsPBEyX2xyn/+DxR3jZUx rjLWHFj4/AWStGyBxF3ejvARfP/Kur946umnB7qJIXur/ca7OKbeU5boLXbyOPchaa LPmgq22GT8Mg+Id+g2wryn/7gJxCz4DzYdNqEQ+rf/fwuGkQ28K07y1ZarUEfUUXgp BJMwf+JBqV4LA== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Nick Dyer , Dmitry Torokhov , linux-input@vger.kernel.org Subject: [PATCH 33/55] input: touchscreen: atmel: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:32 +0100 Message-Id: <20231127165454.166373-34-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:57:56 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737118909134572 X-GMAIL-MSGID: 1783737118909134572 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. atmel touchscreen driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Nick Dyer CC: Dmitry Torokhov CC: linux-input@vger.kernel.org --- drivers/input/touchscreen/atmel_mxt_ts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 20094b9899f0..47f2b3aafa4d 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -2546,7 +2546,7 @@ static const struct vb2_queue mxt_queue = { .ops = &mxt_queue_ops, .mem_ops = &vb2_vmalloc_memops, .timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC, - .min_buffers_needed = 1, + .min_reqbufs_allocation = 1, }; static int mxt_vidioc_querycap(struct file *file, void *priv, From patchwork Mon Nov 27 16:54:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170318 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287818vqx; Mon, 27 Nov 2023 08:58:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHmPHBOiVHCObibhx/kyco5bJK+V6S6PV6nUd4YvXft7O9jFlfJF4DFqcpFmeZvnngVqwIt X-Received: by 2002:a05:6a21:6d8a:b0:187:bb9c:569 with SMTP id wl10-20020a056a216d8a00b00187bb9c0569mr18191163pzb.5.1701104324513; Mon, 27 Nov 2023 08:58:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104324; cv=none; d=google.com; s=arc-20160816; b=KjIrwUyFZ+lPls0EvuVcJuNR5illp+LN+tMgshMwvyZUHopDHfTnwDM7t2M1K9uIim 9We0GHPnJgJFolj/TH2KmN7P7qiVVHCYqvm/g+nF8lV4ogzywDBTpjTPbFu48JUBLuAf qMKmynGlbMoKi4KAMD/Y+Z8mrXYuVhETEWiQF6wkD2TxAUCvznuiZSrQDQSN9kIx9Hg5 JJUQ0N44QSfR9su8LSO2sPr6qIxNKGaBJrHDd9mgiwG9XH0r6VPj0u/MqkpFd0bpAb5R LQdM2G374DJ8zzGpS/J/v/Sw++eTzn8PpElRtmSBsV2wooYKoML5mYKSLFuqnR98nFG9 27jQ== 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=pzX0atrFlAG085OUqMn2hYVHc0Mhb0Cx6cCXJGt20LE=; fh=SQKlzfWgcvqjcWo23LAq+kvQBcPSrojXVJk1wG11AQ8=; b=VNxNHDElbUzQxlji0LfEsbdrzcqzGs4Ee/OzvSmOQLVSkXRdnLoPl2mRDfDasXxRMV IGAoXz6T9MA+QFzI3aGcZW+ZCI38NOKeLuk6eBcQxdiFAKfORZDUZnrfo7U/qHBM4Mh/ AcYPAR1uwE5aHYfDo6XMifw9DbAc8MwWMIJqHDRHZTadk14sdrXMolFT0Qkra+8FzBos i0N0hrmm3yiVnARflUGZMYujplXG563O5QxBHWxiDa5yNEKUP0oTGBQarrn+ZKCs2PhP zKUq3NgkxhtVGUi0qsgXIXLwud3TTLRz6wS6+URHyl/KNusPZ2B1SR+Cn96s+4N3pC6B MTrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=aqpRUR5B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id z22-20020a63c056000000b005be3c3748c7si9950422pgi.38.2023.11.27.08.58.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:58:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=aqpRUR5B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 5C7AA8158394; Mon, 27 Nov 2023 08:58:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234676AbjK0Q5k (ORCPT + 99 others); Mon, 27 Nov 2023 11:57:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234674AbjK0Q4J (ORCPT ); Mon, 27 Nov 2023 11:56:09 -0500 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 E5D8D2119; Mon, 27 Nov 2023 08:55:33 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 085D266073E5; Mon, 27 Nov 2023 16:55:31 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104132; bh=2gAqxxEJ2KqwbPuMzplAmWNudI3ZJjJVcvYYervFwW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aqpRUR5B7rLkIPBrl96mQJqeD5R0o9Q5BMCoaKtg5QuqkLlcc+C911iU2FJnQzBX6 F2zlghBwHF16o0UIYyjlbkocDMkKKD/AaICpRYiV4w57I/LqUDJ+7dQqqlVlGB+s99 qG5ySA4re0p45He3Ra0IqcIm/IGL4lvPbWUIDdb93OxZFJA3DvKJqzFTnZhRkLtVu+ wOSCU48w+YYSaPCltcO+cYnd3AyuzqTB6xc881+R4CslyHe3nXrQe92JmFPJhK2CcM LegUwvBEHebpAjinyfNEM35kcTmAZRZrrc3iy/D1gvAN5Mt2PtX0axNXNrjYIbSTiV +T5FmrLdIH1Ow== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Dmitry Torokhov , linux-input@vger.kernel.org Subject: [PATCH 34/55] input: touchscreen: sur40: Stop abusing of min_buffers_needed field Date: Mon, 27 Nov 2023 17:54:33 +0100 Message-Id: <20231127165454.166373-35-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:58:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737167892361349 X-GMAIL-MSGID: 1783737167892361349 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. sur40 touchscreen driver doesn't use DMA engine and just want to specify the minimum number of buffers to allocate when calling VIDIOC_REQBUFS. That 'min_reqbufs_allocation' field purpose so use it. Signed-off-by: Benjamin Gaignard CC: Dmitry Torokhov CC: linux-input@vger.kernel.org --- drivers/input/touchscreen/sur40.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c index e7d2a52169a0..4da3063c352e 100644 --- a/drivers/input/touchscreen/sur40.c +++ b/drivers/input/touchscreen/sur40.c @@ -1124,7 +1124,7 @@ static const struct vb2_queue sur40_queue = { .ops = &sur40_queue_ops, .mem_ops = &vb2_dma_sg_memops, .timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC, - .min_buffers_needed = 3, + .min_reqbufs_allocation = 3, }; static const struct v4l2_file_operations sur40_video_fops = { From patchwork Mon Nov 27 16:54:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170301 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286793vqx; Mon, 27 Nov 2023 08:57:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IGd7bBM+9wrs3C58CbFRK8qnOK66IarFMCzicmmMGkt/ir+dZ6782UEEpnGHh+GTvbX9cKh X-Received: by 2002:a05:6a20:daa8:b0:18b:914a:a81 with SMTP id iy40-20020a056a20daa800b0018b914a0a81mr14337281pzb.52.1701104226971; Mon, 27 Nov 2023 08:57:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104226; cv=none; d=google.com; s=arc-20160816; b=uWBiaU5ZTSk0gaZAXhmcP8X6F+NaVTMV5zftrEf9OwO4vh8SDDZkwEIxbzkCBmc2Hm CxoBeIjyuQxhxwcLi+jmeFdZ9eJfu5HgHfr//ybRWtzBSUQeRurye4zD3iYVB5YqKrZI Rz+nFpKQNDy5CSTOJtGovq4StE1rz5Juo3Zq0P6dUnuA0Q6HPPEd7ft/TqTqt9YkKnl+ jAD/N1Je1aizq1uoYHb2rFR3blh63caX/KZviQ4EhJ+ypMXI+N1KRckAZPOhcHZEdr7j z/RPV/VDQi1l9rx2zccdkfJjQ/eEn2kLet5pyK76xZ+81CYTHm4x8bu9+n/wpjACZ3Nm hfWw== 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=P4e2ZSayEkFlf5M7BP1wNXzWtrUxTwJ2zIxPfCBI3yQ=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=nD98kLT6j+d5GbofD/an0WPpYVtqVy5p69Ib4l0HS7dcX4Dn07stHJ/9jcDgAcCd6L zGW6ndEb/M+V6Nx4u8RMpuxTVFTdxGZFrjaNBJIbsRQElfqs6hil0YL5oge+0i6PPrcD 5E3PdYjZrHanO+9IEh26cs5IgiUAfQY7P8mM/hSufwMBHfjcRq480LmrRVIRDlRHzHch Wq1jXrPj/Cp0+3W9ZKbTrmYD2qyArCEL01JBbBA/LorY14Z/59nJJDdhF1I8PckWbIq/ zNH7RoLkbDpWp6ZkkUNYPHKGt+tNOaYiNwfcv/zZdPliQl4kVHvPJYvR8jd5U5DIImY2 rY2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=AyB7slYM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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. [23.128.96.33]) by mx.google.com with ESMTPS id bi5-20020a056a02024500b005b8f61fcba4si10634081pgb.35.2023.11.27.08.57.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=AyB7slYM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 7C86A809717B; Mon, 27 Nov 2023 08:57:02 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234515AbjK0Q4t (ORCPT + 99 others); Mon, 27 Nov 2023 11:56:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234703AbjK0Q4P (ORCPT ); Mon, 27 Nov 2023 11:56:15 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97E522125; Mon, 27 Nov 2023 08:55:34 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 C0C4466073E9; Mon, 27 Nov 2023 16:55:32 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104133; bh=s+4TpTUuiOxUyySpjai/VxlncF5tn3uinvKKcPElu7M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AyB7slYMc/QOMLbN/sOUhyWxBxEMjH7WRzaNkawTZq5x4fpFzqsfn7WRQYIbJoqAx rh71hu63SYRcJzKctOEQnsZ3y2Zz59eLtmgYxQPfTmrvOq0+135DqZT+UoJL1+z9uJ ShSAMHev+R3AxIdTXfSy4gvYD91IuAon040J2TyM7le47nP4dGbT/QpkrjCQO+r7eC uwqwqPrJxXsm+6KihJbPJE1RjH0uLXz9KgnZps6JnDZ+q/9VYU+2lmbrW//U9SOWXT NFmDtBkibr8MnwZK7NR/PGAQFg9IY65b9M5RRPI3O3k2Wvi9tCuNlOG7kpUwJAMM1o 0E0QEzOMPJPuQ== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 35/55] videobuf2: core: Add min_dma_buffers_needed field to vb2_queue Date: Mon, 27 Nov 2023 17:54:34 +0100 Message-Id: <20231127165454.166373-36-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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]); Mon, 27 Nov 2023 08:57:02 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737065790937762 X-GMAIL-MSGID: 1783737065790937762 'min_dma_buffers_needed' field is to clarify 'min_buffers_needed' purpose versus 'min_reqbufs_allocation' usage. 'min_buffers_needed' is still used in few drivers so directly rename it would be problematic. The both will live together while fixing the drivers to use 'min_dma_buffers_needed' field instead. Signed-off-by: Benjamin Gaignard --- .../media/common/videobuf2/videobuf2-core.c | 28 ++++++++++++++----- include/media/videobuf2-core.h | 7 +++++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index c224d13b3105..a6ec55db8635 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -816,7 +816,7 @@ static bool verify_coherency_flags(struct vb2_queue *q, bool non_coherent_mem) int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory, unsigned int flags, unsigned int *count) { - unsigned int num_buffers, allocated_buffers, num_planes = 0; + unsigned int num_buffers, allocated_buffers, min_reqbufs_needed, num_planes = 0; unsigned int q_num_bufs = vb2_get_num_buffers(q); unsigned plane_sizes[VB2_MAX_PLANES] = { }; bool non_coherent_mem = flags & V4L2_MEMORY_FLAG_NON_COHERENT; @@ -866,7 +866,11 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory, * Make sure the requested values and current defaults are sane. */ num_buffers = max_t(unsigned int, *count, q->min_buffers_needed); - num_buffers = max_t(unsigned int, num_buffers, q->min_reqbufs_allocation); + if (q->min_reqbufs_allocation) + num_buffers = max_t(unsigned int, num_buffers, q->min_reqbufs_allocation); + else + num_buffers = max_t(unsigned int, num_buffers, q->min_dma_buffers_needed + 1); + min_reqbufs_needed = num_buffers; num_buffers = min_t(unsigned int, num_buffers, q->max_num_buffers); memset(q->alloc_devs, 0, sizeof(q->alloc_devs)); /* @@ -918,7 +922,7 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory, * There is no point in continuing if we can't allocate the minimum * number of buffers needed by this vb2_queue. */ - if (allocated_buffers < q->min_buffers_needed) + if (allocated_buffers < min_reqbufs_needed) ret = -ENOMEM; /* @@ -1654,7 +1658,7 @@ EXPORT_SYMBOL_GPL(vb2_core_prepare_buf); * @q: videobuf2 queue * * Attempt to start streaming. When this function is called there must be - * at least q->min_buffers_needed buffers queued up (i.e. the minimum + * at least q->min_dma_buffers_needed queued up (i.e. the minimum * number of buffers required for the DMA engine to function). If the * @start_streaming op fails it is supposed to return all the driver-owned * buffers back to vb2 in state QUEUED. Check if that happened and if @@ -1847,7 +1851,8 @@ int vb2_core_qbuf(struct vb2_queue *q, struct vb2_buffer *vb, void *pb, * then we can finally call start_streaming(). */ if (q->streaming && !q->start_streaming_called && - q->queued_count >= q->min_buffers_needed) { + ((q->queued_count >= q->min_buffers_needed) || + (q->queued_count >= q->min_dma_buffers_needed))) { ret = vb2_start_streaming(q); if (ret) { /* @@ -2217,6 +2222,12 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type) return -EINVAL; } + if (q_num_bufs < q->min_dma_buffers_needed) { + dprintk(q, 1, "need at least %u allocated buffers\n", + q->min_dma_buffers_needed); + return -EINVAL; + } + ret = call_qop(q, prepare_streaming, q); if (ret) return ret; @@ -2225,7 +2236,8 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type) * Tell driver to start streaming provided sufficient buffers * are available. */ - if (q->queued_count >= q->min_buffers_needed) { + if (q->queued_count >= q->min_buffers_needed && + q->queued_count >= q->min_dma_buffers_needed) { ret = vb2_start_streaming(q); if (ret) goto unprepare; @@ -2505,6 +2517,7 @@ int vb2_core_queue_init(struct vb2_queue *q) return -EINVAL; if (WARN_ON(q->max_num_buffers > MAX_BUFFER_INDEX) || + WARN_ON(q->min_dma_buffers_needed > q->max_num_buffers) || WARN_ON(q->min_buffers_needed > q->max_num_buffers)) return -EINVAL; @@ -2519,7 +2532,8 @@ int vb2_core_queue_init(struct vb2_queue *q) * in that request) will always succeed. There is no method of * propagating an error back to userspace. */ - if (WARN_ON(q->supports_requests && q->min_buffers_needed)) + if (WARN_ON(q->supports_requests && + (q->min_buffers_needed || q->min_dma_buffers_needed))) return -EINVAL; INIT_LIST_HEAD(&q->queued_list); diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index 17cacd696ab4..0bc97f28a7ea 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -549,10 +549,16 @@ struct vb2_buf_ops { * @min_buffers_needed: the minimum number of buffers needed before * @start_streaming can be called. Used when a DMA engine * cannot be started unless at least this number of buffers + * have been queued into the driver. (Deprecated) + * @min_dma_buffers_needed: the minimum number of buffers needed before + * @start_streaming can be called. Used when a DMA engine + * cannot be started unless at least this number of buffers * have been queued into the driver. * @min_reqbufs_allocation: the minimum number of buffers allocated when * calling VIDIOC_REQBUFS. Used when drivers need a to * specify a minimum buffers allocation before setup a queue. + * If set to 0 then min_dma_buffers_needed + 1 value is used + * as minimum numbers of buffers value. */ /* * Private elements (won't appear at the uAPI book): @@ -618,6 +624,7 @@ struct vb2_queue { u32 timestamp_flags; gfp_t gfp_flags; u32 min_buffers_needed; + u32 min_dma_buffers_needed; u32 min_reqbufs_allocation; struct device *alloc_devs[VB2_MAX_PLANES]; From patchwork Mon Nov 27 16:54:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170303 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3286830vqx; Mon, 27 Nov 2023 08:57:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IGu4qHEcvFne8bhZIHpzTwCAQxPRcS5VmG31/iQLtwPMMpjSnoohFFlftYt7JKdpk8eCm+r X-Received: by 2002:a17:902:f54a:b0:1cf:e012:462c with SMTP id h10-20020a170902f54a00b001cfe012462cmr1785033plf.66.1701104230238; Mon, 27 Nov 2023 08:57:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104230; cv=none; d=google.com; s=arc-20160816; b=tOC/pgvltp0cGtcNI2yKg1EpuFvYGyTrEzxoRrdr+Ia+J8+20duNJGLYMM9gBcVQYZ 9Jqqf6uYqhphiiwSGFTGO46OFe19Pj9FhcpOXmnAsSoMavZTNuvMhPMaMdsiiCUoFT+X IEPmDD+z9uEL7iYFnU0x6piX+2d8moXPfENX0PWSoXV1JEXkNPNeIkWOVr7GYUtlCVFw M4dC9P/vitwZhHjt1Kw4BfufL87BJFgSI7WMV+gg4C54KWJXOqbG7jmg0TMsmIaMhdAq BGEHXKsLA1gBS5O2owVV/dt8clv2F5NX3aYxj2X4enc02tVcEyvJAWM82T0L3HXXDdWB zoTA== 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=u7IgS/+P0gNvgKv63zHs2CeYD5kF9tHrVE7glohWyJw=; fh=geKXB7wGoKQsgcAQSSaAFr2nWc/ksQsozklRDeuF3lI=; b=AkieJQ0U9a6vfeAHfcBfOFp6is/CiENLpH36I6XXpI4yXL1iOqw76tgAapgHrZaacA 9VVdlYzrt7S0vGwyl52Z4l7FbxTze3UCJO+YxfeBDhb5GLmNbbVIsXjBdMVDsrvGDIfM IcdDOP2W2xj662VLkyoDRJgrhlFlphM02kp1XfUDYXB7NBZOoVSvg/KIaVJzkTDcM9gV iIFQRxh/og57A0YhnZyjiXw+4MDkfvZ/SkztNh6+Yj6THKZhA3rPCdTRT5W8P5Xwp4iL QMmD3tLOIOW+1qv41bU512pFdRt16REX28OoY68KRESZJ2KHU3c3bWoe9MPau29qrrpH ppyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=SYacJ+X5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id g7-20020a1709029f8700b001cfa6128913si7446417plq.115.2023.11.27.08.57.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:57:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=SYacJ+X5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id B2C4480A2673; Mon, 27 Nov 2023 08:57:08 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234525AbjK0Q4z (ORCPT + 99 others); Mon, 27 Nov 2023 11:56:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234709AbjK0Q4Q (ORCPT ); Mon, 27 Nov 2023 11:56:16 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DA73212C; Mon, 27 Nov 2023 08:55:35 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 75AB7660737B; Mon, 27 Nov 2023 16:55:33 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104134; bh=X02tzOo2kO6Xf8Mm3XO+fdYdi1NrT5mrpTJUnhqGe4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SYacJ+X5qY1brq6yAX2v6Zh8vkADiRh6fL5ssu4J7Myr/+F2ok5EzyvDWTgMHHjXP 5zzfGnbfATjw9t+mQdXymhiV3mymtoeLiX65T3m8+Ae4xllQeIw6OFIgIeSqC1NSzn dbhT00XGtQ+nld5mStG1N0pyys73Mse09oS0sERTP7WakGbDOcD4bjJEPnjWZ/NJ7y Gor0tI48ojqW9MVdR4Al0vXf/6SiknsCV8AFr179BFApBGgQUjqxKUFHRGZtC/PScq 9FbmTemR64ciabk44Ke+awxocJzpI59XYNQVsAv4rhwe4vkrNSdaZJSSvCkpQR6meB 0UY/Dv//MyFIQ== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Hugues Fruchet , linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH 36/55] media: stm32: stm32-dcmi: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:35 +0100 Message-Id: <20231127165454.166373-37-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:57:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737069296663599 X-GMAIL-MSGID: 1783737069296663599 smt32-dcmi driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard CC: Hugues Fruchet CC: linux-stm32@st-md-mailman.stormreply.com --- drivers/media/platform/st/stm32/stm32-dcmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/st/stm32/stm32-dcmi.c b/drivers/media/platform/st/stm32/stm32-dcmi.c index 48140fdf40bb..a267fdcbe886 100644 --- a/drivers/media/platform/st/stm32/stm32-dcmi.c +++ b/drivers/media/platform/st/stm32/stm32-dcmi.c @@ -2031,7 +2031,7 @@ static int dcmi_probe(struct platform_device *pdev) q->ops = &dcmi_video_qops; q->mem_ops = &vb2_dma_contig_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->allow_cache_hints = 1; q->dev = &pdev->dev; From patchwork Mon Nov 27 16:54:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287428vqx; Mon, 27 Nov 2023 08:58:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IFbiDAVI56EtWB/1EvJ8DnAm4oiZZLdhn69IiiI38NCSutgaQLK9DdQ6Vni9iykmBs+Zz5W X-Received: by 2002:a05:6a00:ad5:b0:6b1:c1c4:ae98 with SMTP id c21-20020a056a000ad500b006b1c1c4ae98mr15282652pfl.18.1701104286246; Mon, 27 Nov 2023 08:58:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104286; cv=none; d=google.com; s=arc-20160816; b=gxkxPjt2Gvrg8rrs1addD/ieSpVJBLftUZJheHHhNLvZ0h9AOEzUlqjLPvMXhbS6zu sFj+7miyOYk5jjOhY4Ma7bu/zfteiYSTATnvc/OHinu9A6wrqalpZtL8aDI6etYPQEmb akLJ8nmnLC8tPLezO+NYoZjQ6m8Po6DTaXCF26cCa87Xc53MUNEa9rtyuEs5ZNj3iFSy mW5C/2c5fedNfoAC/SjGoNZim0B5MXx9RkaDgKBRAwBmLH4a0DdrunOHub1dtKunnkvG Nj/dFARdTTgx4XWZJUQrU0yW+FRQ8OkbIjSqEH64t4QY+JgFxxoowGyKE5xoi5ZiLr9o lu3A== 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=Yko7usTmH3Lya6XQafSBOMHN7VY2abfvvO1D6CUR1t0=; fh=qb/QAbhUkq4469wft+Ew7SPHZIS7GC/6sjH9Eti4clE=; b=IQrlhILXCNqdfebtcqsRchTuj0v7nUd+lb6rUkYB3bEVsgNRoDEbpRqoQJ985bGVE4 8OcHKkUB4p/SOHgvyCfD8gLh/3KhJxmp2n/MnHRdfwwMN4eXqTxp75F7nQgK2N/rIOjw 4by6ZfWuTyGlBZLBG3CPSQd5+nWNM6Nao2RuLuI7Z+oyB7AJOeSa28gf2kHRUU90R5K0 Ie0qovFsVgiTptrai+7Zuv27bnYHOZOE0wAOjEGvvj3EAITTqXPn0cX5+P7Kkn7kOezx rFyitFF/Ze6ynr2TJxoX3NATMrOat7wAg/bmWt/0k1wbX1U8AzMM+t0Lr/tvAL5Ad3IR wILg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=jmgsIweR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id b3-20020a056a000cc300b006cbd8179b4csi7474839pfv.108.2023.11.27.08.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:58:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=jmgsIweR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id 3BFFA80A30C9; Mon, 27 Nov 2023 08:58:05 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234713AbjK0Q5v (ORCPT + 99 others); Mon, 27 Nov 2023 11:57:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234429AbjK0Q4V (ORCPT ); Mon, 27 Nov 2023 11:56:21 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FD0D213B; Mon, 27 Nov 2023 08:55:36 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 3E67166073ED; Mon, 27 Nov 2023 16:55:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104134; bh=oeU9+ujofjCPuqpbBJhFmasSXcVk3Te+UZBalP9S6o4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jmgsIweRenNoGVU5GQtYm6oRnhpXyUT2dFbt+4WgsQcG69mIJXDiSPgb+VIkZGjza JYJ8g7H5cb1iQEnpOF5S4ikoZ5Sa7hWLa44WS2yAWMdryATzyynpQif+YODa3yT7g2 SZK+FzrT+YrUHmL88C023KqIE+d5k8n6p/kg2nUs7oKLpWiBIEhuCADx4B6hUDiQ5I iUavy+1FeS4FcYhvE8YKYCCHw6gG3QOkvElrDuc+iJ9uqhvLbLrQY7fBScKV2DxRQr Dn9u7W9zHKOt8LqYzi6JRbYGpX9asUCO1yzbmnAJm6UAFRDPIV0MAC6NOS/8Ljdunc c0W+tU8jQKy4w== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , =?utf-8?q?Niklas_S?= =?utf-8?q?=C3=B6derlund?= , Jacopo Mondi , linux-renesas-soc@vger.kernel.org Subject: [PATCH 37/55] media: renesas: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:36 +0100 Message-Id: <20231127165454.166373-38-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:58:05 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737128154839064 X-GMAIL-MSGID: 1783737128154839064 renesas drivers use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard CC: "Niklas Söderlund" CC: Jacopo Mondi CC: linux-renesas-soc@vger.kernel.org --- drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 2 +- drivers/media/platform/renesas/renesas-ceu.c | 2 +- drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c | 2 +- drivers/media/platform/renesas/sh_vou.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-dma.c b/drivers/media/platform/renesas/rcar-vin/rcar-dma.c index 2a77353f10b5..b467e7a7d0dc 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-dma.c @@ -1559,7 +1559,7 @@ int rvin_dma_register(struct rvin_dev *vin, int irq) q->ops = &rvin_qops; q->mem_ops = &vb2_dma_contig_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 4; + q->min_dma_buffers_needed = 4; q->dev = vin->dev; ret = vb2_queue_init(q); diff --git a/drivers/media/platform/renesas/renesas-ceu.c b/drivers/media/platform/renesas/renesas-ceu.c index 2562b30acfb9..e2aef002bca9 100644 --- a/drivers/media/platform/renesas/renesas-ceu.c +++ b/drivers/media/platform/renesas/renesas-ceu.c @@ -1399,7 +1399,7 @@ static int ceu_notify_complete(struct v4l2_async_notifier *notifier) q->mem_ops = &vb2_dma_contig_memops; q->buf_struct_size = sizeof(struct ceu_buffer); q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->lock = &ceudev->mlock; q->dev = ceudev->v4l2_dev.dev; diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c index e6eedd65b71d..df1ab9beea6e 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c @@ -767,7 +767,7 @@ int rzg2l_cru_dma_register(struct rzg2l_cru_dev *cru) q->ops = &rzg2l_cru_qops; q->mem_ops = &vb2_dma_contig_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 4; + q->min_dma_buffers_needed = 4; q->dev = cru->dev; ret = vb2_queue_init(q); diff --git a/drivers/media/platform/renesas/sh_vou.c b/drivers/media/platform/renesas/sh_vou.c index f792aedc9d82..c2ac340a9da8 100644 --- a/drivers/media/platform/renesas/sh_vou.c +++ b/drivers/media/platform/renesas/sh_vou.c @@ -1297,7 +1297,7 @@ static int sh_vou_probe(struct platform_device *pdev) q->ops = &sh_vou_qops; q->mem_ops = &vb2_dma_contig_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->lock = &vou_dev->fop_lock; q->dev = &pdev->dev; ret = vb2_queue_init(q); From patchwork Mon Nov 27 16:54: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: 170316 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287740vqx; Mon, 27 Nov 2023 08:58:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IFhWK0bnngDqblTeXNocJq9NR9VQfpdof11J7LGl0wDD97Xe+0ku5HNsHKjOIjjwietPIHx X-Received: by 2002:a92:d409:0:b0:35c:b549:f2de with SMTP id q9-20020a92d409000000b0035cb549f2demr6163707ilm.28.1701104316200; Mon, 27 Nov 2023 08:58:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104316; cv=none; d=google.com; s=arc-20160816; b=kPHQOGx5HOGQ5kGqzrYDewQQUyGtS8N/Hi+TtOqEfCbzL+o1ketO5Yfq7TfC6wIJ5G FlkQCZmYg1Z748vJPkpoMZbuznfQEolE8CruZEbHmv0/NuPlP6vTvnH1bzd4uVUEFsus cDM/y6YVtmcVdJjT+J1hKtxMmdlb5zhMWCunixUKVPfjye5QqvzF5dE7g1Ep2+IuBSiS GmW6E1A02/LqDiouaMUHrAXknpmNPchJT+arSwTXNBuxWym1SSjpsREVMprAna3xLADP Ocoo2xYyvLB/TNRJtFuLfZ3LBkY0P3lVhZio6k2ymvOxhOUE15p0CaeLtWgnEq/SY6FE z6kA== 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=+8KXdgRqIuZ1RWOwk3ikS8DOw2YNiUGvfDiZSgR7gww=; fh=Eo/XmICo8RNj9cSgIUzFxXl6B5wV7+CHH/7p7ygfjD8=; b=Cjjz2nUfMFQYsoxyZftyPAcRTBQ+OZiWBypiCfEUsmJM21qftEXnBdlzBI+WR03WGe ZCqHTNXCKEnqnTFJZOFOinecLlKY+Q03M+LNNvJ3oi7xisOXIm5V6OzXodzJ8ewBv2ar tjD9QY8BnTWSErE5QypJbMt69QBmOI0dFneBIwn9vZp3PSeloGfZaEYAaxWO5s+xF2GA BHxWI7N7wuHoytf73Bzj3bR4KrUaF0J4l9Ig3x5ZrJTh3TgZA/WUpYVtPECp05vZFryF x8fNuy/GUXt08GAYzglQUuuM+a+eBcjPkTTBYt7q2JKCDehoBROX2In5IzVf0Q711t34 qpCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=d5k8un7Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id r35-20020a635d23000000b005c283e45927si9656750pgb.393.2023.11.27.08.58.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:58:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=d5k8un7Z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id B2E1280968BE; Mon, 27 Nov 2023 08:58:28 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234445AbjK0Q56 (ORCPT + 99 others); Mon, 27 Nov 2023 11:57:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234440AbjK0Q4V (ORCPT ); Mon, 27 Nov 2023 11:56:21 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 161632689; Mon, 27 Nov 2023 08:55:36 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 10CF3660732E; Mon, 27 Nov 2023 16:55:35 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104135; bh=+QiW4+PKMpn2QOF9ET7fPoqeBffKw0nbwvNL+3C6ds0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d5k8un7Z4Qh5e/OGB9kL3m0OUr76zb73WO5lo60s/dRut7VkUohGVMUPd76SkojDB QQeeHKv8AGcKmyEhuPhxffYBlVBY+uq+No1fxE8S0EFp/7X2bJo7c/2a6iyhmf2JJl PRn3rcCY7uZ8JQMC0BBZjA0ZKXxkBMcDvhztqel1YmVdNWTjk9jw2AqvS/kZZuDE7P hdSRxbOF7g0ZcEcDv0njaD9jtbLTJHmWt7l5H1PWMAnaHCN2buGJLHfzZoL8SZwvwp BHeTczCoV+xl60d9M5YcqyaXzBOpF1nR0yI9xAQTgFoEwxGSpN1X2XNBVWrgPykaZm U4T7u6KX2KF4w== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Jai Luthra Subject: [PATCH 38/55] media: ti: j721e-csi2rx: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:37 +0100 Message-Id: <20231127165454.166373-39-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:58:29 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737159668599864 X-GMAIL-MSGID: 1783737159668599864 j721e-csi2rx driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard CC: Jai Luthra --- drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c b/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c index ada61391c8d2..55e843419eb9 100644 --- a/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c +++ b/drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c @@ -873,7 +873,7 @@ static int ti_csi2rx_init_vb2q(struct ti_csi2rx_dev *csi) q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->dev = dmaengine_get_dma_device(csi->dma.chan); q->lock = &csi->mutex; - q->min_buffers_needed = 1; + q->min_dma_buffers_needed = 1; ret = vb2_queue_init(q); if (ret) From patchwork Mon Nov 27 16:54:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170315 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287667vqx; Mon, 27 Nov 2023 08:58:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IHnArO0z6cVeoBfO0mfy8jSkV7KObg/Qf1DbboZf2pr8/tLz45jJ8Y1RB3fcdijaRpfoL21 X-Received: by 2002:a17:902:c408:b0:1cf:ad33:61b with SMTP id k8-20020a170902c40800b001cfad33061bmr11188701plk.39.1701104308382; Mon, 27 Nov 2023 08:58:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104308; cv=none; d=google.com; s=arc-20160816; b=uqUeyWv9N0y0Rj2zJBvW+KkIrnj3eIlDq0jJNnR2ln9RAX+K07aYm/+Iwu9OKgSeAg 2O8EeIM0p3OwhcfLGYqXijV978LmRyI4+6WSngO6/jD3y6DQBpvbpAej8quZrHp5SP0B j/HRED6EMrdBnzifXVU/Dwgag+Kt2R7ENHCKuhlTgvYAg0QS6xzV7JphpRrwXCAchDkC lzjaJczXWFmvw0hgY6hEzkrX9gRRwYScgbtiyuvhMSwGDfVPxgBqvDlboU0ot7bZ+bpc EbdhqmoNSSXclX6x0l8w4z5+6OEWF03GxamF0lC7NJ5Q+g36yx7r/gXRW1QRNvsy4MMd YCqQ== 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=Pla16jAdYjhHFG3EqlaLR95bqkGILOtPYHcfMv0wrjo=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=R7CMldGyzzOaSrdaeiyed4Tc4CjoyAcTgsd509wCL1EdFU9L1JWzU/PlpI7+J0m+9J mt16CDJZa+/TFJb0MwE7LbppBw2xFaloqSVXM8NgfIgL0IjcAfHgDloRKIV0kx9kwfFv 9Iw+FcnOIN/sx65+hFblqlw9W2ib3PwHtMS7Ep8udDCx2ogKeLkPlJXOzNUsBaXvPamC LUUuH5dGXr7fOsOLnrPubFwRtqoHYd3H11X4RG/rxEtJPkgi0TSrpmlosEiMtbkX5zze 3VTCVndjUZOSRKjqKr5NkTwhSHzVEsic184OZTHfyIuDAUjsrKdYJjUdXxUPzhqngWJ4 j1Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=aOqDp041; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id p3-20020a1709026b8300b001cfd4c10e47si1796210plk.8.2023.11.27.08.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:58:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=aOqDp041; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id 34E6D8165386; Mon, 27 Nov 2023 08:58:20 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234736AbjK0Q6C (ORCPT + 99 others); Mon, 27 Nov 2023 11:58:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234485AbjK0Q4Y (ORCPT ); Mon, 27 Nov 2023 11:56:24 -0500 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 51CE52697; Mon, 27 Nov 2023 08:55:37 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 C574866073F3; Mon, 27 Nov 2023 16:55:35 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104136; bh=bUose2Qt+KgGhraI5gHXJBZnW4ioayca0b3t+erw7b4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aOqDp041fs/pryvCPqh+RTEXRELzEfst6tRZ+jEbOhsyU8v46pPm+6fd3zAHprbOq A35s2KgzdHp+aDziQP6DY8tzK6kD7PTEHdor/Zt2Hmsi0W+VTtD2zK4TZm7sfnz6nS pHxlUtx+jFP1HZW8Md7Q9rcbcbY47k5uB0FYfk1fVOPwG1aLVMndw+tk7cFDJFZA/V NhXxe/YWXNjI+/PzHFjfqcKKgcZw5rXPpOHo+imT+3cKnBYNpydTtvy4jgY/eioKBl /ZVKZZFXTjBrvLxKz80+7FRpdDung2wZDQv+OkqPLFinUPtUas7k7vdoDoSksCRWY7 nNkeQgEkaHdlA== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 39/55] media: ti: omap: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:38 +0100 Message-Id: <20231127165454.166373-40-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:58:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737151408871804 X-GMAIL-MSGID: 1783737151408871804 omap driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard --- drivers/media/platform/ti/omap/omap_vout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/ti/omap/omap_vout.c b/drivers/media/platform/ti/omap/omap_vout.c index 72ce903717d3..0adbdd11e06b 100644 --- a/drivers/media/platform/ti/omap/omap_vout.c +++ b/drivers/media/platform/ti/omap/omap_vout.c @@ -1404,7 +1404,7 @@ static int __init omap_vout_setup_video_data(struct omap_vout_device *vout) vq->ops = &omap_vout_vb2_ops; vq->mem_ops = &vb2_dma_contig_memops; vq->lock = &vout->lock; - vq->min_buffers_needed = 1; + vq->min_dma_buffers_needed = 1; vfd->queue = vq; ret = vb2_queue_init(vq); From patchwork Mon Nov 27 16:54:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170324 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288224vqx; Mon, 27 Nov 2023 08:59:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IGNYNkUWUAN2Us1QsGCJlg1u8La4hckZO+ZA2g3K2AafSLzja+2pahnHhd9eV8U35c/95hO X-Received: by 2002:a17:90b:224e:b0:279:1367:b9a3 with SMTP id hk14-20020a17090b224e00b002791367b9a3mr10865747pjb.4.1701104358046; Mon, 27 Nov 2023 08:59:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104358; cv=none; d=google.com; s=arc-20160816; b=GntuG58aNJgnGhlx8BI2fRSwNeNiWKIP5/aGGimVCrGCCvJwJQlQ/H5hr1OWW4fbr6 KrsD2Suwv6cW2+HUuj1g940bLTZCcAXtFjBLsz6s+kPLE2IAIXSIGOQFtGChdlY388BA Ym4iIkQrDwwQSud8DKqeeKnv54nTepVMOpjnZsPQwtJgJeDlBLVpmaNcVPsElEuhcnIk VeBuXWEPJWRppJDumDe9wltkPPhrC+0AtCF5arm01oTolO0lhWXzNX1hWRvLjAtqkGYG gHA+HmqqREFXKD+MHtQdz5+PxlNmISQ55wdjhXu6nB25iswazWI8GSfCnL++ES4dLOuc JofA== 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=1gGytu+8pja1M4176GNT67KAC1vEIvFkMHW8DfJP8d8=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=hIECDbX3RdxRkpPQMsh7YIoTKHapRFZb/wuuQlHZj6dsrIPrV+PRar4IVBVWHwjxEm Ho4LzwEKa/AF28GA8Z6bVhv0GQYjo/F8pUlnMjkwm6s/EeB0ghKzmlux4TKXp3CIjG2p xPTfEQObAHq3YyV72wIpLHkZDmkneeFpvTYkFEiae8dhRcteU/SD/je2HEi+HN1q9D9m y3bzoRz1HyfZXD5xUyDoTvjilsG3Z5vrkjOx5hgZhADs3t/x4n5Li6jbEtpWzHBznvj5 Uzew5arLV7ox1Q1jGgSC8L7Jim1nIKWuui/3E1Cin90il6pgQDJF3pgqBoiWbCaZu8pV WP6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=gQd0qoEa; 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 q102-20020a17090a17ef00b002791035445esi10023923pja.76.2023.11.27.08.59.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:18 -0800 (PST) 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=gQd0qoEa; 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 936A1822F8EB; Mon, 27 Nov 2023 08:59:08 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234742AbjK0Q6G (ORCPT + 99 others); Mon, 27 Nov 2023 11:58:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234494AbjK0Q4Y (ORCPT ); Mon, 27 Nov 2023 11:56:24 -0500 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 95B171BC; Mon, 27 Nov 2023 08:55:38 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 79A6566073FB; Mon, 27 Nov 2023 16:55:36 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104137; bh=71+AtmSDH/h7dLOlV29BkPWy1yXzA9ywoJKq5O/+QVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gQd0qoEaJv55RD/PrXt+M/nrSvjUEquEZ2G5fgA7OMdfJZaDwhH6jBTTLr5QcJolC yFnWShT0rf29LNlSkd2gvc/eScBdKzW5La19tsISe+50xLBUNwloLBYWR1EFfuQ09K p3oM5Rg2A26IsLuIzOiEo2mSevVNxQr90CQJSzk1EUc+RD4h9stUI7t/GnfW8F4VLk AQjtMvKHqqto+zemN7U2/lkzeXukE93ac/XxPqQs50EVnSZcRsplFumvh7PjsAa+SF 5xgPu331hbJAPLpTeBvIR0HNQFAux32Q/dl616VKWKzHONlienAESESHUFStNjQ3ed 3wvzKRLBOFQng== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 40/55] samples: v4l2: pci: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:39 +0100 Message-Id: <20231127165454.166373-41-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.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 (howler.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:59:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737203328839904 X-GMAIL-MSGID: 1783737203328839904 v4l2 pci skeleton sample driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard --- samples/v4l/v4l2-pci-skeleton.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/v4l/v4l2-pci-skeleton.c b/samples/v4l/v4l2-pci-skeleton.c index a65aa9d1e9da..6018c5e7b3f1 100644 --- a/samples/v4l/v4l2-pci-skeleton.c +++ b/samples/v4l/v4l2-pci-skeleton.c @@ -821,7 +821,7 @@ static int skeleton_probe(struct pci_dev *pdev, const struct pci_device_id *ent) * available before it can be started. The start_streaming() op * won't be called until at least this many buffers are queued up. */ - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; /* * The serialization lock for the streaming ioctls. This is the same * as the main serialization lock, but if some of the non-streaming From patchwork Mon Nov 27 16:54:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170317 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287745vqx; Mon, 27 Nov 2023 08:58:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IHurSoxMBiFMZ0r7W02sEj14D7bFKocSppr6763FmsiEQ0XqZrr2GkqfgMBY3hUJnbUdQg3 X-Received: by 2002:a05:6808:228b:b0:3b6:8608:72c7 with SMTP id bo11-20020a056808228b00b003b6860872c7mr15960763oib.50.1701104316759; Mon, 27 Nov 2023 08:58:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104316; cv=none; d=google.com; s=arc-20160816; b=XDtlOg78h+rz9pVEAyWGlPxicuFQzNJRdbDw44JIvwbfVKKaeVyzo2LxCqDhFMn2Lp skFL30w2PpB5sUG6C8IgFNfg2lRZXSjOp4HFUV/hnUMIeCAqQI7OmKeTiOz7+hi6wbtb qVuEGLOYmQO4WYNdgLXGY8oZRpOyxXDXPNoPmpcnSjZ4ukmu8WjZXCkohbJ9QCwG+AtF AZvwDFoW1PV8A3rUOBoF9lc/GlkOLtMnrIMempTw4CECm1AWRjLFEH6Qd3yhrXEkY+YQ xO1grBgUcBefgk9m+H9DgbgarpN3Az52hY/PwPEpMmXLz6BCoaPu0Khnb9FLi7t/iXZw elkg== 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=fF4UwD38Ygw03ZrVZ0is2rZ2YAZStq4dQ8pUrx9SNo0=; fh=kFeEET2Sn7AfPPwZWtXJEfQj1r+0ZzDCkmJDn3z6yDY=; b=vr0P8Tr2JnvASSzDPuLle+eEVA+pD1XuzV+c7uzDINwGqKvo4t9+5V2SJKxBl++Pv7 hYNrLxAWPs0WVsKC+xDPwTrMmd3GDUad6ruMu8JEfUEELiKCqlixC9W/5KRzBs833LkS o0gBwWDLZ4DgVSvT5LJFte91txgjFqwdxMeQPIOjUIFhIh1YMvSX6+L6W8H33ndb7AjZ zqwFtGdHIB8/mZn8f5tz4xvm9S7LZAdjkXyoIGxRUpsDq8MxkSqd/nN6ESUuCvyp8lwx nWqiHIKhD+l2z1acy7If4o6eBTO3lEKPO/3xR3g6vawUIygG7tCC0xV3f4thlF3HtkGV r43w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=E54Gv4X2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id k10-20020a634b4a000000b005c1ce5625cbsi9970191pgl.232.2023.11.27.08.58.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:58:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=E54Gv4X2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 69A74807A587; Mon, 27 Nov 2023 08:58:34 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234758AbjK0Q6J (ORCPT + 99 others); Mon, 27 Nov 2023 11:58:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234715AbjK0Q4Z (ORCPT ); Mon, 27 Nov 2023 11:56:25 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B6D910D4; Mon, 27 Nov 2023 08:55:39 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 2E4396607401; Mon, 27 Nov 2023 16:55:37 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104137; bh=VYpTZfWZN7LbMpiNcOKjYA3Gn8EBNnp4L6ZbmMp3ESA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E54Gv4X2uUv3gUKpau+ZmdPnMvd5bzU47vNGH7HkSinB+yxqdf5SmIc+iHO3GP3EZ f14NOUOEEwIjeuUdXDRCzpFyC8TUnJ+P/6xK+NS2+S/HmGBxECKrBAn+ii2gskTvG+ mLqPI/BkB/b0NGkz2/yH2SrtBI+B2QCuFURV3hnuW2DpoEeQTuStbMdcYutrsQcnru Qrdq8Z6fuVIGm/XXCiXCP6MK8qXlgCJWKpV/j8lw7Bo6CEynC9wNW01qbpZE6qzsrB iQnTsXuWV0uHfWHn4li9LKZ/3B+RndNKHhffIR+8y9ZVUVoeejScIOv3iw0NyTzLta On0k5W+VQExeA== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Yong Zhi , Sakari Ailus , Bingbu Cao , Dan Scally , Tianshu Qiu Subject: [PATCH 41/55] media: pci: intel: ipu3: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:40 +0100 Message-Id: <20231127165454.166373-42-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:58:34 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737160084104837 X-GMAIL-MSGID: 1783737160084104837 Ipu3 driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard CC: Yong Zhi CC: Sakari Ailus CC: Bingbu Cao CC: Dan Scally CC: Tianshu Qiu --- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c index 5d3b0ffd3d08..3a000a682cb0 100644 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c @@ -1589,7 +1589,7 @@ static int cio2_queue_init(struct cio2_device *cio2, struct cio2_queue *q) vbq->mem_ops = &vb2_dma_sg_memops; vbq->buf_struct_size = sizeof(struct cio2_buffer); vbq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - vbq->min_buffers_needed = 1; + vbq->min_dma_buffers_needed = 1; vbq->drv_priv = cio2; vbq->lock = &q->lock; r = vb2_queue_init(vbq); From patchwork Mon Nov 27 16:54:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170328 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288394vqx; Mon, 27 Nov 2023 08:59:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+bGmPwFsD2LqAhJbeSb6iguQRKWpJyol0pajkpfnEcFSy40P5AUfPA6FgHrmqqkdsP/Ua X-Received: by 2002:a05:6a21:9997:b0:187:b2a7:c6cd with SMTP id ve23-20020a056a21999700b00187b2a7c6cdmr13144347pzb.57.1701104369924; Mon, 27 Nov 2023 08:59:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104369; cv=none; d=google.com; s=arc-20160816; b=v/sgoP0zej/1oSYAFtM6UVAyLsKiG6x+ijLyPyafWBuvUSLsCl5HhUSGQcLtVUbOFC 79UE8TfN6ZiGHZGIIroX+orWxMUmEo5ZpgeohfPGjh/mRZjuCXnTS1Ppl1pst42xARFu QKp7gqgvi7jYciVvzzdfIxZZ9A6fNH/BjKaKpYbXEeekR12Bqcyc/i5CbmsMr0Te3EUe eZAR7ba9M3wS9pDedVt0lKEKNxiSj2am2Cx5U5GG28D7eYwDV2qRwpsFY/Q1SfbceK5d 2soHlgGggP+9ppEfHKG6GURCzCHKeqT1d68IU+P3HcGCHjKc56zu4PllySaGQR6ZcxpA xdrA== 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=ZCEJQ8V1nLKX+xFvb13tzMXcWHW6DcwI/56EL7rlF+I=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=0Ty/FcDxO3cvIi+sqePA10dll/5KdcSdyDjjlyGghRfvG/lFx4hYqtD83n3WbNTbSs syafbJn4BPoka2/gFWMRa1p/dCLSMvX5mQtrYaqaT/yeYV8JWtJUeynSRqeQpYAuLrpd ztUCedIA/1hAZsksHg9ltBxbR7cg9317RpHoG1Yi5PZsLDntyewmAgo1MYuxxSt6tLvy hMtXXKmvpStMV0pIdy7IXGiaXaAGnySZuagJL2ml2semSd4xJ6l90p0uCf7Qm4STp27R 7F0RaD2hq09FbQPAmu71jasrAMcnP5kmrqu5UzPyRSsKvawsKj7b9q/4NR3RnPnEwxCI 6elg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=J82+hXDN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id l64-20020a639143000000b0059b70e69eddsi10086104pge.300.2023.11.27.08.59.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=J82+hXDN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 62C188061416; Mon, 27 Nov 2023 08:59:20 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234763AbjK0Q6L (ORCPT + 99 others); Mon, 27 Nov 2023 11:58:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234538AbjK0Q43 (ORCPT ); Mon, 27 Nov 2023 11:56:29 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2E4926A9; Mon, 27 Nov 2023 08:55:39 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 14A19660738D; Mon, 27 Nov 2023 16:55:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104138; bh=HM7bQJTrYq0xI931RRj+exZg69MbeR6CU1nWD8Ux+n0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J82+hXDNdOP+SagJpnZv37YHnFlwnFOlaRqILeWuFtj4UTpODQiiCXLoHRJMpFxxE TQseQi+Fb8JdftmA3rnrIRSHvbwN7H4s47izIb49/vo5u8p51C9EHhCVbhtUbzDsxY y886IwJB4KRf5I0fMIDCogDzSogPOEgvGPOycf7QjzGSncgxT6R0fWOOQwVGh26nHf eU2d6+t+2Ju5ICKEsFFgqUm2V8J4Afke1g+PCCHrXBYDRtgzpRfQPvZpFqgUgt1QG3 9B1+YAIEWU+WDdP3tRlFpWO6IEjzk/9xBChtGcNV+hAqKsQl63YCRhugv/z50+YPAG ZVqNQ3e/37VTQ== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 42/55] media: pci: dt3155: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:41 +0100 Message-Id: <20231127165454.166373-43-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:59:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737215550938403 X-GMAIL-MSGID: 1783737215550938403 dt3155 driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard --- drivers/media/pci/dt3155/dt3155.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/dt3155/dt3155.c b/drivers/media/pci/dt3155/dt3155.c index d09cde2f6ee4..43b44af1e9ca 100644 --- a/drivers/media/pci/dt3155/dt3155.c +++ b/drivers/media/pci/dt3155/dt3155.c @@ -517,7 +517,7 @@ static int dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id) pd->vidq.ops = &q_ops; pd->vidq.mem_ops = &vb2_dma_contig_memops; pd->vidq.drv_priv = pd; - pd->vidq.min_buffers_needed = 2; + pd->vidq.min_dma_buffers_needed = 2; pd->vidq.gfp_flags = GFP_DMA32; pd->vidq.lock = &pd->mux; /* for locking v4l2_file_operations */ pd->vidq.dev = &pdev->dev; From patchwork Mon Nov 27 16:54:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170325 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288247vqx; Mon, 27 Nov 2023 08:59:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IEProDBsIoPt3FCjimISFv0IATUCLitch/sPrBZ9YndOyE68uCcaaMn/yCBsr6Mox0ou+l8 X-Received: by 2002:a17:902:dad0:b0:1cf:da41:7294 with SMTP id q16-20020a170902dad000b001cfda417294mr1966493plx.25.1701104360360; Mon, 27 Nov 2023 08:59:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104360; cv=none; d=google.com; s=arc-20160816; b=kUlj6tiGDJBZOrkfCr3ljFf74JXEXrQTxUMNLasZkersU88n93U7Uq7a353AhJ1QW4 jp3jSh0ON1FVb3HjbAADaiZOwpyUMIVUshxxEyM6BIrbswVt38y0msZxwdOlRf/HtHw3 z21Md/lOl59oFhnZWfAUmmuVdGMI/x1YtRIeQv/aacT0MpjQoyVsfalDESSfU78NYXLf X95nwUP+xqJHp9UXPQIvdeKfMRuq4oZHIAQKlPEcqZVoeJhpUGxThWVpXtu2BkO+OG6z LcCZQqIF7LJ11josrnWn1LK7Dpp4ooM4pGasQfoRAc8/hPwBJ/3Ue2HH+8JeMHmYB7OJ 19SQ== 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=l5GsMUqY2Sx2ukznfFgGmU0xAhXStzQ8S0jXuq+onlE=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=PnU5XzLlJVNlfwdJBVws8aPxXAeEV8TWVRzQBxKS7WguhK+OI/jHjUPmsDocHA4HFY P3yVNa9iRMPw68OZwxx+Dbh1XpRi8fgDA+wch3+H7a1gfpaE3kll9lg7gKeY/avxaYAE iMu+gRr1yCXPnOPt7FKBaXEgX2eObRyvaP2GlcTLqAITaSbkHdyWWi3ULe9Yyhrf0D+0 Ao7sl+1vvs7GrSaUYXtGlF8fwipjc0ttoR5jmkpPeVMQXCe6e57f3u/7puVeLZKpO7eD jxrF6kghXcMlN7BfXJTOh5+quJ6kKRksEQRXWxvXU9vqVgwB9VgkWu1/L6ofoQ7/qkjA vhzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="Q/wvnA4g"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id s4-20020a170902ea0400b001cfb1e21a37si6317238plg.162.2023.11.27.08.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="Q/wvnA4g"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id CC2FA80966E9; Mon, 27 Nov 2023 08:59:13 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234770AbjK0Q6O (ORCPT + 99 others); Mon, 27 Nov 2023 11:58:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234747AbjK0Q43 (ORCPT ); Mon, 27 Nov 2023 11:56:29 -0500 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 C0C7E26B1; Mon, 27 Nov 2023 08:55:40 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 C478E6607405; Mon, 27 Nov 2023 16:55:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104139; bh=O6QoqjhfTjZ8fxwdlWAH4p8qUAwUTkwY0GJ5W4xynQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q/wvnA4g8SOzv8+U7u+BimIdh8r0Q9ehMJ/zalV3OCNZ0eaUROvDxJLFCFy/iDvXx Aufoa9+saUnjG8XLitslPMAYIso9fXHIFqY9qXuEp6L3AU6nXoc8V8VVSqW+qGiJ7f AVuaudIEtx/IOqstj9+2TRxrs0edqDy8pC3Ie1Ex6AFoL0gpwGAVhypbUGGLMmpsXA f918axMhhez2P9p5jagX3maoc5/ojg/0wWafSFQBuG0YTAguWtP8LJ/iAagHnFmFTU KWVFZEVzJmWgJPa0ulOFGYGRz0Bw5PpWea7HVF5gobwiSSfP0p/4najE11F6WnBoN/ 1vRO9rY11s7WA== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 43/55] media: pci: bt8xx: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:42 +0100 Message-Id: <20231127165454.166373-44-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:59:14 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737205840685360 X-GMAIL-MSGID: 1783737205840685360 bt8xx driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard --- drivers/media/pci/bt8xx/bttv-driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index 09a193bb87df..8a3fb30e73f6 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -3094,7 +3094,7 @@ static int vdev_init(struct bttv *btv, struct video_device *vfd, q->gfp_flags = __GFP_DMA32; q->buf_struct_size = sizeof(struct bttv_buffer); q->lock = &btv->lock; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->dev = &btv->c.pci->dev; err = vb2_queue_init(q); if (err) From patchwork Mon Nov 27 16:54:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170319 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3287831vqx; Mon, 27 Nov 2023 08:58:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IHpz71h6VTI0VAG9HoxlsfpwPR4meBJR3AKW6cPgVVptoAJ01d0ig+xAEsAxiFMDbNaXSkE X-Received: by 2002:a05:6a00:b49:b0:6cb:7025:9930 with SMTP id p9-20020a056a000b4900b006cb70259930mr13395238pfo.8.1701104326537; Mon, 27 Nov 2023 08:58:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104326; cv=none; d=google.com; s=arc-20160816; b=lkQhwC089fMjbIws/nEporjDZ4FdHYAg1hCpa7A/nqU+oA7o+JinLZ2V2qPL+5hok2 2wGvb7jjiywfWnoXIIjspF35j2L8M9au04IvN2JaFvtHFjTd9cDFgJ502XZinrKNhOU1 Wn8i3SHBKeeliy/JlHx/YD0cZpUiY6hFUG0xbVtzJ8NI/Y58yIUNUVhM22X/lunwSF43 s2oXCZq/oLMn0b17MQvM+OgjwFDgpNNMICrmdGmshlzj/UBkJaBQYX5alpoDu59Uj5SI ZYTtWgCpB2Y+mcgYdRj0KuKfTnMnJedzIX+nxB9h1fwzTXkZ8zV5TMIx/Qo4VqiYirqP qFrg== 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=d4unF0MC8cso/yBkO/55mCSxDdqFfW60qVYUZUvDOfk=; fh=NWutLdjXjYaFHjQQ3le6ZbVSIPBVby/SDpaxisLmflA=; b=B2SQuUT/mMVBdxYMYsRS5gqLjs1uWx9tOQFZYBUTXv1yaHIE1XtaJOrDNOZ4L1yUZU gyBkgcniLdtOxJxADKvULUCql2y0UsSHqOM0NdTouip9+AiC6ZRJTAcFZeSsP7jlN+xX gcWl15b72tGoc5wzwr/K6AC+F+D7oiPEBaw7YYHVTpveQNIn6oR0uJylmUYQBaCFksc6 C291bqI4ws82U1BkriQ//aIwYFTEsfNN8ZtpWFrec5mc6ecotZgo8dBjWpaI/c/6/qfz s3A57Ewyvp42l+tMABQ49PKXLRTVvTrpWxDBvar8st6GH2hA/HdKZiwKBcsKh9dZsYH8 AqqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Ci+CoOpm; 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 r33-20020a635d21000000b005aca8ed90c3si9432893pgb.271.2023.11.27.08.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:58:46 -0800 (PST) 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=Ci+CoOpm; 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 3A1E0805C167; Mon, 27 Nov 2023 08:58:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234578AbjK0Q6c (ORCPT + 99 others); Mon, 27 Nov 2023 11:58:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234399AbjK0Q4c (ORCPT ); Mon, 27 Nov 2023 11:56:32 -0500 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 5950C2702; Mon, 27 Nov 2023 08:55:41 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 7586966073F5; Mon, 27 Nov 2023 16:55:39 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104140; bh=h2KeYZ0zs78nj7d0vzmwSoQJ8cIKIqcfLHmNlVHLLY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ci+CoOpm89HWTnsAVdvkdX99vxMpyqKLn94+lpKM7gMzxF+SPJS3WqYKv/mZU2TVq O9W4L0gGC4BRpAXaTknEUGyNPNEeI43f1YP8AppYo85mEwBLKtk2mwnUKL+9zifDo/ SjANBlpRlZonOp6q1IvOws+sP+bv10Bq0kT353Sr61+DuCmfyTwleJuj6BYg1Kz/qE rIBIuASI0gi6/dOyaesXFMG5+U7XiucqF1LuAAQ7eSgvtlTxiuPd/wFaeVAb0mjfml n3RoOQDHBebGIYvnxa/q2uFwhwPMikEsdl9q++bhIt0fkQXvt585Qxz6aGckbZA8h1 McmAdpU0W5BVw== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Andy Walls Subject: [PATCH 44/55] media: pci: cx18: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:43 +0100 Message-Id: <20231127165454.166373-45-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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]); Mon, 27 Nov 2023 08:58:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737170138824980 X-GMAIL-MSGID: 1783737170138824980 cx18 driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard CC: Andy Walls --- drivers/media/pci/cx18/cx18-streams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/cx18/cx18-streams.c b/drivers/media/pci/cx18/cx18-streams.c index cfbc4a907802..1b66a70c6d6e 100644 --- a/drivers/media/pci/cx18/cx18-streams.c +++ b/drivers/media/pci/cx18/cx18-streams.c @@ -287,7 +287,7 @@ static int cx18_stream_init(struct cx18 *cx, int type) s->vidq.ops = &cx18_vb2_qops; s->vidq.mem_ops = &vb2_vmalloc_memops; s->vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - s->vidq.min_buffers_needed = 2; + s->vidq.min_dma_buffers_needed = 2; s->vidq.gfp_flags = GFP_DMA32; s->vidq.dev = &cx->pci_dev->dev; s->vidq.lock = &cx->serialize_lock; From patchwork Mon Nov 27 16:54:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170323 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288191vqx; Mon, 27 Nov 2023 08:59:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IHR7K1NsFpAmCQOUndHpwDnNF3VZj+6WfUicTIAkwxugOV+1Q/I7VN49aPpeV3yqrsOjSw7 X-Received: by 2002:a05:6a20:a10a:b0:18a:e176:87e9 with SMTP id q10-20020a056a20a10a00b0018ae17687e9mr10049231pzk.15.1701104355372; Mon, 27 Nov 2023 08:59:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104355; cv=none; d=google.com; s=arc-20160816; b=Pr0Ckr8ddRZhNRH9uwLc7rnrIC16g/bKKqnRud0bS76RR5AX8R+wfXzKiKzwaUFRaS 3t6vHkKju7v3cRtW6ZnssV84GMrUYn05DekGY5gVLbBmbLuFMhY3MZl3XfnMeme/nH94 TCO+sAicVOWcNRgG++x7ze2oMdum9fktLfb7HqsRZpKFDexTdaNvOngK4ES15QnPtjat FaSBJDrw7E84w7s0rg1gP++Hc+PjZ9GOHteRwy73HTHH9RPYbD6D/HDonPKo2pi2dkM/ IksdJ5L6gGAkbj/LWPYkQybrjsqEK/IN4mw+IuKjNJmB1iqZftC9EQfvxxIdZbMsXOcJ NK7g== 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=JpC4GGR+usgLXqU+6gLqzGZPHlaNMstOUkiwQ/sxYxQ=; fh=VXJx42lpfkfCkQc5whsBs5LVcuPWFI8g1iRi42xWq+E=; b=W5N4ZBJT/B8B15idgV7KnXOV0+goktLoVLnPctSTlPdBWraS/ZnhZjpLsFwR8Sr8Hx YaZndgVHDHLm1lFv77QpVVZhLDjhydivdm3oqrb6yDA3cSo2OUlMnFXhyDaG76SfA8A1 P4WR+Ot7DnDksrHE/h2upCeLhSbjUjAqHkd7YlpalfRrltFQEOc+adXVvOZ2kIuXEdpi CvwKjCdTc8nFsOELexMlbjeVbGFQBpNl7iav9HCd+/eRpXjuSvRkiNWgw+s0Mo3atHpp ttHW2V8L4mg6OFQlRjGCdKQqaAxQG+hvyn2tX6ZRLl+JiVxEsRj+dnGTs0OXofaeBVIt DC/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=NGkKb169; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id y188-20020a6364c5000000b005c21f2b36dcsi10362763pgb.1.2023.11.27.08.59.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=NGkKb169; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 43C8E80613AD; Mon, 27 Nov 2023 08:59:05 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234381AbjK0Q6k (ORCPT + 99 others); Mon, 27 Nov 2023 11:58:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234667AbjK0Q4d (ORCPT ); Mon, 27 Nov 2023 11:56:33 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AF752708; Mon, 27 Nov 2023 08:55:41 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 2FCCC660740B; Mon, 27 Nov 2023 16:55:40 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104140; bh=4e1hOLtYACGxKpv70NswjOrCLbRfh4IuvxjaZ96vjZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NGkKb169X7rS7McuEhNRieeSnHBe1RhG1TOGDwtwHiQKKk1HKBxJ9cbjQUqKc+UCB QXA1QTTgzQ3txXhyrBYh2iTC7A2AIXnm9k79ePfyy9OJiu2MpEtZ6TX+mPtyoCr1CU D9Ju9Hz1z+/o8Jz/r6WndG7yUFKHLgkRqwLsUDfjh4tb0P8msDLpHOqEWY0VdGNDki +rJFSdyavDljNblVB8pFtI9pIrKEnCkK9qYAJYLBk+8CO/HbcO7n3lIz/4W4dMt8Su PN3qzqfQajZT/DuKfVXCZ8ukqmnPn2tigDY2WcBDViPie59Oir9KseYg1hQroogFzD Ji5bHV6aYzYzg== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Martin Tuma Subject: [PATCH 45/55] media: pci: mgb4: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:44 +0100 Message-Id: <20231127165454.166373-46-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:59:05 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737200986716046 X-GMAIL-MSGID: 1783737200986716046 mgb4 driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard CC: Martin Tuma --- drivers/media/pci/mgb4/mgb4_vin.c | 2 +- drivers/media/pci/mgb4/mgb4_vout.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/mgb4/mgb4_vin.c b/drivers/media/pci/mgb4/mgb4_vin.c index d72b07b87cd1..89e87aa87341 100644 --- a/drivers/media/pci/mgb4/mgb4_vin.c +++ b/drivers/media/pci/mgb4/mgb4_vin.c @@ -849,7 +849,7 @@ struct mgb4_vin_dev *mgb4_vin_create(struct mgb4_dev *mgbdev, int id) vindev->queue.mem_ops = &vb2_dma_sg_memops; vindev->queue.gfp_flags = GFP_DMA32; vindev->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - vindev->queue.min_buffers_needed = 2; + vindev->queue.min_dma_buffers_needed = 2; vindev->queue.drv_priv = vindev; vindev->queue.lock = &vindev->lock; vindev->queue.dev = dev; diff --git a/drivers/media/pci/mgb4/mgb4_vout.c b/drivers/media/pci/mgb4/mgb4_vout.c index 857fc7bbd21a..23f0e4fb195f 100644 --- a/drivers/media/pci/mgb4/mgb4_vout.c +++ b/drivers/media/pci/mgb4/mgb4_vout.c @@ -523,7 +523,7 @@ struct mgb4_vout_dev *mgb4_vout_create(struct mgb4_dev *mgbdev, int id) voutdev->queue.mem_ops = &vb2_dma_sg_memops; voutdev->queue.gfp_flags = GFP_DMA32; voutdev->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - voutdev->queue.min_buffers_needed = 2; + voutdev->queue.min_dma_buffers_needed = 2; voutdev->queue.drv_priv = voutdev; voutdev->queue.lock = &voutdev->lock; voutdev->queue.dev = dev; From patchwork Mon Nov 27 16:54:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170320 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288033vqx; Mon, 27 Nov 2023 08:59:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IE6in96RocbJ4svnuBOezjpuR2sP2cwcym8J2s391TkXaZVVSrf8Z1XO/NknUnHtQ5ZwES8 X-Received: by 2002:a05:6a20:d396:b0:163:5bfd:ae5b with SMTP id iq22-20020a056a20d39600b001635bfdae5bmr13554644pzb.15.1701104343079; Mon, 27 Nov 2023 08:59:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104343; cv=none; d=google.com; s=arc-20160816; b=jr/yusGiM3c+rSmHBhvzwHgt0yIGbWCJYQk+HFdKHnb1F0JaNDoyciudkbnYQo72kg E8hcNywHh9a9bBeVUqcsIVYlHbP5+Ub/jNo28KXXswJbGCfN/IAWmD6FJTceBN94URIs cu4lzBoiyaxR6f+a0bKeBQxwiIiy0CE9WUfd0f6VOEDwga+omaX93/YIyu+rkEZwJAj4 Ob8VW22vSikynkR8i29wZC4dBVjLUc7AY3Ph+w+153kKIHJZEk7YzXU2wBWxPql7EjJX I+oPau0wHax+3oT8S0vN9aVzQFTXGyE/m0/oaRdKx4uou+DWPIg5n+GacMFYg7ZPVsMR 4aMg== 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=Hj0mFoPwCfeRgM2W4BlDnPTor8hjjYBDlJKF3Dgu8l0=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=dbD9R+AncRdbO2LBgybZg6sw0BFrQE6wQQvGUkK7FXucuI1tcvNxh16GOzoYm8U7dF Lh3O2rnDQYvP0DagSv9TFhrqHYx+AZ6zF7+Qy/p3bRzPjubrMGpicAM12fqxzuZh2NJf cDPRZJXACR9q+O7K99hsEek7SfNghBMDmyGbdY9xtGYZzrmzSJK4n5zrHQrKcypeuHw3 36Zqw+4U7qnnCx3OwOKgag4mk5KrX63EU3B8v8nkpYH5BPXLX3kYIc/cPC6ZSwGOPN9H g/AEpMwsCZ6LJ9Lnu3k2y8iwZW4frQgLWwTeGCrQsJeQ8KcfRcVRSsKlsdM46efPUgJe o6SQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=cG1bHKwq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id p9-20020a63c149000000b005b8f181b729si10303414pgi.360.2023.11.27.08.59.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=cG1bHKwq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id A57EC8158394; Mon, 27 Nov 2023 08:58:53 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234260AbjK0Q6g (ORCPT + 99 others); Mon, 27 Nov 2023 11:58:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231613AbjK0Q4e (ORCPT ); Mon, 27 Nov 2023 11:56:34 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 924EB2711; Mon, 27 Nov 2023 08:55:42 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 E0CCC66073C4; Mon, 27 Nov 2023 16:55:40 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104141; bh=PRyjDZo6H5GsqtbpHscthGR2/GFV898HsT1KwjvLl4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cG1bHKwq7A65Ykdw7aja37ljE9yrOfjiA4eY+S7Awyo3OWXNWsPApIX3sKuUcborG X08yx6G57GxV8EVnKKYznJdbdWLg7u6ZDA1LXToQc3kRMvxr8t+vKEybtBE0dRqDlV TmFSGspRPhaq2pkmakfHZytJVjB55ZkGhMcg6skfw2P/DxgvDOUSr+Cjb81su3PgR4 18O9aa2wXUkTcCmAeYkGL0vLLjzgWKbvSyaIns+iTnV09V3WBDgcpCfgsSHc0ZVUN2 zy8sP9CewpvLbu1e7rqJF4+EHInrvXRrbISJ9sw8ja93D68qFmwPwOQLKhM1Tl4rc5 CR0z2PcbDz23g== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 46/55] media: pci: tw68: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:45 +0100 Message-Id: <20231127165454.166373-47-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.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 (pete.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:58:54 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737188138889187 X-GMAIL-MSGID: 1783737188138889187 tw68 driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard --- drivers/media/pci/tw68/tw68-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/tw68/tw68-video.c b/drivers/media/pci/tw68/tw68-video.c index 79b627ebc92a..b181abe3bfbb 100644 --- a/drivers/media/pci/tw68/tw68-video.c +++ b/drivers/media/pci/tw68/tw68-video.c @@ -952,7 +952,7 @@ int tw68_video_init2(struct tw68_dev *dev, int video_nr) dev->vidq.gfp_flags = __GFP_DMA32 | __GFP_KSWAPD_RECLAIM; dev->vidq.buf_struct_size = sizeof(struct tw68_buf); dev->vidq.lock = &dev->lock; - dev->vidq.min_buffers_needed = 2; + dev->vidq.min_dma_buffers_needed = 2; dev->vidq.dev = &dev->pci->dev; ret = vb2_queue_init(&dev->vidq); if (ret) From patchwork Mon Nov 27 16:54:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170321 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288047vqx; Mon, 27 Nov 2023 08:59:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFjN3XOXpyEeWGcP8i/A0up0SbI1Yes1qYJbKZwsCODWZEX5QMaijAn0hC9UABkp2aK6LaY X-Received: by 2002:a05:6a00:ad5:b0:6b1:c1c4:ae98 with SMTP id c21-20020a056a000ad500b006b1c1c4ae98mr15286997pfl.18.1701104344996; Mon, 27 Nov 2023 08:59:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104344; cv=none; d=google.com; s=arc-20160816; b=ydheaepAvjaXCp2I/2dmitRGyOZoxCnbD26gNkrl6/ET/Ih5rfk+MNbsrVkZDAku9p i4A1cNA/iR75tc8QazLe7iswlaSFpTySJw/39+8njb8XqB5K4KkcVS3b35M+Yr23knwT FonkpO1APyzlDazqkJcmB5PKdU3g/ftGWD1ndfoqMw/4Md1Ri58rzRalKhWkjZHG9HZe MQh/ZJCSrbHPumBAWS0vua8p2FXOr/tIdlqXZqLPYafhNBzddZpNH2nBwWaFF/6O+t3m NLvMT5fmqXCURL/NeBrNPkLuz+XnzYDIPIs4ZMT9WYq4JvNZZDPgcS9Qh3xo+rrrdDQm fJeg== 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=HAMWbPAmb/B9FYkou6ZtQmyRgNEfLhiBOzsMHUJ/E7Y=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=ZbG3C6SGJVdLdxGoZWRzwfKUCoSVXl/m6q5/gdG/gVvO3YzHM+TMEuJspvqcxQf9NI +1gLB1MQ2cgMhvJFoCmNtcLgTqCZAx+uY+TCgJNcB6SufDMwGyRYnzYJMPwrpgvbPalS ahW7goP0bZXgU8FbWPwRJfUYI4f/WaC32WWlGjMVGChcudIk+sUeVbC91XVDy1Swvoqe pzwyl2GjC6X7GnjKRHRm7Q/QZ9QiINlMu1fbo3gwV3nJ+geLwaNEGJ+69vYiJd0C4Kz8 m2ATYsh+4CBeVZxQwmyYLihHX+wcQkuNPGDGYWd+Dd72Jsq6fXj6Rf1M7dgXjeR0jiIK Aa+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="BQj8M/J1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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. [23.128.96.34]) by mx.google.com with ESMTPS id b19-20020a63d313000000b00577f4d85fdbsi10402498pgg.548.2023.11.27.08.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="BQj8M/J1"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 2A084823364C; Mon, 27 Nov 2023 08:58:56 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229761AbjK0Q6p (ORCPT + 99 others); Mon, 27 Nov 2023 11:58:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234382AbjK0Q4i (ORCPT ); Mon, 27 Nov 2023 11:56:38 -0500 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 5E4CC271B; Mon, 27 Nov 2023 08:55:43 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 90AB966073FF; Mon, 27 Nov 2023 16:55:41 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104142; bh=Wj8OYs20xhu5X0KjHm+m9uKdirvOmODd8Mcxd+Qt7UA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BQj8M/J1cYgOnIVpoxfsdFlaceRBrewTRf11KfTbkrhsvHQeB5H92rKdqg/NUrZ+Q gNJNzfFnfD+h2IQXpj3PUPGZ30KORSrMSFYpnnurWe58kEnhDYcdtpfKd00j9elUpM 3T5rmuhyuyq+VDQG4J7q0Z8CEi3z2i8Wn3OkQz3357xg7zPqpaV6hYuHqB8u9imSj0 ItI2/9PtQdKLEkQ40eGJy1JWjIC4HGF5qUdG7Z55SwE7oQ5jMa9sdIYLBo/p1bNoCA uYXSn9I1JyfpfZ88yW7Pys1CQDpnYacFxYmUS77kbk8g6rNwh68wB7XqJvhasI4BJN WXSvoToIZbc/g== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 47/55] media: pci: cx25821: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:46 +0100 Message-Id: <20231127165454.166373-48-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.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 (howler.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:58:56 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737189538595631 X-GMAIL-MSGID: 1783737189538595631 cx25821 driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard --- drivers/media/pci/cx25821/cx25821-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c index 1b80c990cb94..7283a7379ae1 100644 --- a/drivers/media/pci/cx25821/cx25821-video.c +++ b/drivers/media/pci/cx25821/cx25821-video.c @@ -730,7 +730,7 @@ int cx25821_video_register(struct cx25821_dev *dev) q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; q->io_modes |= is_output ? VB2_WRITE : VB2_READ; q->gfp_flags = GFP_DMA32; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->drv_priv = chan; q->buf_struct_size = sizeof(struct cx25821_buffer); q->ops = &cx25821_video_qops; From patchwork Mon Nov 27 16:54:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170322 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288155vqx; Mon, 27 Nov 2023 08:59:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IETjMa5sxe+fFieLP6MDuYkkXQeyP0lMcd+IW0q+mjwC0E6aF5S5G4O2L+Z7pkFSbCpDBUW X-Received: by 2002:a05:6a20:5504:b0:189:c46d:9790 with SMTP id ko4-20020a056a20550400b00189c46d9790mr13475153pzb.30.1701104353169; Mon, 27 Nov 2023 08:59:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104353; cv=none; d=google.com; s=arc-20160816; b=NI1AaHS7xHZasnOvLrVYoKKuik13QAKylB3W2TGLoWxtOpZrZA0agXKy/yadb72k39 e4zW8H/DGrMfEgS0qVdnd2PTGlUNtU7ZYe+O8PEewgyI1UaxdrI6J9iASXm+FsWfHSYi PH/wp90mOtiP8fqZcZW9qdtq/bywQxxq0T5bK4M/B/r7tsHMLldQ0S0ezxi22pRTekuP XrluEM+Df0RhlQoH82Sw711sDuJmIH4C3+J3cyT4c1hF+dpfu21NhOHd8gvtgYZFaRS4 NJp0twKjxRPgUhr0uEqtDOHzvLdrn11RZvoVq9KQJwsMVv8F1jPUOKVdAsLtaNAbTkg9 HrAw== 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=i5jG4bf8sSUXOhOlXeE3gKuyw4u5gs+VaHRkVqo0QZ8=; fh=eMcKIeJ/H4vMh6HGNAiJ/xCZNf94NsruzJS5R0XTbhM=; b=AZz5En4w1ohlYOFWBaIIkdixb9IulZaD9cb/bByJnFKEYFtPpsrXnfiLYTpxtBqjID MAtKmPpnfAKnqJmssapTXHFSmvzVzhZ/QvUIE3v201VypWzFTiyoENmizd1XKH6uD6SC jtWCLf3Qm2REyKdN25a+QdhAsZT3LU0cGDZgl1/wFSyTrhNbLZrF0Xd1iNoo9+jeg0ZF 8XFlB8WJDL1oB91V+WT6ivbcsCRnzJ63BETDw0OLY5VEk1oYZ/srPYJFspWDVJqnMFG8 COZn/U/e1vD1kV6GM32iiVeNdJkey87wTKkijL7ojZqK4F49dgBBWUOtO08ArGHCHPxC xWpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=lrj3kg6h; 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 s14-20020a65690e000000b005c203ace543si9469466pgq.774.2023.11.27.08.59.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:13 -0800 (PST) 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=lrj3kg6h; 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 06D80805CCDE; Mon, 27 Nov 2023 08:59:07 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234471AbjK0Q6v (ORCPT + 99 others); Mon, 27 Nov 2023 11:58:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234373AbjK0Q4n (ORCPT ); Mon, 27 Nov 2023 11:56:43 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 545A72729; Mon, 27 Nov 2023 08:55:44 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 451956607415; Mon, 27 Nov 2023 16:55:42 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104142; bh=UHmN7DYDyoab4vSZsrfP/xW1VruJJjAHjGYWzN7yozk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lrj3kg6hVhrAmuJSFfTjyf/6lDbNyCtkyhgOXIk6j/FkIK8Zy0IHpn8WXuTNM14KB P05UGZihh9NRifbhDiEiybUbgDx9I7d3stjIqY6pT2oZy3YLQdlMORzYAw4FSTxupT Ll9Ho2XdIuhHW/p46IcBIXdhEtlds52vOtgt3HSzQ0mEsDXuQaDGwtbgFPHK+6tGn0 ukHY+x0HELnnBBOQ94GhhvO5iPk5YGQb6jOefzF+Gc2bJFXwGhA2TkskLxm75isZ9Q fTgROk3eaPwKLcpJsMLyvnyjS87YrpjE9EgeQqAldgzhCeROl4gYQJephIk3Zlnwyv WFIiXzmPPXV2A== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Bluecherry Maintainers , Anton Sviridenko , Andrey Utkin Subject: [PATCH 48/55] media: pci: tw5864: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:47 +0100 Message-Id: <20231127165454.166373-49-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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]); Mon, 27 Nov 2023 08:59:07 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737198233571609 X-GMAIL-MSGID: 1783737198233571609 tw5864 driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard CC: Bluecherry Maintainers CC: Anton Sviridenko CC: Andrey Utkin --- drivers/media/pci/tw5864/tw5864-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/tw5864/tw5864-video.c b/drivers/media/pci/tw5864/tw5864-video.c index 197ed8978102..647a57552d4c 100644 --- a/drivers/media/pci/tw5864/tw5864-video.c +++ b/drivers/media/pci/tw5864/tw5864-video.c @@ -1114,7 +1114,7 @@ static int tw5864_video_input_init(struct tw5864_input *input, int video_nr) input->vidq.gfp_flags = 0; input->vidq.buf_struct_size = sizeof(struct tw5864_buf); input->vidq.lock = &input->lock; - input->vidq.min_buffers_needed = 2; + input->vidq.min_dma_buffers_needed = 2; input->vidq.dev = &input->root->pci->dev; ret = vb2_queue_init(&input->vidq); if (ret) From patchwork Mon Nov 27 16:54:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170326 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288337vqx; Mon, 27 Nov 2023 08:59:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IGcOmBI+oBOH4xabOwG1/KzUrrHJC1FfifMqSqGA2oS0O0aknUFfKZMaZH3l1lC0tVsTyrk X-Received: by 2002:a05:6a21:1a6:b0:18c:198a:469f with SMTP id le38-20020a056a2101a600b0018c198a469fmr10685937pzb.37.1701104365698; Mon, 27 Nov 2023 08:59:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104365; cv=none; d=google.com; s=arc-20160816; b=F483gU0A8KI4Qz3RiEabHJ6cMfDQUb0t4fHziKIEwJ3KgdGxl+VAIkxPDl6MmcRFBS hduFUHRLu0yc7juvz9l8P/JZu4Z8gNvoWGaorZO7x00+pmehyWM1hPoSL43w1CsW4Zpz VBmfPjtHsOOY93lXi2Nk/Fuy8UTRgGhyKpMdCxolcC7YA55/6uS5qY6emUE03C5z0P/3 DCD+kjNklejFJUl6yb1MrV0UEH7FP/YaSDp7tXJ7n3OjyMMv0aKkW2fD6cn6rFvUqoVV 6GduVJm/CzdHFmSPvqkmAQZSrfMyFSXR1PL0mHWL5vZIznCQX1ZyPt1Lgp9dIi0oeklb MCqw== 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=46v8oa7Z67EEE4PiW5TTV1HU9ELa+mVRnthuLKX6BgE=; fh=eAcQtj91GRQ0+IAQeTLC+9KfTykzo9G9pCIg9Ah4cU4=; b=PwHqCu+tl9bHzlaml/slJc7M+Va9SSw0XWIxvG5zDqq2fvEJ0O+fvp5uRT2+U9PjiF DY2OJfPxjJThbnCvauVnx+uk0Ltp3SZJh4pItYPn2rbBI10sOxi1xTa4YkUTadXHuoPz v3IspL988XaQ7pH/HjUcbcORKkV0/t0DfDc1LRZ71XpOaLQXxFy6tUJlV+zJVoMGNe9+ P9CUdGgi0VZJWbuBupB0muyk7qC3xXXNkzXJaZ9rIjm/nZjzvecU0jXMxCyKREWnx22H dyvAI2LOjcTD/TYbvWa6nmi9vLBykP1WhIe/E7Qgllb9+x85vZLuXAj4OWe0LUzk2svA z6sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=A6o2TRtF; 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 e20-20020a656794000000b005b9302f3e47si9794834pgr.3.2023.11.27.08.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:25 -0800 (PST) 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=A6o2TRtF; 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 8CC1C822D56F; Mon, 27 Nov 2023 08:59:17 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234529AbjK0Q65 (ORCPT + 99 others); Mon, 27 Nov 2023 11:58:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234531AbjK0Q45 (ORCPT ); Mon, 27 Nov 2023 11:56:57 -0500 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 CB8E02735; Mon, 27 Nov 2023 08:55:44 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 18229660741B; Mon, 27 Nov 2023 16:55:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104143; bh=Mxq3P+lsb8M0itZ6b+v4Rn04+ZsLR+XPLGh6cGBX67k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A6o2TRtFR2EShU5r93olb3q5hdHStAddtYo+S3lmkAGcVZfdEzzqMuytXXqwyaMY2 2V/DzYe+wqebU8cH4uTiRvlRpO+aXDNnrCEYo06Yn25Ay4yHcYpL0c8BghEce3KOps OCd00e7eTJDMM5wWlbqDNq5betijXt+89hl9JPOw0MHEwQqB+HhOpTjcOB7s+7tshe Im/EkvZHDNfN5OY/QSt6XVFSdobEVssFksc6DNJvFZ4NNE5vMFhle0nix7TrrgS/ps jrY1vPrPPwUdHtQjP6lQjaAQfnk9ehjRazgczfdawAeVWOH5l4olFj7vgi7rnp8eHf 0mCs4h6bEHolw== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Ezequiel Garcia Subject: [PATCH 49/55] media: pci: tw686x: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:48 +0100 Message-Id: <20231127165454.166373-50-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.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 (howler.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:59:17 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737211572453513 X-GMAIL-MSGID: 1783737211572453513 tw686x driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard CC: Ezequiel Garcia --- drivers/media/pci/tw686x/tw686x-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/tw686x/tw686x-video.c b/drivers/media/pci/tw686x/tw686x-video.c index 6bc6d143d18c..8526c200f305 100644 --- a/drivers/media/pci/tw686x/tw686x-video.c +++ b/drivers/media/pci/tw686x/tw686x-video.c @@ -1222,7 +1222,7 @@ int tw686x_video_init(struct tw686x_dev *dev) vc->vidq.ops = &tw686x_video_qops; vc->vidq.mem_ops = dev->dma_ops->mem_ops; vc->vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - vc->vidq.min_buffers_needed = 2; + vc->vidq.min_dma_buffers_needed = 2; vc->vidq.lock = &vc->vb_mutex; vc->vidq.gfp_flags = dev->dma_mode != TW686X_DMA_MODE_MEMCPY ? GFP_DMA32 : 0; From patchwork Mon Nov 27 16:54:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170327 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288372vqx; Mon, 27 Nov 2023 08:59:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IFvgz/qA/V5DHzD+0faau/BR7Rwns8In1xQ6+e8NuYnaDpJrc0vlQnK3K11E8ZMtzKB01N3 X-Received: by 2002:a05:6a00:4acb:b0:6cb:913d:2cce with SMTP id ds11-20020a056a004acb00b006cb913d2ccemr12140464pfb.15.1701104367947; Mon, 27 Nov 2023 08:59:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104367; cv=none; d=google.com; s=arc-20160816; b=d4gIiA5hUJGbDgO6daRUdUbhwS0VhAzgoeW7QLgYUY2Rz3CuEF3lFFZppYgPh2IY4E /u1LGybqfkpXMH/Tl5IZAiJp80lVLO8mjZsSsgxFMBjrsziyaPXxIlpIMw+4Rybb1DIK sQDWJngCzh+QlG3fvr2oaGOXuogPmSdoH4uW/QQz1tTm3PGGV4UrdaEn4PfyyzDa68f/ cYwILeFm6TJZ1VPK+SsfxqfL8xjOa4qVJ0/evPBIUjx5a6mUyeGLdTqZUvibgVVZ6ocJ gddscTdLNttBW2z9haOHTxv2GmjM+TfiiZ3SKRamQMQUq0ZGkscUpvmbfK+vd096cM8u KyXg== 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=UqvdrkUFemjKvRCT9RMiJ4Sq3s07hgFyzehlDx+msRI=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=Ka5DMjOfM06KbIVvtPgEsoxAMTuFmuqvo3MVYLL/f8JS5M4V1PkJ6GXDluqXQE+TQk 9qHSp9PO5KJ5jUFWSv1iUcPcBLaT4fvytkxVCDMIgxH4GQS7FXmbjhF6mAAwrrdnvP/f dPaGy9mRwORUjjhtwtCmW2hdA+xFCYmITKi9F0gjZm/X7846cE3uZ1ogCEZcQF8lWuiN kGs+nkT+vmfJhgtINsMqmsUL6RdJopr/KN+f0QqZYzfIHDLtwX3DxOQiy1C+O0Fbdska RWASzNfWjqVPpu+67EnkVj1utX99IKSjJhgTbpzVa7NEs/Ev77GGR08B1QAwhP9N3Ghg BZ4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=J5d5ZjFG; 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 a2-20020a056a0011c200b006cc01c90d31si5889384pfu.312.2023.11.27.08.59.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:27 -0800 (PST) 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=J5d5ZjFG; 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 3D6DF805CCDD; Mon, 27 Nov 2023 08:59:25 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234613AbjK0Q7O (ORCPT + 99 others); Mon, 27 Nov 2023 11:59:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234624AbjK0Q5c (ORCPT ); Mon, 27 Nov 2023 11:57:32 -0500 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 C10862D46; Mon, 27 Nov 2023 08:55:45 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 CBA5C660741E; Mon, 27 Nov 2023 16:55:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104144; bh=bl7A7cze/Fs4UDnfd9OCkp+Gbfc6kPJk9SWpxLmJ3Pk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J5d5ZjFGg4ROA1NRrXHHuUPO7jXzI0XIeWXJhwb2b+gH6Ie1Qxt2e3cJo0VlSR1oA cX060uC1AeqYvjTfDc1ieeV+yDijP3RktQDbBInFHfANjb+aM8AdPJE/Dd9g+0HEM6 mMRjAQxqxdLd3YyVh0SaD1BZKIzlr/K6tLHlBlRomaMva0rQxESVJROaAZBANZ1A4F xA48dVXi6GRSNdytMp2iMl3m4mN2bl9R7Hpq8kJhaevWRUu4GQnaVbflt/lK4H9ICD fTuMCFhpgt0/vuHOdH17FpoqbwyeG2Q7x2qbUsnzVOuxxPmf15c4iqjC7P8z8f79FA MRRtrxBQM2vrw== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 50/55] media: pci: cx88: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:49 +0100 Message-Id: <20231127165454.166373-51-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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]); Mon, 27 Nov 2023 08:59:25 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737213741057223 X-GMAIL-MSGID: 1783737213741057223 cx88 driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard --- drivers/media/pci/cx88/cx88-blackbird.c | 2 +- drivers/media/pci/cx88/cx88-dvb.c | 2 +- drivers/media/pci/cx88/cx88-video.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c index c1b41a9283c1..9cb14d661eec 100644 --- a/drivers/media/pci/cx88/cx88-blackbird.c +++ b/drivers/media/pci/cx88/cx88-blackbird.c @@ -1195,7 +1195,7 @@ static int cx8802_blackbird_probe(struct cx8802_driver *drv) q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ; q->gfp_flags = GFP_DMA32; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->drv_priv = dev; q->buf_struct_size = sizeof(struct cx88_buffer); q->ops = &blackbird_qops; diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c index 2087f2491c42..3473e1e93a24 100644 --- a/drivers/media/pci/cx88/cx88-dvb.c +++ b/drivers/media/pci/cx88/cx88-dvb.c @@ -1776,7 +1776,7 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv) q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ; q->gfp_flags = GFP_DMA32; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->drv_priv = dev; q->buf_struct_size = sizeof(struct cx88_buffer); q->ops = &dvb_qops; diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c index c0ef03ed74f9..31eb79bfa547 100644 --- a/drivers/media/pci/cx88/cx88-video.c +++ b/drivers/media/pci/cx88/cx88-video.c @@ -1411,7 +1411,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ; q->gfp_flags = GFP_DMA32; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->drv_priv = dev; q->buf_struct_size = sizeof(struct cx88_buffer); q->ops = &cx8800_video_qops; @@ -1428,7 +1428,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, q->type = V4L2_BUF_TYPE_VBI_CAPTURE; q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ; q->gfp_flags = GFP_DMA32; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->drv_priv = dev; q->buf_struct_size = sizeof(struct cx88_buffer); q->ops = &cx8800_vbi_qops; From patchwork Mon Nov 27 16:54:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170334 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3290573vqx; Mon, 27 Nov 2023 09:01:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IEc+1qz7Vkammus2FIIIOwScG43xXtRzqPWk45YVtjmoH67FXSOp9NtBPHSd2XOnu3VbxHq X-Received: by 2002:a05:6e02:12e5:b0:35a:fce4:8b68 with SMTP id l5-20020a056e0212e500b0035afce48b68mr15802336iln.4.1701104498906; Mon, 27 Nov 2023 09:01:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104498; cv=none; d=google.com; s=arc-20160816; b=h+q6tuhIxQCJD4DaZ2iPazzhKQ0YoYl1uqgH6R74fLcE80Q4wUSg6idAy20IluSdg6 OpTisMlV0mMB3hjAxmD1Hbbdx8DheG5HJ9L8cf4PFoJBrCiSgzImT/9cmO7rzyY4Fk3J 491fSu/1dbGMJrGiIc6l2+HILwzWtUFBg2uKZrBYh4FWviPGKIv+rn1XVFMXhYTbpRM9 wSoKfG38b3OhyWSL1YqO+tyLIe00EIKKiTwfmxvYxYZivIu64ghqMOsXzbXTAniEF83b GJRVwHZjIR8fY1kxib8Wsl4Djy+ykfnppCDd5pZKqj3PihU5AOLwWnr5eeOtXrhjaO/k BgSA== 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=iyxarXCz1whNmPCMSrfIG1iBy6cyhxaTiKsqkUYpg6s=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=l7j+TvPa2krRgHJtafE2qKCYmPhGTeKscpLxWJd5NC7XaDRe278EqJINRRqFl2LXak lFEEl7JYWRp/4KU1/ipiG4+mGH3izTlngugU6wQrar7Md3VQxKIb31nePLhY7TjgmCRi dKYNRYEUVqc2IclC/ZfHeJeT/HJsksbA0TbBv1hdeKkZPd33iL42KCo5PiMmgMoj0661 Iq/2y4X1SSbCfsc84wvILF5NXcXPrA4tuks25VqjLyEzkrg7dbU2kXT5e+Z5/K+Llb8a 8a/OiYsZuOAl4UKaOL+JyJSs8asdL+HiVgR3c6mWaWnBXX1TQjW32GTgLcezlFgStxp7 DubA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=bWEody9R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id h6-20020a056e021d8600b0035ced0acd6esi724482ila.34.2023.11.27.09.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 09:01:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=bWEody9R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 2FDF580873AF; Mon, 27 Nov 2023 09:01:36 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234375AbjK0RB0 (ORCPT + 99 others); Mon, 27 Nov 2023 12:01:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234302AbjK0RBC (ORCPT ); Mon, 27 Nov 2023 12:01:02 -0500 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 5E2122D4F; Mon, 27 Nov 2023 08:55:46 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 817EA6607347; Mon, 27 Nov 2023 16:55:44 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104145; bh=l0yA+tkYAIYjSficENb2r/EZg/4Zvfn7jPg69IDt+aw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bWEody9REaxKp+AZdERITTmjwYiVD1Ytqd62b9M8v/RhCAaSJVc6iwbWgDcDoLPBb lcQ3tFAzSdXrsLYlrSUiNTo4XH3cIefIEKLJZHMlnuLzT0dwsU8Vmgmipy/ubVVsWX f4k6jJ5uZfoH60dUcT4Sz7MvwWZiVHQkUsfY+lPznBquUBUAq8kEKsJZyPoG5OguTd bcQA7VIhiku8qWd3MIJGCRRp/lQa493PRxsmtx4VQrMe9BR42iyWG1XxpFX65q+D0H +kUkB1q1EbSiMvmsCH8Kjr1gFeJ9bY7Xrz+ShVx+tWvZKYCODlc7j0xIMOE+qlSMuk b+gg4DqkqqRQQ== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 51/55] media: pci: cx23885: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:50 +0100 Message-Id: <20231127165454.166373-52-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 27 Nov 2023 09:01:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737350876896622 X-GMAIL-MSGID: 1783737350876896622 cx23885 driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard --- drivers/media/pci/cx23885/cx23885-417.c | 2 +- drivers/media/pci/cx23885/cx23885-dvb.c | 2 +- drivers/media/pci/cx23885/cx23885-video.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c index 434677bd4ad1..44c93484d42c 100644 --- a/drivers/media/pci/cx23885/cx23885-417.c +++ b/drivers/media/pci/cx23885/cx23885-417.c @@ -1525,7 +1525,7 @@ int cx23885_417_register(struct cx23885_dev *dev) q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ; q->gfp_flags = GFP_DMA32; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->drv_priv = dev; q->buf_struct_size = sizeof(struct cx23885_buffer); q->ops = &cx23885_qops; diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c index 7551ca4a322a..7509fbda4e18 100644 --- a/drivers/media/pci/cx23885/cx23885-dvb.c +++ b/drivers/media/pci/cx23885/cx23885-dvb.c @@ -2667,7 +2667,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port) q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ; q->gfp_flags = GFP_DMA32; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->drv_priv = port; q->buf_struct_size = sizeof(struct cx23885_buffer); q->ops = &dvb_qops; diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c index 9af2c5596121..13c5812a8833 100644 --- a/drivers/media/pci/cx23885/cx23885-video.c +++ b/drivers/media/pci/cx23885/cx23885-video.c @@ -1321,7 +1321,7 @@ int cx23885_video_register(struct cx23885_dev *dev) q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ; q->gfp_flags = GFP_DMA32; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->drv_priv = dev; q->buf_struct_size = sizeof(struct cx23885_buffer); q->ops = &cx23885_video_qops; @@ -1338,7 +1338,7 @@ int cx23885_video_register(struct cx23885_dev *dev) q->type = V4L2_BUF_TYPE_VBI_CAPTURE; q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ; q->gfp_flags = GFP_DMA32; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->drv_priv = dev; q->buf_struct_size = sizeof(struct cx23885_buffer); q->ops = &cx23885_vbi_qops; From patchwork Mon Nov 27 16:54:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170330 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288419vqx; Mon, 27 Nov 2023 08:59:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IEUi1gWa2cz76KjJMt8gT81RS8RWdXvWbUzjPQ0A3cInB5S9MehjAv8BzX7X1O1ZqW3kDVH X-Received: by 2002:a05:6a00:2919:b0:6c3:38f5:99d2 with SMTP id cg25-20020a056a00291900b006c338f599d2mr10515539pfb.11.1701104373101; Mon, 27 Nov 2023 08:59:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104373; cv=none; d=google.com; s=arc-20160816; b=Er2lb8s2d+6/2qXYJ89IMeJ1EFCujC7hwzCtbWSJBB9PMf5g5FTKfcJ3PZDDtTUK7Z qJWwLvJ+12jK3vsnt6PyqcWqqRRt4DqQlMAJHSh24PElI1uLOXwdDVuEJDkL238wKx34 4S04d4QQoA0yjHOo1oDT/gdM9cm/9c3jVp0ERRrp8C+5+kpUmT+SLvLmAhnH8JIR3JjO W0w7tSuEFkFMKV2tXihDkJ/JN+nw5AM2JUWTKfPSToZEEuUGPqqGn2vFxQpHrDpT0prm j5HWVW2tu4CK6WWMNkNex0SZvcaLq19lDhDMtg+IRYAlg6nDXyJ2ZRvL4FnPxtDus/iB vC1A== 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=h2Pm1baCn9QPU1nZ7/ZH3IZRVj+rZWeoG1IwhGMeY3w=; fh=CnIAPQxUhJ5eUc7O4Aaw6Zjrhq4UtGGbVudgNPFZTl0=; b=xV0vfkj1L2Urrcna0BmB7Bkh4kBv6v/dOzWv0FdlsKk4PMeASktsyjvvSeQaTCLypC v6HXVSJJpJ6N+PQtV4PLP58Yrk2mnsO2dXSdtJjh5F1anLpVLoi48xR6+iG5zYE8OKHW ZHXSibLC/v2Dg589HP0M1XvhZTxlQt9Ec8xBqqq+ouUlsAlNaQwNoFg8VLHYYf9HiXSb YHzwkXiBsa3yCtR58fNIzdPFUjEjJTZieZ6hvB9ItcfMeOvKqkBi39mXys6K2Ie+DpxV RIqw60EvTuyAwOGbIjqTWQN7KfnxzoD5DjCSTEsv1fU1hlzKjKtnCLITEc7Z13/TXn8D 0Psw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=UOQJzgrW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id fd19-20020a056a002e9300b006cb75e0f91bsi10683335pfb.45.2023.11.27.08.59.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=UOQJzgrW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id CA91F80A2640; Mon, 27 Nov 2023 08:59:31 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234536AbjK0Q7T (ORCPT + 99 others); Mon, 27 Nov 2023 11:59:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234388AbjK0Q5x (ORCPT ); Mon, 27 Nov 2023 11:57:53 -0500 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 A0F0F2D65; Mon, 27 Nov 2023 08:55:47 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 347576607424; Mon, 27 Nov 2023 16:55:45 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104145; bh=yBTcY/czjMNBp1trwVXXouYWoMuVcN590O1KG93acxs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UOQJzgrWxwOp2sA7iCF9XxZJq7N4qsbIqJgtBVRCKuSPh1OE50mJTPPDxhGrydikf FVleabN0drV801aIkvUbtkOPgQq7uf/pkN15a57SUTqLoK+DBlpFM/TuG2aTYbj2xU Bvtve6HF3qVwu/VINhnqzHZdv7Lugq/X497ztVoEXSZcCxIla8Hi0qNdPjkCDbRfxp 3qqpAb8DYCF3RWXO3IX5Vzq2OePF18K7FX9em/JKY44U7NDYWdi9iuTIRPfxo+mQX3 8rtiaC6AKCuQ1AchXUGqH6HGGn0ygk0F88LSMKGIPSdj/cxwEEhGp+S1yQEGqRDRck 072VCRCO/IUtA== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Corentin Labbe , mjpeg-users@lists.sourceforge.net Subject: [PATCH 52/55] media: pci: zoran: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:51 +0100 Message-Id: <20231127165454.166373-53-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:59:32 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737218782694336 X-GMAIL-MSGID: 1783737218782694336 zoran driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard CC: Corentin Labbe CC: mjpeg-users@lists.sourceforge.net --- drivers/media/pci/zoran/zoran_driver.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c index fa672cc8bc67..23ed1fdc03df 100644 --- a/drivers/media/pci/zoran/zoran_driver.c +++ b/drivers/media/pci/zoran/zoran_driver.c @@ -749,9 +749,6 @@ static int zr_vb2_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, unsi zr->buf_in_reserve = 0; - if (*nbuffers < vq->min_buffers_needed) - *nbuffers = vq->min_buffers_needed; - if (*nplanes) { if (sizes[0] < size) return -EINVAL; @@ -971,7 +968,7 @@ int zoran_queue_init(struct zoran *zr, struct vb2_queue *vq, int dir) vq->mem_ops = &vb2_dma_contig_memops; vq->gfp_flags = GFP_DMA32; vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - vq->min_buffers_needed = 9; + vq->min_dma_buffers_needed = 9; vq->lock = &zr->lock; err = vb2_queue_init(vq); if (err) From patchwork Mon Nov 27 16:54:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170331 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288550vqx; Mon, 27 Nov 2023 08:59:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IFeuQDduGA2GAfr/5XiGBEAXpVwKgvESY3mSVJUGR07zniDHGqjom/xNy+vRjpWdjw/QTrq X-Received: by 2002:aa7:930e:0:b0:6cb:ccea:e311 with SMTP id cz14-20020aa7930e000000b006cbcceae311mr11043354pfb.4.1701104385767; Mon, 27 Nov 2023 08:59:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104385; cv=none; d=google.com; s=arc-20160816; b=KhhNFCtRDJ2CdIPgW4kh8tSSe+iQIpbvRz+L94o614C7s78eG9JodQZAkQ2dipJ+mb D59k04ZwCXQh+NQyiiV21c68Retl1bb/FrX0BjzCRXIrlZnNp+A+tnBg3VRRRWkSSAJa BWjdu6dzwBnge5i4fscSYOKntrssjLS/oDhnJbehIaZL/iMdVN2Tfl9CxqEQ/AQAjwiR Ie1ecanwiR5bDNqbWJ2Cts68GpmyD3z5yZWBdSrH5ZiB3HK9EQW9f/ejI3Pf1akr4Lkc cVqx7TBLEOawm3+4y8HemGf15WgLGRahXrJOpGgAWY0HKAoE7HaOnnP1tZ1qQF3gswd7 OJYQ== 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=lf7fL2v/HJVkQKg5k3D4Ovh2doNmNtcH6NWg5O0HSRE=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=PXwa1PWuqVyJR9kxbXb6aVszIMds2bLL0xXR9p2W6N7XTiQOqyDUwNwMfCUeqph8xo /qbNc5iMX4/pMQaIfibj3fQ4Rm63kPlYegYBaP3p7xMhoy6LHgd90sG1g4dEoHH1hYH8 s0gTFtUJfGhOWarRMkQVTiqtphCGSLE36ZL+02sgcX97Z8wPa6aqIqCEJxsf0OtSAcRa DyUX9R2zNO/pGcbZKg7HazuSCD0tifQnE0ROG3imyzFanv/sYgXq/Jc5HT6/B+cxMz4J Tv3fcDbUYN2M3E2OcKQr7MKpjKoOPzbjojwhREzM1oy+fEyFFTDmuAdCp649iMVWzA91 TwCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=CudTVH0G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id 206-20020a6300d7000000b005b92edaa151si10134561pga.739.2023.11.27.08.59.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=CudTVH0G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (Postfix) with ESMTP id 100C280966CA; Mon, 27 Nov 2023 08:59:40 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234754AbjK0Q7X (ORCPT + 99 others); Mon, 27 Nov 2023 11:59:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234747AbjK0Q6R (ORCPT ); Mon, 27 Nov 2023 11:58:17 -0500 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 643F02D78; Mon, 27 Nov 2023 08:55:48 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 024756607427; Mon, 27 Nov 2023 16:55:45 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104146; bh=F5H/xy1t7xG2JnVZwoCdxqoIZwKLuviOUA/LItWXlFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CudTVH0GFVAKjdGuqqvwAJQo6DmaDPbWDIhBKTvy06O6+ZaBHxeVOOtmtNh1Tmoce pArKAwpVjiXPzhu12+CZStv9JKm+zQFThaHzQEwSHyd2VwWb/OPMUOLXtI44geV2nr lXV3xD9cB9VNaerWjiM8bC+RSlX7G0f8nSWn9HB+73763w4mtZZ8k8z7Nqivgf9z3j GVRS9rjsScq1g9+Exg6mQlQpH6olubrhR407oukK8/wk0S0+nLFJweoE++qIdqQ/5+ W6ImZWVz0Vsw5SKHVMspeXI+bKdMGSdhMSe0GdWUXOosAIgF3b0CnY9IBykMOvlPi+ oLBpGHFFim9EQ== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 53/55] media: pci: cobalt: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:52 +0100 Message-Id: <20231127165454.166373-54-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:59:40 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737232583410373 X-GMAIL-MSGID: 1783737232583410373 cobalt driver use a dma engine and needs a minimum number of buffers to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard --- drivers/media/pci/cobalt/cobalt-v4l2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/cobalt/cobalt-v4l2.c b/drivers/media/pci/cobalt/cobalt-v4l2.c index 26bf58d17a3d..9e99820f58d4 100644 --- a/drivers/media/pci/cobalt/cobalt-v4l2.c +++ b/drivers/media/pci/cobalt/cobalt-v4l2.c @@ -1260,7 +1260,7 @@ static int cobalt_node_register(struct cobalt *cobalt, int node) q->ops = &cobalt_qops; q->mem_ops = &vb2_dma_sg_memops; q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - q->min_buffers_needed = 2; + q->min_dma_buffers_needed = 2; q->lock = &s->lock; q->dev = &cobalt->pci_dev->dev; vdev->queue = q; From patchwork Mon Nov 27 16:54:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170332 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3288587vqx; Mon, 27 Nov 2023 08:59:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IE45pjVuOemNZF6x+ihTzxAPBUa0G9UP8g+WYaEXAujZ78QViOUaFu1oQ+U0++6APGXyvDT X-Received: by 2002:a17:902:a410:b0:1cf:ae5c:a4e6 with SMTP id p16-20020a170902a41000b001cfae5ca4e6mr10523909plq.16.1701104387820; Mon, 27 Nov 2023 08:59:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104387; cv=none; d=google.com; s=arc-20160816; b=QawOQsz39Zem5UBdODGeGZjiT7KRKGwKMWcd4dlH1PzWFIZUjvE30FXnQAfRLqjl0o ktaSWYM7pWbXx5xgfNICb1ek3gXY37fUyTCh2O2PlXy6H3eaZ+51Ms69kJJzhRfoWnwj liqQEfkFur2mjz2QUJnQK5bXORsO87q64wFAdMDxd/iEyxzAc/eXxcf0BhUfurRgh/wR cABaxVuBQPZWH9ErpAZRSj4JZffabF6Rf+ZJi8PKFAQisAJAQOtOwoObLhL/3rAE7q+H oVyATd4mFTUuD1zc70NCor7pMk2Jh3tnFfcE8/z/XoxKiqpgPujzSWBrOnU5upsB57Cg SoWA== 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=6MA3XuoAbK1fFx1fIpuYlxk5KQcuLoSgERJxBhgki0Q=; fh=tcpY0snEudFdfBF84P+i33x62st2u4N2Rdd73EYhUeo=; b=pmwFJvqaI84ciB2rFaSBZceYY7y16M5wpQXFlh+m+p222jt2fk+kqz6PWw+Vfd5YWf wx60nheBSlgAgnho7zHn/w5y3mZWhahUrgdtjim/xno4D9Bh4SEHrUoV0mOwhAkfg+Zg jJVVdrV2holQfJb9C6QLujqxopecd3EyGQFi9yL5ZzKMJ3/NR/PtcZ/AJs2C/bGsaZIg TMF77nt3O0yX/ekf6S8ijzfYDEP44lFMMzOqJeb9+N3QuEwIykabgMJU52scwByWoDwv rlSEN6rQ9SFse/t85kbXX6DbSTrb+d5aIxm/AFWkIduOxrQ3FoCWtzsa3095yoiXwJ9p 6NuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=MINNiUeo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id q13-20020a170902dacd00b001cf91fbd5a6si8061615plx.407.2023.11.27.08.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 08:59:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=MINNiUeo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (Postfix) with ESMTP id 0B17580E6C43; Mon, 27 Nov 2023 08:59:44 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234802AbjK0Q7e (ORCPT + 99 others); Mon, 27 Nov 2023 11:59:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234777AbjK0Q6d (ORCPT ); Mon, 27 Nov 2023 11:58:33 -0500 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 5C2B430C7; Mon, 27 Nov 2023 08:55:49 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 AA5E4660742B; Mon, 27 Nov 2023 16:55:46 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104147; bh=yC3FV0N0XOijdcBv3yWO8BmzCgseS3Y6Nq1H8uXjYec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MINNiUeoz/GUMUqWdqXdfQ65v0Ab6vh2Hp0YWf072N/P008c+syLugxYV7eNvXefT 18oTjv9H7wIv3zOWAGkBSiwmn1HFWBMl5HbDwqcX5zBCfUTqx+izbQab3L6f8vOAli MYW1XuK5bpjjK4wgGAO5lVPyoQY6iT2LkcBIAbRM0wmj7+MzZtZJ1yqF0F93nlGClx 9kX5ZUKfPeyvqmeqH5dftIOshujd1EFKrCs9p/V1lI95/hTIjrUNNNEcaaaDTsOW2W Nh45ooSVSyWMEPANbvxmdkzKT2WY6luoZSeZTu3CsqVl4yg7MS/VfVFqYTcIk9Mec6 0mOYES0sV/9IQ== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Greg Kroah-Hartman , linux-amlogic@lists.infradead.org Subject: [PATCH 54/55] media: meson: vdec: Use min_dma_buffers_needed field Date: Mon, 27 Nov 2023 17:54:53 +0100 Message-Id: <20231127165454.166373-55-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]); Mon, 27 Nov 2023 08:59:44 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737234393502658 X-GMAIL-MSGID: 1783737234393502658 vdec driver use a firmware and comments said that a minimum number of buffers need to be present before start streaming. That is 'min_dma_buffers_needed' purpose so use it instead of 'min_buffers_needed' field. Signed-off-by: Benjamin Gaignard CC: Neil Armstrong CC: Kevin Hilman CC: Jerome Brunet CC: Martin Blumenstingl CC: Greg Kroah-Hartman CC: linux-amlogic@lists.infradead.org --- drivers/staging/media/meson/vdec/vdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c index 1e2369f104c8..6c2e3e5c6e6f 100644 --- a/drivers/staging/media/meson/vdec/vdec.c +++ b/drivers/staging/media/meson/vdec/vdec.c @@ -184,7 +184,7 @@ static void process_num_buffers(struct vb2_queue *q, * we need all of them to be queued into the driver */ sess->num_dst_bufs = q_num_bufs + *num_buffers; - q->min_buffers_needed = max(fmt_out->min_buffers, sess->num_dst_bufs); + q->min_dma_buffers_needed = max(fmt_out->min_buffers, sess->num_dst_bufs); } static int vdec_queue_setup(struct vb2_queue *q, unsigned int *num_buffers, @@ -825,7 +825,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, src_vq->mem_ops = &vb2_dma_contig_memops; src_vq->drv_priv = sess; src_vq->buf_struct_size = sizeof(struct dummy_buf); - src_vq->min_buffers_needed = 1; + src_vq->min_dma_buffers_needed = 1; src_vq->dev = sess->core->dev; src_vq->lock = &sess->lock; ret = vb2_queue_init(src_vq); @@ -839,7 +839,7 @@ static int m2m_queue_init(void *priv, struct vb2_queue *src_vq, dst_vq->mem_ops = &vb2_dma_contig_memops; dst_vq->drv_priv = sess; dst_vq->buf_struct_size = sizeof(struct dummy_buf); - dst_vq->min_buffers_needed = 1; + dst_vq->min_dma_buffers_needed = 1; dst_vq->dev = sess->core->dev; dst_vq->lock = &sess->lock; return vb2_queue_init(dst_vq); From patchwork Mon Nov 27 16:54:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 170333 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3289722vqx; Mon, 27 Nov 2023 09:00:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IHOPYbzsTwLQAjesjLFxC6XP8tp+1U7BlcKXRfZDqAxoyYkhCeuBck7ylOJWweGjCfoYofh X-Received: by 2002:a05:6830:22f0:b0:6c4:7e5a:6db6 with SMTP id t16-20020a05683022f000b006c47e5a6db6mr12613270otc.17.1701104452270; Mon, 27 Nov 2023 09:00:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701104452; cv=none; d=google.com; s=arc-20160816; b=q2Kfsson3hIJI0kaMS1FtvJlyh33j6br8GgXt2QLmm7saCm8qy39DTAXSgYhrWo8s1 V6a6k89LBkDg+cxBAeFawEY2PuW09CQT/Kqlv0E7pySbAbYi3O7wS1KWJQpgedWLEonz 0/LAilxQdMFzo89UMbrZKz8ajoDSkogrxSAXjXX22clfxAH/ndOaBe0BzyAgVCfcDHK4 ZorLJwWieQ57Sm/ohUrxvZGoWvy1KU1ESE/b5oqAwr6r1mNt1ReA34KGvKBkuPOnafvA owfVPk72a8MGKyQsb4ct86RF7xVM8wCeZ0S6GFU7+Sxb8Zk+oIv0NBfl7DO8k56JEPhz BXbA== 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=eUCL1LnL8qn+B5tOm1dchkfJ5pNNP0ptFyPw/VeK3cI=; fh=nikTID0PJ6NwkGNufN11Ag6f/xC6mcRAltiCDIW3jKo=; b=mAlU1PbYiUlb/ufDbmHUJyBGvQXLyCzeTkHhZIGhAajitVH303mOnQ/x8FcLmV7sSl /wIPgugF2MSrURPLDCmGQjpf1ycXoDEwYTUQ6PWL9T4430gC92xu7PVvQDVEIM9r5cp3 OgANllf56NRbSBZY7pWJx2b2UG3SgIt2C+CEkDti/ImMpafflNl54VIZxpt15uPHRezh KLK23q7uTLjJTr4zXkEEGT4xZlVX9vxMC7nGjqAFBTNkCUx5NKV3aKEwr3sucfJfxEB4 SOJLl2yja4wjGZIFodk1ccsbWOvTlVkI6DgYZM4Sr+wFHnVrdJwrVWRoqjd/7iuH4fz/ WC0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="JKdid/dB"; 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 fw5-20020a05690c374500b005a800f8f118si6912457ywb.429.2023.11.27.09.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 09:00:52 -0800 (PST) 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="JKdid/dB"; 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 A1634807DE0C; Mon, 27 Nov 2023 09:00:16 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234495AbjK0Q7h (ORCPT + 99 others); Mon, 27 Nov 2023 11:59:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234781AbjK0Q6d (ORCPT ); Mon, 27 Nov 2023 11:58:33 -0500 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 7C56E30CF; Mon, 27 Nov 2023 08:55:49 -0800 (PST) Received: from benjamin-XPS-13-9310.. (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (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 9C2C3660742F; Mon, 27 Nov 2023 16:55:47 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701104148; bh=QEqxRu1mY/zwGiIOPG4lnpEEGA62Ed1wsxCNtfbcpMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JKdid/dBmjepTqfqXAYuEvFP40WvHnDGxQJsBMAFXpFVvXjyUI8VOCMePr0y7sr+s n5LH+erX1s5o7qh9DIzZo4AEW/Z20iMI3DaYIZai5jliY6awbDoxbiqJ6veUsW7L3B EcmzTRr97d6HGFq8WG/Z6PrOX/OauRbv45dy7O9PUIPLOCRYu/poZ3+GsNQuHy6ehN /kuNyFjNJKGchrc3L7T6bOmIc0K6WKefJN3UrNJo4qH1Z3ONR7xj+teQJJw3QMEBsg ldHtL8jWHGja2FLxrDM5cEjeGt/gtUx+RubGF1ujSSnaz3d6UZ5CMbzXxbnBX3YV8O K4G/jYILNkZlQ== From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, matt.ranostay@konsulko.com Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH 55/55] media: videobuf2: core: Remove 'min_buffers_needed' field Date: Mon, 27 Nov 2023 17:54:54 +0100 Message-Id: <20231127165454.166373-56-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231127165454.166373-1-benjamin.gaignard@collabora.com> References: <20231127165454.166373-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.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 (howler.vger.email [0.0.0.0]); Mon, 27 Nov 2023 09:00:16 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783737302313522771 X-GMAIL-MSGID: 1783737302313522771 After clean up all the drivers it is possible to remove this field from vb2_queue structure. It has been replace by 'min_dma_buffers_needed' which indicates how many buffers a dma engine needs before start streaming and 'min_reqbufs_allocation' to let drivers specify the minimum number of buffers to be allocated when calling VIDIO_REQBUFS Signed-off-by: Benjamin Gaignard --- .../media/common/videobuf2/videobuf2-core.c | 25 ++++++------------- include/media/videobuf2-core.h | 5 ---- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index a6ec55db8635..223521cc135d 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -865,11 +865,10 @@ int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory, /* * Make sure the requested values and current defaults are sane. */ - num_buffers = max_t(unsigned int, *count, q->min_buffers_needed); if (q->min_reqbufs_allocation) - num_buffers = max_t(unsigned int, num_buffers, q->min_reqbufs_allocation); + num_buffers = max_t(unsigned int, *count, q->min_reqbufs_allocation); else - num_buffers = max_t(unsigned int, num_buffers, q->min_dma_buffers_needed + 1); + num_buffers = max_t(unsigned int, *count, q->min_dma_buffers_needed + 1); min_reqbufs_needed = num_buffers; num_buffers = min_t(unsigned int, num_buffers, q->max_num_buffers); memset(q->alloc_devs, 0, sizeof(q->alloc_devs)); @@ -1851,8 +1850,7 @@ int vb2_core_qbuf(struct vb2_queue *q, struct vb2_buffer *vb, void *pb, * then we can finally call start_streaming(). */ if (q->streaming && !q->start_streaming_called && - ((q->queued_count >= q->min_buffers_needed) || - (q->queued_count >= q->min_dma_buffers_needed))) { + q->queued_count >= q->min_dma_buffers_needed) { ret = vb2_start_streaming(q); if (ret) { /* @@ -2216,12 +2214,6 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type) return -EINVAL; } - if (q_num_bufs < q->min_buffers_needed) { - dprintk(q, 1, "need at least %u allocated buffers\n", - q->min_buffers_needed); - return -EINVAL; - } - if (q_num_bufs < q->min_dma_buffers_needed) { dprintk(q, 1, "need at least %u allocated buffers\n", q->min_dma_buffers_needed); @@ -2236,8 +2228,7 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type) * Tell driver to start streaming provided sufficient buffers * are available. */ - if (q->queued_count >= q->min_buffers_needed && - q->queued_count >= q->min_dma_buffers_needed) { + if (q->queued_count >= q->min_dma_buffers_needed) { ret = vb2_start_streaming(q); if (ret) goto unprepare; @@ -2517,8 +2508,7 @@ int vb2_core_queue_init(struct vb2_queue *q) return -EINVAL; if (WARN_ON(q->max_num_buffers > MAX_BUFFER_INDEX) || - WARN_ON(q->min_dma_buffers_needed > q->max_num_buffers) || - WARN_ON(q->min_buffers_needed > q->max_num_buffers)) + WARN_ON(q->min_dma_buffers_needed > q->max_num_buffers)) return -EINVAL; if (WARN_ON(q->requires_requests && !q->supports_requests)) @@ -2526,14 +2516,13 @@ int vb2_core_queue_init(struct vb2_queue *q) /* * This combination is not allowed since a non-zero value of - * q->min_buffers_needed can cause vb2_core_qbuf() to fail if + * q->min_dma_buffers_needed can cause vb2_core_qbuf() to fail if * it has to call start_streaming(), and the Request API expects * that queueing a request (and thus queueing a buffer contained * in that request) will always succeed. There is no method of * propagating an error back to userspace. */ - if (WARN_ON(q->supports_requests && - (q->min_buffers_needed || q->min_dma_buffers_needed))) + if (WARN_ON(q->supports_requests && q->min_dma_buffers_needed)) return -EINVAL; INIT_LIST_HEAD(&q->queued_list); diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index 0bc97f28a7ea..353dccee7a30 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -546,10 +546,6 @@ struct vb2_buf_ops { * @gfp_flags: additional gfp flags used when allocating the buffers. * Typically this is 0, but it may be e.g. %GFP_DMA or %__GFP_DMA32 * to force the buffer allocation to a specific memory zone. - * @min_buffers_needed: the minimum number of buffers needed before - * @start_streaming can be called. Used when a DMA engine - * cannot be started unless at least this number of buffers - * have been queued into the driver. (Deprecated) * @min_dma_buffers_needed: the minimum number of buffers needed before * @start_streaming can be called. Used when a DMA engine * cannot be started unless at least this number of buffers @@ -623,7 +619,6 @@ struct vb2_queue { unsigned int buf_struct_size; u32 timestamp_flags; gfp_t gfp_flags; - u32 min_buffers_needed; u32 min_dma_buffers_needed; u32 min_reqbufs_allocation;