From patchwork Thu Oct 12 11:46:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 151982 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1166230vqb; Thu, 12 Oct 2023 04:50:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH6KuLOW+h7aYC2aPuAqQpxFo3KE7JWTFdQClBBlMrQlTK7q6TvuYo1CLnfNvTNBOPIJWWG X-Received: by 2002:a05:6a21:789a:b0:159:f5fb:bf74 with SMTP id bf26-20020a056a21789a00b00159f5fbbf74mr28348844pzc.3.1697111434969; Thu, 12 Oct 2023 04:50:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697111434; cv=none; d=google.com; s=arc-20160816; b=yhz6yZxhNBE46waC+RvQQUJknt2tgpuxkCLoq+YyX2lm3rtf4OQCCuAmmrMMrLt1yk Bsuly+Q6D3s7DkjapwzgYRwa37rgolzc6NAJJOxPG3qH12vwhYkv3dVZG3TND/PhzPHd PAJXFRsqPQLcenRCbOoWYSjjpF4ACZDg6abf1EKlgr91zIOo/BV3eSyjMKgjrCkoapjx 5hzTg4qigdAW2DbKVzo5+o5A1qYna6w7yxxOZdkrY6ZrfPtX3Iq3/jybqDgbLHDQp2SN c/CQLMM9R9fW6+oxbvIPOMDmDQzxHzqbq/jwT5HwuezRyuH4ppuu0xfG9H0RxYdhVRGt UjoQ== 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=nr1KYax36VZZBnabbjIyUGPTkvQFXV8YfPxk2A654tA=; fh=ceA81l8d2hZW6pWH7VE5TwJxtgXUzAubfWIMcikPA1M=; b=ApNENb4ZCGqSWNBvZnknxMJKO8kBLHLPo8875toAqnMKLqUfRzbKVIC3Kq52eJE+dp d3HBdi3qeCkASUlclP0+DUIFjv83JQ02PXi9jT1GeFmb0gBhmNBdL9hfWZtuBwF+WX3g 5oFHZ6v6abqdmjYV//d8TJYwYqSUjVDitfPsNjlqyi0Nu86t/CQ9TH6wzQo16vQo+cbm QIS0h1p6Ai5WozyvNUzE60ElhM91AW3eMXYAuXaoxxMJ3RH5+y9WEVD1KWmIIjGy7xvT WwNYMxrWmZa9XHtIN9i0WndvPqLwsnHgiSw4hPqNoKUkM/xIqkUmDQEjyYfCm6LQ1Svg YgNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=KGN4IloW; 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 13-20020a63164d000000b00578d2d19575si1997780pgw.237.2023.10.12.04.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 04:50:34 -0700 (PDT) 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=KGN4IloW; 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 2C858822CCC0; Thu, 12 Oct 2023 04:50:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379165AbjJLLuF (ORCPT + 19 others); Thu, 12 Oct 2023 07:50:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234095AbjJLLrw (ORCPT ); Thu, 12 Oct 2023 07:47:52 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E926AD5A; Thu, 12 Oct 2023 04:47:17 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:7ae7:b86d:c19a:877e]) (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 0532266073AC; Thu, 12 Oct 2023 12:47:16 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1697111236; bh=dg5TyqcXTbK8D5lR679m2t1zA3rG8sR+3z3V0ZimwSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KGN4IloWw4rUYmAUxpXEtSne/XG274cirWicK3pLPfi3Y3eHcAcGubqPOPSjqxEnx xD4IrAxLBWURuZVq4hS2zVcFU4GZV0Utpm8D4lKnzyAcpvof+XjdTwpTnUEDlTvXYe i6sCF8Uq55+LHui+IeraDjxvsxqWahOu6RDsd1rkEYHHAsLVOOmJrNAe54bwheH1im rAYuAsbLO4KmVZTmJ1JBIQeVmGzxYT5YBph9MLcub+DS/1rtoE64FCg059zvTI6oiC 7Ffg34Bwjnqd8iYW/QEVZqAR01m9ZxDlPaGNWJ4BcJSThdQVifuJNBxocw29fOrBXv p++BsMI3moJ5A== 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 v11 50/56] media: verisilicon: vp9: Allow to change resolution while streaming Date: Thu, 12 Oct 2023 13:46:36 +0200 Message-Id: <20231012114642.19040-51-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231012114642.19040-1-benjamin.gaignard@collabora.com> References: <20231012114642.19040-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 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]); Thu, 12 Oct 2023 04:50:34 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779550320183374161 X-GMAIL-MSGID: 1779550320183374161 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 CC: Ezequiel Garcia CC: Philipp Zabel --- .../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 f0d8b165abcd..27a1e77cca38 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -514,25 +514,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 @@ -577,15 +566,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;