From patchwork Mon Feb 20 10:48:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 59366 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1239493wrn; Mon, 20 Feb 2023 02:52:24 -0800 (PST) X-Google-Smtp-Source: AK7set8NuMuMK6j/dsB1xyIzoyll4ZlaCR4akIN8hf5eEXZ6gkuStPxZTUVzmeG50UtL08P3zodS X-Received: by 2002:a17:90a:341:b0:236:75d3:fedc with SMTP id 1-20020a17090a034100b0023675d3fedcmr692530pjf.8.1676890343879; Mon, 20 Feb 2023 02:52:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676890343; cv=none; d=google.com; s=arc-20160816; b=nbGDuDAb4Lv1eYTCbSud1noAz+LAuWKQNkwdP19YubIZ5CJEeuUCynpl/dUGe/a4eX pK5kPbYCmlNhl5YJV9lTJ2sMQKkVGQzCA8OJ3DCii8A3xZDQImfNBDOseP0M5ODW28g1 bMuLltVPEMNhScnxoUMMcbLNWiHl5vula4qF2pTVFzM+1Sj0B0N/UQ2j5/ZycbccxGN5 cuWesa6bghhmSo/1cy/kjJHkKS8ewUmwsF/1W8W+gb/vf6WDQbirI3IhAnqM/TGl7miw n52nzj30Z89JmM+wboplnYrdmBNiDGK6EWiGVXqyHg61ugI6HLW7xbtVERa59mUZDp6I dvFw== 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=EpN41LjAUX0qsWSvKb+3Tn5xpsaW1aYU8UF8olZa064=; b=r0I4NOXNknFLbwdhtflMiGoYC9ZjKxmlW9OM6ceihD3yht9WzqnDqHWwzEzoa3nYeE 0MuROQ8JdQLM34hYbaF/jNnDFUMVKOquJYV+C4QUbEIRYRXonNU9VbOjTIrMWGL/VVIb cqvWM2YffKG6Crm34xVRnb7J4hjY4MMsoMpNBohUfAjPf4uNZUrNWJ8TZYvynLKiWgmk e3g1Oea4y99lhg57YCdzQ0rB2qfyo5gAb+bFEcyQNIHP0b0T/GUK4a9DfFbMJwEQQmmK Uua6XQoZQN7RoU5kdswtB76wKhAoBfnugHkEXtqKSjqSvEerShJm5y1xojsZbfp5lSDb xFSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="Z8il/20V"; 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 fr10-20020a17090ae2ca00b002311ef542bdsi48793pjb.103.2023.02.20.02.52.11; Mon, 20 Feb 2023 02:52:23 -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="Z8il/20V"; 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 S231506AbjBTKtP (ORCPT + 99 others); Mon, 20 Feb 2023 05:49:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231676AbjBTKtC (ORCPT ); Mon, 20 Feb 2023 05:49:02 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A3E7AD0D; Mon, 20 Feb 2023 02:49:01 -0800 (PST) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:d30c:b155:96fb:dcc]) (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 B5CEE6602142; Mon, 20 Feb 2023 10:48:59 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1676890140; bh=SxFS3sgxVfXOtyOQNwLjMDuu7K/g1eyIum+Nn/+YN6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z8il/20VIKq6sJsWP5TMNUgVLnXgtrZetPbZoe0LpXmDIBGOuXk1dVfgwHrQ5JvhX p01Uk7bpBhcy4RWEwXoCYGJjsuKG8IYVBpbAuBhCoFHQAtMWE1HRxDhA5DJHmpzwdt YgmzvCnPEWUWPYWhDx8PB+8ZsL/IlUJPfe1Od8z5t7Z95pknu1MdvTa8lP2Kqmnjee pYt1FnRgo8ZV9WR5hDROXpTs0LQ6FwVuj09Q95sEnTJuZyGgxZ9fMFA+9orZBCv0Xi +3tnSn1QAzhUalkmPbpaxIRuWe3Rwu/GJFJMIQL0GtjHcFUtKn5290gvgENv5uXufX a+pJSqGVKt1Gg== 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, robert.mader@collabora.com 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 , Nicolas Dufresne Subject: [PATCH v9 5/6] media: verisilicon: HEVC: Only propose 10 bits compatible pixels formats Date: Mon, 20 Feb 2023 11:48:48 +0100 Message-Id: <20230220104849.398203-6-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220104849.398203-1-benjamin.gaignard@collabora.com> References: <20230220104849.398203-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?1758346969264344779?= X-GMAIL-MSGID: =?utf-8?q?1758346969264344779?= When decoding a 10bits bitstreams HEVC 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. Signed-off-by: Benjamin Gaignard Reviewed-by: Nicolas Dufresne Reviewed-by: Ezequiel Garcia --- version 9: - Fix brackets drivers/media/platform/verisilicon/hantro_drv.c | 12 +++++++++--- drivers/media/platform/verisilicon/imx8m_vpu_hw.c | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index c237253803f4..7d452f1afaae 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -325,9 +325,15 @@ static int hantro_hevc_s_ctrl(struct v4l2_ctrl *ctrl) struct hantro_ctx, ctrl_handler); switch (ctrl->id) { - case V4L2_CID_STATELESS_HEVC_SPS: - ctx->bit_depth = ctrl->p_new.p_hevc_sps->bit_depth_luma_minus8 + 8; - break; + case V4L2_CID_STATELESS_HEVC_SPS: { + const struct v4l2_ctrl_hevc_sps *sps = ctrl->p_new.p_hevc_sps; + int bit_depth = sps->bit_depth_luma_minus8 + 8; + + if (ctx->bit_depth == bit_depth) + return 0; + + return hantro_reset_raw_fmt(ctx, bit_depth); + } default: return -EINVAL; } diff --git a/drivers/media/platform/verisilicon/imx8m_vpu_hw.c b/drivers/media/platform/verisilicon/imx8m_vpu_hw.c index b390228fd3b4..f850d8bddef6 100644 --- a/drivers/media/platform/verisilicon/imx8m_vpu_hw.c +++ b/drivers/media/platform/verisilicon/imx8m_vpu_hw.c @@ -152,6 +152,7 @@ static const struct hantro_fmt imx8m_vpu_g2_postproc_fmts[] = { { .fourcc = V4L2_PIX_FMT_NV12, .codec_mode = HANTRO_MODE_NONE, + .match_depth = true, .postprocessed = true, .frmsize = { .min_width = FMT_MIN_WIDTH, @@ -165,6 +166,7 @@ static const struct hantro_fmt imx8m_vpu_g2_postproc_fmts[] = { { .fourcc = V4L2_PIX_FMT_P010, .codec_mode = HANTRO_MODE_NONE, + .match_depth = true, .postprocessed = true, .frmsize = { .min_width = FMT_MIN_WIDTH,