From patchwork Fri Feb 3 09:16: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: 52424 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp732324wrn; Fri, 3 Feb 2023 01:26:55 -0800 (PST) X-Google-Smtp-Source: AK7set8KgA2sZPi/6ZdqFnhsSR8LBIe2KEBJZOorYsJWDxx256/ezD2b/Bbk3JgUcfrF013AEIWH X-Received: by 2002:a17:907:a706:b0:88c:a14a:d039 with SMTP id vw6-20020a170907a70600b0088ca14ad039mr11903095ejc.69.1675416415233; Fri, 03 Feb 2023 01:26:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675416415; cv=none; d=google.com; s=arc-20160816; b=NzPoXUAozw1ayLlgSxwn43BGfjCJAjS/oFMXSfDHx0XJWbCdq2W8duwWZqBdeLUPnO BxZKmE/h9CDg1cQzVtbh6vFX1TMvoAfRNZSUTEiX3bcMWMUgptEkTpA0rNlFETbhXhsZ VTEyWlLgyovvuvm5Umm64uapB9qckiy0gB8kUf71ZSCh57QX+jJA6o7SzueuNWQ9E1hb Toej43B85wc737HF20CXi8Bgie28uUmxKjkKvodtG77UJk7RgEXruoj40/n+5RYEug0b kfeDOfjhu85TAJkcLm3ZB1M6+gpCTo6pCaXKrNdwd9dUQVRG1DA2mlGZ2SaMjfYU7VHr HatQ== 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=/yhDcEEaVochtBC/9ZAKe6I8B/kD29DZ9J6cpsm3p80=; b=AQWuC0FbbgzeZPTsTt80AVvUYeg9qqoHSjm5SxUmilco6PmxOfr+Qpw/I0bbZ9G88o ttUBHRFnxLaWFwixDVstoWMHtPq5dv9f3rqVj5PZgsZfB+ucOho0dYyPM5x0J/iEFdK/ J1xzrqQqfIorwHJtZnaaBDMKQpgcz70AeZ56YKYzAvKOmCK3ibkVAm8bsQaXrrcZnoyp 9t8O7/7GlAXfuh55q1ZSfQeQo8azwfICCMr7yMmub+JS08WVcsPA5d5rpGB83Kkb01tF sbI7OEkNWrPOa5CVEfNHoEkM0NjhKlm3cYjEqZNvYk6cCVMbUrZrwhLtBBooM1PYxu5m 4+fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="W60lwyM/"; 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=REJECT sp=REJECT 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 n20-20020a17090673d400b0088e899e04f7si2828709ejl.482.2023.02.03.01.26.30; Fri, 03 Feb 2023 01:26:55 -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="W60lwyM/"; 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=REJECT sp=REJECT dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232564AbjBCJRz (ORCPT + 99 others); Fri, 3 Feb 2023 04:17:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232742AbjBCJRS (ORCPT ); Fri, 3 Feb 2023 04:17:18 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1A73991CD; Fri, 3 Feb 2023 01:16:57 -0800 (PST) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:d413:5f9c:fc3a:208d]) (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 B621D6602F16; Fri, 3 Feb 2023 09:16:37 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1675415798; bh=/fZ2ALvuScrtz8aAPnoLovGKMZcYgk0hx4olwjLRTA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W60lwyM/fIAqN4VdY6txRltfCyqurO225+2II7kNOsqVuiJRpkPUU54d5c7x3AR2j heu3XjIwrYJvny5no8lXojB3AUyDOr8LmDCwwvG0ZTu8BnCABoecEvKLhSMQ/jAxZ1 2Zdl12sHiLUnakZx1r+WBMImQgfTGY90tElVnz9RxN+ZBVVzSMkw0urJe5ATaMCy9j fASrdoiT9JSTV5DVOqcOL78w12l8Lvc/7L3RquN2bdMCyNXIAg2klr18481DepKNy1 2iw9i+vf27LIS6dt7xOGTFoE785HiD+VXsmoyn91R4ZZ9+pUJPX+K7CaLNu073VUSn Tz+O9hbbczv7Q== From: Benjamin Gaignard To: ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, mchehab@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, hverkuil-cisco@xs4all.nl, nicolas.dufresne@collabora.co.uk Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v8 6/6] media: verisilicon: VP9: Only propose 10 bits compatible pixels formats Date: Fri, 3 Feb 2023 10:16:22 +0100 Message-Id: <20230203091622.127279-7-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230203091622.127279-1-benjamin.gaignard@collabora.com> References: <20230203091622.127279-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?1756801442549989749?= X-GMAIL-MSGID: =?utf-8?q?1756801442549989749?= When decoding a 10bits bitstreams VP9 driver should only expose 10bits pixel formats. To fulfill this requirement it is needed to call hantro_reset_raw_fmt() when bit depth change and to correctly set match_depth in pixel formats enumeration. Fixes: dc39473d0340 ("media: hantro: imx8m: Enable 10bit decoding") Signed-off-by: Benjamin Gaignard --- drivers/media/platform/verisilicon/hantro_drv.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index fa31b200b097..1c4b90c905ea 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -308,8 +308,14 @@ static int hantro_vp9_s_ctrl(struct v4l2_ctrl *ctrl) switch (ctrl->id) { case V4L2_CID_STATELESS_VP9_FRAME: - ctx->bit_depth = ctrl->p_new.p_vp9_frame->bit_depth; - break; + { + int bit_depth = ctrl->p_new.p_vp9_frame->bit_depth; + + if (ctx->bit_depth == bit_depth) + return 0; + + return hantro_reset_raw_fmt(ctx, bit_depth); + } default: return -EINVAL; }