From patchwork Thu Mar 30 15:40: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: 77277 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1246993vqo; Thu, 30 Mar 2023 09:18:09 -0700 (PDT) X-Google-Smtp-Source: AKy350ZQf9Jj+kJF5kF5vfAXrnED2xEenpeYLNZknbpM+dpkBbFzGGH762SR/hHcLmNFCTKF+Wyd X-Received: by 2002:aa7:c846:0:b0:4fb:8d3c:3b86 with SMTP id g6-20020aa7c846000000b004fb8d3c3b86mr22471899edt.1.1680193089377; Thu, 30 Mar 2023 09:18:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680193089; cv=none; d=google.com; s=arc-20160816; b=0OS0lUgD5RgxQiyxayByvDyYrIlIyl0cxC1/l9nMx5QugHv219A+WDYpWYYSWwrLNJ ZBJ5xCTLGA1bvTg6DqD0LDUnS+DQH8zeeQMR/DvsZ8awXlNuMbkMpnxwT2Ot5mLhOyxu qE1byRdROweaJ8O47Zi9o0WE+0dbe6oKm67j1OhpBC8c8YQrdIU3ywlYgA4dcYckHbzf rfpIDipxr2BVtEZHAyAJZzQ//aShAg4YRwnfCIKfNEy6OcZgdtCCcQPohbwus8fcfFIv 8r0edQQegiawZ3dT/FLGpPKL56DuDSBTdo0dcgopOWy1pRPK/F3V6JHfDsdjA/dQDnX5 Xr/Q== 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=r1Jd/4hfmz4zQV9kYy8AweAI2/muaLtELHJkNfOMIeU=; b=Argw+0HYcMv4jXOdyOUWwz0pMr/z1PpZhzouYeA4ysu2LuoGt1xrjO4BEXYzegdDgr 95cvWKEXRWp+MY2wsE/CMgl8i7uNOy5mwUPfdZyt3eCy8ObHOoQ9t6Kk7SZNl9ICZAT5 I2gTHqUpwcF1JIa1dRVKy6ck7dB32wwcjUJ2a2b6WW43JXDXRKcoitw3Hq0xZdq6dWF5 61XobdUqYuRKcTZg7hDbQbjxDx/0HquNOsbD3NlRnUgwTqQ9skwsMvJr6FkNuGX6iak/ lKoVJfSDDhMhLnLti2i7LJseqohNINIthnhPB7CWbUaQhtHXcFd05FnMBI84qASZO6uh jQBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=QER67wT8; 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 sh10-20020a1709076e8a00b00939fc1918e2si31548547ejc.639.2023.03.30.09.17.38; Thu, 30 Mar 2023 09:18:09 -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=QER67wT8; 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 S233317AbjC3PlM (ORCPT + 99 others); Thu, 30 Mar 2023 11:41:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233260AbjC3PlA (ORCPT ); Thu, 30 Mar 2023 11:41:00 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05540124; Thu, 30 Mar 2023 08:40:59 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:792c:96d5:14:366a]) (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 2139C6603190; Thu, 30 Mar 2023 16:40:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1680190854; bh=6nRqlJ/LoiKwEa8vlEFz7kYQntrOF5FKZSppTv/1oeE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QER67wT8gNmPove7J801AuQOaSxgQRBn7+qg2XDQ2+Glx3QFCNtBOUkvut9kOoqqB f3UfuWuQhASWifzDJo13vWIPiuH5iM8XEi34iOu8AXkSItFPj9+XKSdyMpe2ximUnX HeqK6lqFUiGXtGZW/HEUg2yAg22onlnZNAE1ts8Rgmsq1jHVIHW6zrNHKhuwEy8E5Y xbIl+abfGgFsoW6FOiV4KqsreLdCcelq86lYY0KFERQV+6y+D4PRKNvlrsfxX5G6KG 67sCndE8xoQJjiro/e37Ja6Omyw5vnbqxDH9SSDUgEhK6IiUpIVwAOY2hplGVFU7Tm 9ndZ+7J/O+4XQ== 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, hverkuil-cisco@xs4all.nl, nicolas.dufresne@collabora.com 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 v5 06/13] media: verisilicon: Check AV1 bitstreams bit depth Date: Thu, 30 Mar 2023 17:40:36 +0200 Message-Id: <20230330154043.1250736-7-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230330154043.1250736-1-benjamin.gaignard@collabora.com> References: <20230330154043.1250736-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1761810149041703870?= X-GMAIL-MSGID: =?utf-8?q?1761810149041703870?= The driver supports 8 and 10 bits bitstreams, make sure to discard other cases. It could happens that userland test if V4L2_CID_STATELESS_AV1_SEQUENCE exists without setting bit_depth field in this case use HANTRO_DEFAULT_BIT_DEPTH value. Signed-off-by: Benjamin Gaignard Reviewed-by: Nicolas Dufresne --- .../media/platform/verisilicon/hantro_drv.c | 36 +++++++++++++++++++ .../media/platform/verisilicon/hantro_v4l2.c | 4 +++ 2 files changed, 40 insertions(+) diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index 74641c972f1e..71bd68e63859 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -275,7 +275,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; } @@ -346,6 +352,30 @@ static int hantro_hevc_s_ctrl(struct v4l2_ctrl *ctrl) return 0; } +static int hantro_av1_s_ctrl(struct v4l2_ctrl *ctrl) +{ + struct hantro_ctx *ctx; + + ctx = container_of(ctrl->handler, + struct hantro_ctx, ctrl_handler); + + switch (ctrl->id) { + case V4L2_CID_STATELESS_AV1_SEQUENCE: + { + int bit_depth = ctrl->p_new.p_av1_sequence->bit_depth; + + if (ctx->bit_depth == bit_depth) + return 0; + + return hantro_reset_raw_fmt(ctx, bit_depth); + } + default: + return -EINVAL; + } + + return 0; +} + static const struct v4l2_ctrl_ops hantro_ctrl_ops = { .try_ctrl = hantro_try_ctrl, }; @@ -363,6 +393,11 @@ static const struct v4l2_ctrl_ops hantro_hevc_ctrl_ops = { .s_ctrl = hantro_hevc_s_ctrl, }; +static const struct v4l2_ctrl_ops hantro_av1_ctrl_ops = { + .try_ctrl = hantro_try_ctrl, + .s_ctrl = hantro_av1_s_ctrl, +}; + #define HANTRO_JPEG_ACTIVE_MARKERS (V4L2_JPEG_ACTIVE_MARKER_APP0 | \ V4L2_JPEG_ACTIVE_MARKER_COM | \ V4L2_JPEG_ACTIVE_MARKER_DQT | \ @@ -540,6 +575,7 @@ static const struct hantro_ctrl controls[] = { .codec = HANTRO_AV1_DECODER, .cfg = { .id = V4L2_CID_STATELESS_AV1_SEQUENCE, + .ops = &hantro_av1_ctrl_ops, }, }, { .codec = HANTRO_AV1_DECODER, diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c index 7ed2dfd4aefa..e2a8838f75f0 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -86,6 +86,10 @@ hantro_check_depth_match(const struct hantro_fmt *fmt, int bit_depth) if (!fmt->match_depth && !fmt->postprocessed) return true; + /* 0 means default depth, which is 8 */ + if (!bit_depth) + bit_depth = HANTRO_DEFAULT_BIT_DEPTH; + fmt_depth = hantro_get_format_depth(fmt->fourcc); /*