Received: by 2002:a05:7412:b10a:b0:f3:1519:9f41 with SMTP id az10csp2703104rdb; Mon, 4 Dec 2023 05:26:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IGS4RPRyxxjf+8KcpAtajHyiG3D8fOi1RFrnd/zNkb6spfJISf+jxHtFCEdCR8rosNucfv6 X-Received: by 2002:a05:6358:180f:b0:170:17eb:3798 with SMTP id u15-20020a056358180f00b0017017eb3798mr4344693rwm.64.1701696389928; Mon, 04 Dec 2023 05:26:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701696389; cv=none; d=google.com; s=arc-20160816; b=ExQGk4AHazzyX1cKGLyIE6qyHksHUpT+6P7+qB8mbavitPblmsICauP5fvr3R9UbXX 7PF1AJcczhLhZXGyqmzihRVT5+OfULNVJzSyX9feRp1XfiHH8Hv3QUMeAQQqxRLjBObW egr5szQ2ZiZ6Q7RyIEW9CjSWSyxjLm+MmbNvAui7J3OeJxH2U9BFfngdXA1bnImeOAGj 5VAfd/9QOHXxbg0NiKnUJJfNP3MPP2sIQfq5xeRXG0pH2Fq8WpLHCz3OY4XJ4Y5GXk1F bbswlUE8LoF7D2XmtN/g8gdCXXDu/8cX+NIDil6gyKKiYmmD6KkUfA0HQJ3mpVwDAOx0 Uqcg== 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=R4cQncVEnIx/GulYui0kIev0TNtLP+OkDW3FYsOY6JQ=; fh=1G14ja0N/gmjq+ba9Y73sDvqtNnP4Tgplds/+tu011I=; b=U+x6r5m5iYIC7Q/ewGsLqQuawBoY+Mu47eIchRu3frhxgZEIfhdlGOlt1ZS2oJ4d6l xuDs5WzHDI+n7q1iVmBVxd2ir5fyfGHG95J77TQlsu1z1xnj5Wmpklm39yeLog7knbVX tkQq4btZZc9UqUOkPPJajEHksSRTbPfNUMJ632aDYXUKhiehQlcIOBzrtJCQROnzBj8X pZvM1noAfhYSWpAqJlAknHUqpy33m4ss3NsKxu5S40Kn4LYRV4jlMlzrcqFOZjOlxbdi wwsO9fnd9STt45+59s2eV3Sqzwf/mgnYPmZrbTTaxPOwxVvNlJwMzTDevAZ10pEEQSUV hD+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=S0bLQaf1; 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 Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id e5-20020a636905000000b005bf77518dc6si7578055pgc.286.2023.12.04.05.26.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 05:26:29 -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=S0bLQaf1; 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 38543805B9C7; Mon, 4 Dec 2023 05:26:26 -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 S235528AbjLDNZ0 (ORCPT + 99 others); Mon, 4 Dec 2023 08:25:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344310AbjLDNYg (ORCPT ); Mon, 4 Dec 2023 08:24:36 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 753161988; Mon, 4 Dec 2023 05:24: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 A2F3A66071CC; Mon, 4 Dec 2023 13:24:19 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701696260; bh=HA3sPol8p5W9ebSYIho1H8w8FmquQ0VLktAbSg8hR1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S0bLQaf1KI+M5fn5WTfutbQqGVwx7owBpZ5MSZjfgNyvN6Og7vdXrOn7gJuiA5R+Y Sq7fmfWitxrdW4E5E0qB9y0kateVA4oKzIyJZprd2+7whuY5YwevPb9JlTDjQI/vUN WymEleRvA/mbCLB/TAe52kAr8V2uBZFzp1E4EeF7XToJd7pd4dZNA++gKhHm49KU4b u8S9Z+uYRa+vy83YQ697EJaHXEnFWEIBswjVZ88BGqAo+HKTXGNqOHUR0SSRzTdPQX Su+WCY4SYReKa/wRosOxGyCvjbyWwTtqVN9j4tkLUfpZ3KtoH0e56IQSCpUftFP6H2 5tVBS4aCA+YHA== 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 v2 27/36] media: sunxi: sun8i-di: Fix misuse of min_buffers_needed field Date: Mon, 4 Dec 2023 14:23:14 +0100 Message-Id: <20231204132323.22811-28-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231204132323.22811-1-benjamin.gaignard@collabora.com> References: <20231204132323.22811-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, 04 Dec 2023 05:26:26 -0800 (PST) 'min_buffers_needed' is suppose to be used to indicate the number of buffers needed by DMA engine to start streaming. sun8i-di 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. V4L2 framework doesn't allow to allocated less than 1 buffer. Setting min_buffers_need to 1 is useless so remove it. Signed-off-by: Benjamin Gaignard CC: Chen-Yu Tsai CC: Samuel Holland --- drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c index 90ab1d77b6a5..db370519d4d8 100644 --- a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c +++ b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c @@ -673,7 +673,6 @@ static int deinterlace_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->ops = &deinterlace_qops; src_vq->mem_ops = &vb2_dma_contig_memops; src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; @@ -688,7 +687,7 @@ static int deinterlace_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 = &deinterlace_qops; dst_vq->mem_ops = &vb2_dma_contig_memops; dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY; -- 2.39.2