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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55335C47081 for ; Thu, 7 Apr 2022 15:32:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345024AbiDGPd6 (ORCPT ); Thu, 7 Apr 2022 11:33:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344812AbiDGPb7 (ORCPT ); Thu, 7 Apr 2022 11:31:59 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA6FABA0; Thu, 7 Apr 2022 08:29:58 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:4da4:8da5:b6b4:93c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: benjamin.gaignard) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 44C981F467BD; Thu, 7 Apr 2022 16:29:57 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1649345397; bh=n2Zh05VvSrnCl7VF3YOgsJdQk2392OPK4yLZuTAqs04=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HtLXdQK5H31ryXtySaIagzBDyxKXEEBvPOKnRbi6fW/bITdvoMwzI88/R9VgMIdw1 DTK9EThv3GYjMnxacEr8thLAWywxTKugMUYGPYGeHfzt4gnypUp8aSETX+NKXpJI5o EoLTdPV/Sf1Ozv95cfvmcZn8mD3BXuQoIu/W03IT+ghjM+g1IGY6cR/JFQj1hVTOIB IFm6fkDn2rKqW/u9Do+/nWNvIw/mEURrY1X6MDTfe4Yn8WerkO4P51Fouyz8Mknnue oR6N7D1raoDGuqtdq39bTs/+Z/ZHGNHDF/g6DqmfDrOi8C1Lvo0y6thjjsK5ed42jU otdF5kVgrZ8ZQ== From: Benjamin Gaignard To: mchehab@kernel.org, hverkuil@xs4all.nl, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, mripard@kernel.org, paul.kocialkowski@bootlin.com, wens@csie.org, jernej.skrabec@gmail.com, samuel@sholland.org, nicolas.dufresne@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, sebastian.fricke@collabora.com, Benjamin Gaignard Subject: [PATCH v5 14/17] media: uapi: Create a dedicated header for Hantro control Date: Thu, 7 Apr 2022 17:29:37 +0200 Message-Id: <20220407152940.738159-15-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220407152940.738159-1-benjamin.gaignard@collabora.com> References: <20220407152940.738159-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 d84edb7b8182..63be1a174516 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -459,17 +459,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..d0d48fd7de9c --- /dev/null +++ b/include/uapi/linux/hantro-media.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ + +#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 bb40129446d4..17c6df3e9c0b 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) /* * The base for the isl7998x driver controls. -- 2.32.0