From patchwork Tue Jan 3 17:00: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: 38547 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4723171wrt; Tue, 3 Jan 2023 09:06:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXvMOdLKNhZTAsPIvjlcZHZKmnmwPu2nv+yYdvSCh5wXyEuW2CMe9GtOf8B+WH1BoJXWZaCu X-Received: by 2002:a17:906:ad93:b0:7c1:100d:331a with SMTP id la19-20020a170906ad9300b007c1100d331amr39744874ejb.70.1672765569797; Tue, 03 Jan 2023 09:06:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672765569; cv=none; d=google.com; s=arc-20160816; b=YwKqiHogAyeWOnHfpyDi9WAZnGK8+/BFEZG6pn3qYm1D1io19S02gWY9QoF9pmUCnA fgFvFDTtxDi8M7VYK2oBfY9pB55Sf/N5b37uPhYKZ2HtrPPQURN5zMQqG1sfZWIaPoUF KkCvLqK3fJnQv63awVhQZlCRyviebV+TSTr9HT/mjY/klWPnQAwwfdMxxEg62Z4m0zYH ZmaXAxoM+j1zAGoOIpbUOEE6coYax4l9oV0dXwRGTkzQMbygNMKzYfLUyTqTfgZM+RXd uTYz+KlGqFGO4t/yvXZbDWO1znQNZWkzN+fYcv4jX7QjsTgG4ZJmUkD+PlGj2/UyralN fA8g== 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=PCh5eUW/bBJ+GCMPgywusyxqfVN1vOsr7kKCkpgBOMY=; b=ArWMAUBSZ1mbT4QqcPsEKp+BwpkaW9ur5Zmosjff26yanjsc05Azb9Xb59NBMEY0yT kb+5R5hxm/S99/+Gb1/HSKRyawu4imwYs8vWDUCAowW0FKzyJW4i4a8TgU7LYp0zhtFe 4Bs2pXVC4uZysKCkNe+VPXs54iMVtgwDOslgyh43G3Ap8MntY04cdWG502/RXFpV9NDR QmEhKctiA2YbTwANujI7kA/Xq0Y9l9FgRBLEPc3S1skQUN3hn7PDlDgMSDY2NNHuL8SH f2IayT+ZknU0XeC9z2GlA6i4mcq9HEkgxswn0pJ5ILb8sxssihL5X5zDmcS5/f+RyITt xTtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="Twcm4g/c"; 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=NONE sp=NONE 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 du1-20020a17090772c100b007c11805a849si28410896ejc.341.2023.01.03.09.05.46; Tue, 03 Jan 2023 09:06:09 -0800 (PST) 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="Twcm4g/c"; 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=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238488AbjACRFO (ORCPT + 99 others); Tue, 3 Jan 2023 12:05:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238388AbjACRE2 (ORCPT ); Tue, 3 Jan 2023 12:04:28 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76EA113F37; Tue, 3 Jan 2023 09:01:26 -0800 (PST) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:abfa:cf23:1e4e:2b14]) (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 B43AE6602D0C; Tue, 3 Jan 2023 17:01:12 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1672765273; bh=hK5ho7sqz6YdWfEyVAdpQFOjW5xXjqXVPgQmWV4hD5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Twcm4g/cthJVoXyWksbRiX7y8N/ltFrn0H2WTwgaY8wpg2XggffZHTU8Rz/VX/ywZ cnabJ/peXL36mzZE72/YW6PO7ENGu5GW1TU5NEo1pMoRLRRceO7FPF8gZEcIZHv9SD DgMeW79FUJp3sGOhrQhl9pTp0FK+VD40SwjjBHArfZb0Ka2AVCp3vbm57SIeQC8476 R70tH4aTi1OZfMqPBTvioseq830oZFGAQCnw0TCv70te/LXp5yUH5leeHZ4m6PhMzZ w0ALoSgZ0VyIYf0lwaPuWDStazCO4F3oKGzlTvtm5Vfp130EdtCq2rp7BVwbuM2Jb2 dl8MLLvsJ6Aaw== From: Benjamin Gaignard To: ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, mchehab@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de, daniel.almeida@collabora.com, nicolas.dufresne@collabora.co.uk Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v2 07/13] media: verisilicon: Check AV1 bitstreams bit depth Date: Tue, 3 Jan 2023 18:00:52 +0100 Message-Id: <20230103170058.810597-8-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230103170058.810597-1-benjamin.gaignard@collabora.com> References: <20230103170058.810597-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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754021829970354164?= X-GMAIL-MSGID: =?utf-8?q?1754021829970354164?= The driver supports 8 and 10 bits bitstreams, make sure to discard other cases. Signed-off-by: Benjamin Gaignard --- drivers/media/platform/verisilicon/hantro_drv.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index 8e93710dcfed..16539e89935c 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -282,7 +282,13 @@ static int hantro_try_ctrl(struct v4l2_ctrl *ctrl) /* We only support profile 0 */ if (dec_params->profile != 0) return -EINVAL; + } else if (ctrl->id == V4L2_CID_STATELESS_AV1_SEQUENCE) { + const struct v4l2_ctrl_av1_sequence *sequence = ctrl->p_new.p_av1_sequence; + + if (sequence->bit_depth != 8 && sequence->bit_depth != 10) + return -EINVAL; } + return 0; } @@ -333,7 +339,13 @@ static int hantro_av1_s_ctrl(struct v4l2_ctrl *ctrl) switch (ctrl->id) { case V4L2_CID_STATELESS_AV1_SEQUENCE: - ctx->bit_depth = ctrl->p_new.p_av1_sequence->bit_depth; + int bit_depth = ctrl->p_new.p_av1_sequence->bit_depth; + + if (vb2_is_streaming(v4l2_m2m_get_src_vq(ctx->fh.m2m_ctx))) + if (ctx->bit_depth != bit_depth) + return -EINVAL; + + ctx->bit_depth = bit_depth; break; default: return -EINVAL;