From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DA619C433EF for ; Fri, 25 Feb 2022 19:18:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=h8FKJEJ1LVG6duPPi4fsMmq+o1sehfuSSmGtWZQLUck=; b=xszlUAE7pjLKr3 5xZJ6bFKllmO6o4wH0PQpd8gXOtjMBGIg58yRooOYsjeS36Y1cTIcUw8JtwRR+pyq6wRTxgd8rgUC VQdjPz/RQyQ3JG6wIXm9b2G6Z0HeLD1OEtzB9TJYZi1tx9L1Mm6T80z8aPkqydDyB/Ae3m4U1zfJ7 Smual0E3QnT5K4uK5SnnI7FWjQ2sAf9CX1QkRRbzvko7MqW0w8SGt8iVO0Q5CTfqZOwT1+wfeq2Qh 9vsPj1HJw1T0dO9O8e9R3oyRP72N9lpDxBHRq4NyOXwO1snw02RkYjFlq/0mxYNoYvj4m6nZyNcI/ uYl5pszOalNSl3FiJt5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nNg5F-006llW-Sp; Fri, 25 Feb 2022 19:16:54 +0000 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nNg55-006liJ-AC for linux-arm-kernel@lists.infradead.org; Fri, 25 Feb 2022 19:16:45 +0000 Received: by mail-wr1-x42c.google.com with SMTP id p9so5893347wra.12 for ; Fri, 25 Feb 2022 11:16:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/Vvd7tKZQOnediXpXRzDG+ltIVQnv7bxEtfZI2RY0JA=; b=GFvpyfhpP4lZ6/NkJU6ikofdfk7gpO2WU29fa6dqlyWnlNJ6s6EOI/cQQuQqkYaXuK j2IksD5n5REA85yMe1g9chdlHAaeWZbXxgxt+54+LCtVNGKKR77r4KOleYJs3TUrMzgS KStr09G77anCiNEoGlM2AIwtaDMW1jBac/9QGQxNb9QILFZLEOVmkWJQiez98LKtIbQf vXc9+QOTTGnnGtkLJ5sIvaXWvaDR2Z1WwEP+nC4FjQ7CbPCm9VCQj4gBtZjISUfivUgT 8VFh9SaYPLDC0nfkkeCpCgTwt9v/2HOjEihb6hPhp7HAT1dQrTHe+bKRU4msjSLzLxqa dPGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/Vvd7tKZQOnediXpXRzDG+ltIVQnv7bxEtfZI2RY0JA=; b=lDpkdU8nN4OxFtM59feL1wkMCUxsgGXys6ScdYK+0JAxMxKMQOyHksCQFP/9W9d90k yW0AzEcPoN/+Gyq3s8SDkTgpondmC8GV8SmA5dZQZqOVC/6Rnex2+9uPhwgwtHw4Zfdq YwVpntucWcqgEaMtdSwuh2mC+kSEU8ilTAAVmmKqo3y3tuU4Mq3fq+DlGnFAnsucUfSH YekEt8sOP6E1SQoi7Pr3Hdv1WwGzpAkRY+HPS6Pen4Ika1j88iP0WAFeywAQMm/Iwy13 5UZdoONA35R+bV7FnCYr7Rsa3kUz6gNAy2cUG5NiI4+xzGofDw1cO1UtOPrKKzTRvRO9 PtLA== X-Gm-Message-State: AOAM531L4nqES0pwV1fdUWkC7wYNey/0XsCMIv5VisaTrl7QlwdKGAye dh9nrkcBhzwUDuUkw8Ql45o= X-Google-Smtp-Source: ABdhPJxZCUqPbir6SAi1fciYqMtPVQYBtApd/DUlx8j4DWD/xaEIUpojUNBQbHf+CMMYpq1j3zcvaw== X-Received: by 2002:a5d:6da6:0:b0:1ea:75c7:77f0 with SMTP id u6-20020a5d6da6000000b001ea75c777f0mr7206509wrs.566.1645816600684; Fri, 25 Feb 2022 11:16:40 -0800 (PST) Received: from kista.localnet (cpe-86-58-32-107.static.triera.net. [86.58.32.107]) by smtp.gmail.com with ESMTPSA id c4-20020adfed84000000b001e5b8d5b8dasm4430781wro.36.2022.02.25.11.16.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 11:16:40 -0800 (PST) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: mchehab@kernel.org, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, mripard@kernel.org, paul.kocialkowski@bootlin.com, wens@csie.org, jonas@kwiboo.se, nicolas@ndufresne.ca, Benjamin Gaignard Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, kernel@collabora.com, knaerzche@gmail.com, jc@kynesim.co.uk, Benjamin Gaignard Subject: Re: [PATCH v3 12/14] media: uapi: Create a dedicated header for Hantro control Date: Fri, 25 Feb 2022 20:16:38 +0100 Message-ID: <2617680.mvXUDI8C0e@kista> In-Reply-To: <20220225164600.1044663-13-benjamin.gaignard@collabora.com> References: <20220225164600.1044663-1-benjamin.gaignard@collabora.com> <20220225164600.1044663-13-benjamin.gaignard@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220225_111643_403486_0DB69688 X-CRM114-Status: GOOD ( 26.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi! Dne petek, 25. februar 2022 ob 17:45:58 CET je Benjamin Gaignard napisal(a): > Hantro hardware needs a dedicated v4l2 control to perform HEVC > decoding. Move it to a dedicated header file to prepare HEVC > uAPI un-staging. > > Signed-off-by: Benjamin Gaignard > --- > .../userspace-api/media/drivers/hantro.rst | 5 ----- > drivers/staging/media/hantro/hantro_drv.c | 1 + > include/media/hevc-ctrls.h | 13 ------------- > include/uapi/linux/hantro-media.h | 19 +++++++++++++++++++ > include/uapi/linux/v4l2-controls.h | 5 +++++ > 5 files changed, 25 insertions(+), 18 deletions(-) > create mode 100644 include/uapi/linux/hantro-media.h > > diff --git a/Documentation/userspace-api/media/drivers/hantro.rst b/ Documentation/userspace-api/media/drivers/hantro.rst > index cd9754b4e005..78dcd2a44a03 100644 > --- a/Documentation/userspace-api/media/drivers/hantro.rst > +++ b/Documentation/userspace-api/media/drivers/hantro.rst > @@ -12,8 +12,3 @@ The Hantro video decoder driver implements the following driver-specific control > to before syntax element "slice_temporal_mvp_enabled_flag". > If IDR, the skipped bits are just "pic_output_flag" > (separate_colour_plane_flag is not supported). > - > -.. note:: > - > - This control is not yet part of the public kernel API and > - it is expected to change. > diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/ media/hantro/hantro_drv.c > index 6f58c259d8fc..783a92a38c8e 100644 > --- a/drivers/staging/media/hantro/hantro_drv.c > +++ b/drivers/staging/media/hantro/hantro_drv.c > @@ -11,6 +11,7 @@ > */ > > #include > +#include > #include > #include > #include > diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h > index cbf41d180fe9..f29298c8c2f8 100644 > --- a/include/media/hevc-ctrls.h > +++ b/include/media/hevc-ctrls.h > @@ -443,17 +443,4 @@ struct v4l2_ctrl_hevc_scaling_matrix { > __u8 scaling_list_dc_coef_32x32[2]; > }; > > -/* MPEG-class control IDs specific to the Hantro driver as defined by V4L2 */ > -#define V4L2_CID_CODEC_HANTRO_BASE (V4L2_CTRL_CLASS_CODEC | 0x1200) > -/* > - * V4L2_CID_HANTRO_HEVC_SLICE_HEADER_SKIP - > - * the number of data (in bits) to skip in the > - * slice segment header. > - * If non-IDR, the bits to be skipped go from syntax element "pic_output_flag" > - * to before syntax element "slice_temporal_mvp_enabled_flag". > - * If IDR, the skipped bits are just "pic_output_flag" > - * (separate_colour_plane_flag is not supported). > - */ > -#define V4L2_CID_HANTRO_HEVC_SLICE_HEADER_SKIP (V4L2_CID_CODEC_HANTRO_BASE + 0) > - > #endif > diff --git a/include/uapi/linux/hantro-media.h b/include/uapi/linux/hantro- media.h > new file mode 100644 > index 000000000000..b4e7ab7e6452 > --- /dev/null > +++ b/include/uapi/linux/hantro-media.h > @@ -0,0 +1,19 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ I get error: include/uapi/linux/hantro-media.h: missing "WITH Linux-syscall-note" for SPDX-License-Identifier make[1]: *** [scripts/Makefile.headersinst:63: usr/include/linux/hantro- media.h] Error 1 when installing headers. Best regards, Jernej > + > +#ifndef __UAPI_HANTRO_MEDIA_H__ > +#define __UAPI_HANTRO_MEDIA_H__ > + > +#include > + > +/* > + * V4L2_CID_HANTRO_HEVC_SLICE_HEADER_SKIP - > + * the number of data (in bits) to skip in the > + * slice segment header. > + * If non-IDR, the bits to be skipped go from syntax element "pic_output_flag" > + * to before syntax element "slice_temporal_mvp_enabled_flag". > + * If IDR, the skipped bits are just "pic_output_flag" > + * (separate_colour_plane_flag is not supported). > + */ > +#define V4L2_CID_HANTRO_HEVC_SLICE_HEADER_SKIP (V4L2_CID_USER_HANTRO_BASE + 0) > + > +#endif /* __UAPI_HANTRO_MEDIA_H__ */ > diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2- controls.h > index c8e0f84d204d..d56a1c7fb91d 100644 > --- a/include/uapi/linux/v4l2-controls.h > +++ b/include/uapi/linux/v4l2-controls.h > @@ -218,6 +218,11 @@ enum v4l2_colorfx { > * We reserve 16 controls for this driver. > */ > #define V4L2_CID_USER_ALLEGRO_BASE (V4L2_CID_USER_BASE + 0x1170) > +/* > + * The base for Hantro driver controls. > + * We reserve 128 controls for this driver. > + */ > +#define V4L2_CID_USER_HANTRO_BASE (V4L2_CID_USER_BASE + 0x1180) > > /* MPEG-class control IDs */ > /* The MPEG controls are applicable to all codec controls > -- > 2.32.0 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel