From patchwork Thu Jun 22 13:13: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: 111675 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5075967vqr; Thu, 22 Jun 2023 06:38:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5S47ANdrIhheyXoUqp7Sl9SnXnn7LVG/L0MWgYvRMsAVi+4YUmOkfLzby4aKM64AiPJcbg X-Received: by 2002:a17:902:d34b:b0:1b3:f8db:6f0e with SMTP id l11-20020a170902d34b00b001b3f8db6f0emr13744409plk.43.1687441109926; Thu, 22 Jun 2023 06:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687441109; cv=none; d=google.com; s=arc-20160816; b=IWMSZBO8fMsqiXI3hzZ69uwCG7hB97Xb2n6pofviuFNUEiDQxzC7Ot+XXMxvt0N4ij s69j8szEi+Eft5cV+qKMdJArvo4EbS7jiPSZf8farbjkB3gxMrMBsl/VrvjPBStwZ6rg 6TqY7LpLygzfund7PtmDfXh8V0f9t9UfBc8SiBOmEZBvrD+Ef0jmWZ0m/UQPrP8/EAzU rhyD60sNZfDUI2t0mtKjWGVYqIxnR8drW09rdDsxAK/MkNfgLHgk1iFsa2CUSV74UmQr 8KHtwsu5H3qqaNGrFCGWeoQgim2ofrDitNF0hQe/+LxPKXFTJ7J6x2qOzDeodPjzFxQp nNOg== 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=lZvc1GZcbC3TqM1BvcVDQ9ruIeQWlogw2/4XWLZfbDE=; b=tmbBsabU+eK3w0lo+1w6pjCoawix8esHEdl3VkL9A6Q6J8DYov6HrKamka2hMlLhuG Xt/A/eoy//6K8nIWFXSWuTKDYjK/Z1c760XeJINr7dutLt4kPeSNnABZV/o0KEDWDGfn pdtnZ2/bsqDNdZf6ZrWXhDHA0ruEipVrUEZQAJz5l/8G+xAo32b9miTnJdGLqUxkFTKD fppA73V8bJzoDSWN6v4BlelhKLXcdfAP14RlMPIckV1WrJD+vs3opiem/hebd3AlNtdk lKuQ11ozrmor7Wy6NxSDcokAC0WOouDWuHCD28K4XJeZSLYeNZEQtBg0+7rJ+O8SkAkE obAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=DGz1otna; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m15-20020a170902bb8f00b001b54e9a0134si1451666pls.65.2023.06.22.06.38.17; Thu, 22 Jun 2023 06:38:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=DGz1otna; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231761AbjFVNOg (ORCPT + 99 others); Thu, 22 Jun 2023 09:14:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231612AbjFVNOE (ORCPT ); Thu, 22 Jun 2023 09:14:04 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BF831BD3; Thu, 22 Jun 2023 06:14:03 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:7d72:676c:e745:a6ef]) (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 BC419660713A; Thu, 22 Jun 2023 14:14:01 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1687439642; bh=X2W06J2G0RvZ6wT6r06tbLD+//oCk/Ju0PbDrogdZys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DGz1otnaX8UAHM3bF/fnObvKgQpots9OgKyHQlYMpVuhY7HFB9K4WXhjx/xh4Hjdo wKXNP5wNgwFSN56fHkbwgjBz61Nik8UswMz0VmMTAqA2qfjxyZ5RRs9KrSalNKVi/a svqywLE+/HOl4pNFwe+5y+GPUpyZp2J8ZE8bIXwMv36/tlbJbfrwIyo5FAlGa+vYC2 CUYsKgUWCIbKJ7DAn1dFeQqdd8rZsaMpjA7687bBQB9Gw8OjPpzkSSmNd7zkhmlS6e xhsVOzJJk8C4WZlBCEhy/OyVUgr6WV9ihhUvdnEJQJtokxd19iRvruoQSt5ihx41Is SrHjNjTFBA1mA== From: Benjamin Gaignard To: mchehab@kernel.org, tfiga@chromium.org, m.szyprowski@samsung.com, ming.qian@nxp.com, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, hverkuil-cisco@xs4all.nl, nicolas.dufresne@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v3 09/11] media: verisilicon: vp9: Allow to change resolution while streaming Date: Thu, 22 Jun 2023 15:13:47 +0200 Message-Id: <20230622131349.144160-10-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230622131349.144160-1-benjamin.gaignard@collabora.com> References: <20230622131349.144160-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,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769410248931934699?= X-GMAIL-MSGID: =?utf-8?q?1769410248931934699?= Remove all checks that prohibit to set a new format while streaming. This allow to change dynamically the resolution if the pixel format remains the same. Signed-off-by: Benjamin Gaignard --- .../media/platform/verisilicon/hantro_v4l2.c | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c index 0f615c1001c0..cdddfb4179aa 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -480,25 +480,14 @@ static int hantro_set_fmt_out(struct hantro_ctx *ctx, return ret; if (!ctx->is_encoder) { - struct vb2_queue *peer_vq; - /* * In order to support dynamic resolution change, * the decoder admits a resolution change, as long - * as the pixelformat remains. Can't be done if streaming. - */ - if (vb2_is_streaming(vq) || (vb2_is_busy(vq) && - pix_mp->pixelformat != ctx->src_fmt.pixelformat)) - return -EBUSY; - /* - * Since format change on the OUTPUT queue will reset - * the CAPTURE queue, we can't allow doing so - * when the CAPTURE queue has buffers allocated. + * as the pixelformat remains. */ - peer_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, - V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); - if (vb2_is_busy(peer_vq)) + if (vb2_is_streaming(vq) && pix_mp->pixelformat != ctx->src_fmt.pixelformat) { return -EBUSY; + } } else { /* * The encoder doesn't admit a format change if @@ -541,15 +530,8 @@ static int hantro_set_fmt_out(struct hantro_ctx *ctx, static int hantro_set_fmt_cap(struct hantro_ctx *ctx, struct v4l2_pix_format_mplane *pix_mp) { - struct vb2_queue *vq; int ret; - /* Change not allowed if queue is busy. */ - vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, - V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); - if (vb2_is_busy(vq)) - return -EBUSY; - if (ctx->is_encoder) { struct vb2_queue *peer_vq;