From patchwork Tue Jan 3 17:00:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 38546 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4723140wrt; Tue, 3 Jan 2023 09:06:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXtfveKciQNM5w35qOHY9GPuKnFbBkfEWWqVRzxUB9mcsO+v3RoCuvuhhiMxgeLbDRahRkQX X-Received: by 2002:a17:906:311b:b0:7c1:64dc:ac25 with SMTP id 27-20020a170906311b00b007c164dcac25mr37960679ejx.23.1672765565534; Tue, 03 Jan 2023 09:06:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672765565; cv=none; d=google.com; s=arc-20160816; b=mKKVAXndBttzQu9kek4e05DP+wIlR6UMsfYzownA38ZbBXqOiMuBUPJINq3ybQFagY PNOdUbYZxhps8p8/BCEq/TAFAvN24/YvKFv3rqUFn+flNeLXhH0oQkouO062wFBmrXuj LHkCuZCCN/g6jh79TAafuNmKu1gILRlUMxqKiG4tbCHIBsdBfCOnYHByB1ojAN5U0aLc 1DQUVY04V6UvGrZx99nvTNWHbXGJUre/hG0XXaCqeUoVZtgIzfXjLAGGL+8TilksyRXq 9AILxYPqPXq+rkgRp4UBdQ2Ap2CeOcYQyqhB1aw7N1HPhoR8CkBJZVlVFNaH7w+flUM4 qiCw== 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=KL0l6w5XuBm+HSZxkl4l/+2+/d5P/zeO9upNQmXwrq0=; b=nSPkiSsJPmr7g0kJbkb+YevaCsPRKnKW1+Z3vj5xj9uIZlJC8qucO+7lmpd74QRCc5 JJurLAtMcz9X5TnKQNM+nlc5AZ0KNnuyFDhXOgWloX7kTLIOudrhGXordClP/n1C/DxB DmPpP+kLZqC8LBf8GDOVaNTKGxS7rpwM4vKSOJQ+QxAKKzs8lfmNDEf+93ppgYs7gWCT 16Fo9gE93dNkEBLKXj79f5kxqe4G7pjDvfHNHM+J9DTaMS/orjWWg78rKwMqQqBDSC0B NiKmHnbFY5BD3Ly/vu7HvrJIHDL4sUetAwR0yeuCLw4zCN0JdVILcVHM4LRSTuhOxnZi qaMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=XQynU8CK; 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 gt39-20020a1709072da700b0078849a014e9si31338579ejc.196.2023.01.03.09.05.42; Tue, 03 Jan 2023 09:06:05 -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=XQynU8CK; 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 S238481AbjACRFL (ORCPT + 99 others); Tue, 3 Jan 2023 12:05:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238386AbjACRE2 (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 1A2C313F33; 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 421B06602D07; 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=1672765272; bh=WKnUc4065UFAP8ex+HL2CHU0GCNHlvHhtIo5+EmiUnM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XQynU8CKI/f8LxERxqK0rO0iL1nVwQW0BxRlOc1leeWG0ZN+VXHOdPTAJ4cGrwgDQ Ihqf0JDVEzjik5JUmlMPHDLPJO4QE/lpEBPb/v/ekc34KwdrdVuLix7VB/jXgeQce4 ZUhrVlYVKnn0YOf9FQQ07DDoW4aOjchgbXmA84i/yfOhNhEUJ7E3EBS7CdL5dPbf8l BE7X8A0q5ZmAhRqMEw48jaM0AOHXOU3MxU7yr8O8dT9vECSrzPVsRTnW+VvJ0IePau 2iVqz6AprG4mjqzEI42IbqMj0gUusjedTdllycA2y+1Nuf17N2LBhwAxyy6pbFjjtf jMHIfiam1z1JA== 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 06/13] media: verisilicon: Save bit depth for AV1 decoder Date: Tue, 3 Jan 2023 18:00:51 +0100 Message-Id: <20230103170058.810597-7-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?1754021825972591577?= X-GMAIL-MSGID: =?utf-8?q?1754021825972591577?= Store bit depth information from AV1 sequence control. Signed-off-by: Benjamin Gaignard --- .../media/platform/verisilicon/hantro_drv.c | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index 4500e1fc0f2c..8e93710dcfed 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -324,6 +324,25 @@ static int hantro_vp9_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: + ctx->bit_depth = ctrl->p_new.p_av1_sequence->bit_depth; + break; + default: + return -EINVAL; + } + + return 0; +} + + static const struct v4l2_ctrl_ops hantro_ctrl_ops = { .try_ctrl = hantro_try_ctrl, }; @@ -336,6 +355,12 @@ static const struct v4l2_ctrl_ops hantro_vp9_ctrl_ops = { .s_ctrl = hantro_vp9_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 | \ @@ -513,6 +538,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,