From patchwork Wed Jan 31 10:50:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 769043 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E432269D30 for ; Wed, 31 Jan 2024 10:50:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698218; cv=none; b=c5cEVrrLtCikXnUi+jPWdshxaEmSOZ7gl5LnQ7Uco3QxjyhAUqZpEbedF6/1mzm8JKi+5CuFALMMfRqzsl0D87xH8SqJuxy50oGoOHbJWSLB+1Tu1uNHO0svyhF7zS0rBEC8nit6LL1jvWOEbh9sYa53IESeS6Q2S66KY0yFpOU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698218; c=relaxed/simple; bh=8fy9UTRa5pbqan4CetoucO06hS65NKL8apA+SUoOwEY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RDR4W9R8MJwH7sbMM78AicOu3rHIEpsl+q46nntP2kCvwABwcv/eVQrNiAJIiXXKcUOIyytmZYx81jwgjmL7JvgbaW96s3JciuEvqvz9LsAToqbt7vmh+xHQOzvTIPTXNiyKX0UOwJewdx/0gx8CaOYBYqogytGhmd36ssHblaM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=Nqmd3Htu; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="Nqmd3Htu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1706698215; bh=8fy9UTRa5pbqan4CetoucO06hS65NKL8apA+SUoOwEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nqmd3HtuN0KJLgn701wyoiUX5nbP9mZAt8rVwxEFiIX5RDKJLih/B8tAS2h7yuPkO BCFGtGkrpraTXCEqce+mRo68hQB6P2v9ANd/lN4ACm6tbbFbrw45NqnU3f5HFJaHeb MJBEKGQj13LBPyVgkiLNuv59Fd3uu0Le5q85bJy556WVwNGbvwNR/26WaQazutEw38 3P8ohvx/4LcOCCw1Et6Gdzn2ky+pAlXiL4rdkGz3LHwrcnv+gdjH3p0d7JxUCuz8FR PilrgFWNhcAIQXfgZKxByyDPU6oMxTxdspwZXcmRATziU74LJYwWdYcJQ2S6FQRqbX iTaeMXoZcsj4w== Received: from benjamin-XPS-13-9310.. (cola.collaboradmins.com [195.201.22.229]) (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 madrid.collaboradmins.com (Postfix) with ESMTPSA id DC7AE378202B; Wed, 31 Jan 2024 10:50:14 +0000 (UTC) From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, nicolas.dufresne@collabora.com Cc: linux-media@vger.kernel.org, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v2 1/2] media: videodev2: Add V4L2_FMT_FLAG_ALL_FORMATS flag Date: Wed, 31 Jan 2024 11:50:07 +0100 Message-Id: <20240131105008.109457-2-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240131105008.109457-1-benjamin.gaignard@collabora.com> References: <20240131105008.109457-1-benjamin.gaignard@collabora.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add new flag to allow enumerate all pixels formats when calling VIDIOC_ENUM_FMT ioctl. When this flag is set drivers must ignore the configuration and return the hardware supported pixel formats for the specified queue. This will permit to discover which pixels formats are supported without setting codec-specific information so userland can more easily knows if the driver suit well to what it needs. The main target are stateless decoders so update the documentation about how use this flag. Signed-off-by: Benjamin Gaignard --- changes in version 2: - Clarify documentation. - Only keep V4L2_FMT_FLAG_ALL_FORMATS flag in ioctl. .../userspace-api/media/v4l/dev-stateless-decoder.rst | 4 ++++ Documentation/userspace-api/media/v4l/vidioc-enum-fmt.rst | 5 +++++ Documentation/userspace-api/media/videodev2.h.rst.exceptions | 1 + drivers/media/v4l2-core/v4l2-ioctl.c | 3 +++ include/uapi/linux/videodev2.h | 1 + 5 files changed, 14 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/dev-stateless-decoder.rst b/Documentation/userspace-api/media/v4l/dev-stateless-decoder.rst index 35ed05f2695e..c5948b5744dc 100644 --- a/Documentation/userspace-api/media/v4l/dev-stateless-decoder.rst +++ b/Documentation/userspace-api/media/v4l/dev-stateless-decoder.rst @@ -58,6 +58,10 @@ Querying capabilities default values for these controls being used, and a returned set of formats that may not be usable for the media the client is trying to decode. + * If ``V4L2_FMT_FLAG_ALL_FORMATS`` flag is set the driver must enumerate + all the supported formats without taking care of codec-dependent controls + set on ``OUTPUT`` queue. + 3. The client may use :c:func:`VIDIOC_ENUM_FRAMESIZES` to detect supported resolutions for a given format, passing desired pixel format in :c:type:`v4l2_frmsizeenum`'s ``pixel_format``. diff --git a/Documentation/userspace-api/media/v4l/vidioc-enum-fmt.rst b/Documentation/userspace-api/media/v4l/vidioc-enum-fmt.rst index 000c154b0f98..50e07ed4d79a 100644 --- a/Documentation/userspace-api/media/v4l/vidioc-enum-fmt.rst +++ b/Documentation/userspace-api/media/v4l/vidioc-enum-fmt.rst @@ -227,6 +227,11 @@ the ``mbus_code`` field is handled differently: The application can ask to configure the quantization of the capture device when calling the :ref:`VIDIOC_S_FMT ` ioctl with :ref:`V4L2_PIX_FMT_FLAG_SET_CSC ` set. + * - ``V4L2_FMT_FLAG_ALL_FORMATS`` + - 0x0200 + - Set by userland application to enumerate all possible pixels formats + without taking care of any configuration done on OUTPUT or CAPTURE + queues. Return Value ============ diff --git a/Documentation/userspace-api/media/videodev2.h.rst.exceptions b/Documentation/userspace-api/media/videodev2.h.rst.exceptions index 3e58aac4ef0b..42d9075b7fc2 100644 --- a/Documentation/userspace-api/media/videodev2.h.rst.exceptions +++ b/Documentation/userspace-api/media/videodev2.h.rst.exceptions @@ -215,6 +215,7 @@ replace define V4L2_FMT_FLAG_CSC_XFER_FUNC fmtdesc-flags replace define V4L2_FMT_FLAG_CSC_YCBCR_ENC fmtdesc-flags replace define V4L2_FMT_FLAG_CSC_HSV_ENC fmtdesc-flags replace define V4L2_FMT_FLAG_CSC_QUANTIZATION fmtdesc-flags +replace define V4L2_FMT_FLAG_ALL_FORMATS fmtdesc-flags # V4L2 timecode types replace define V4L2_TC_TYPE_24FPS timecode-type diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 33076af4dfdb..ce69e026f8d9 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1535,6 +1535,7 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops, int ret = check_fmt(file, p->type); u32 mbus_code; u32 cap_mask; + u32 flags; if (ret) return ret; @@ -1544,8 +1545,10 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops, p->mbus_code = 0; mbus_code = p->mbus_code; + flags = p->flags & V4L2_FMT_FLAG_ALL_FORMATS; memset_after(p, 0, type); p->mbus_code = mbus_code; + p->flags = flags; switch (p->type) { case V4L2_BUF_TYPE_VIDEO_CAPTURE: diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 68e7ac178cc2..82d8c8a7fb7f 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -869,6 +869,7 @@ struct v4l2_fmtdesc { #define V4L2_FMT_FLAG_CSC_YCBCR_ENC 0x0080 #define V4L2_FMT_FLAG_CSC_HSV_ENC V4L2_FMT_FLAG_CSC_YCBCR_ENC #define V4L2_FMT_FLAG_CSC_QUANTIZATION 0x0100 +#define V4L2_FMT_FLAG_ALL_FORMATS 0x0200 /* Frame Size and frame rate enumeration */ /* From patchwork Wed Jan 31 10:50:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 768709 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79A4469E0D for ; Wed, 31 Jan 2024 10:50:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698219; cv=none; b=FFUc23ZemGdt1MvJVPIcmWQTaxvo/h0PdJkNldDaulJ44jucl6lexuzTXl/VFvdXi09oiRypGRv4Roc6DwhIEFUEb5JglMs/trUUD6PE32dHm9piuUW3N0O2kncnKpUZfbrzPDkdBLMS1SvlCDvJar+r1o0v7rkjHqktN+Xct3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706698219; c=relaxed/simple; bh=m+4+w8Nro/6qVnOqVGso2S9Ki0IT4qV76zZG6m3in1I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WNkIVLU+hQ75ggD5bRE9kB3sY9qbICZQOtN/0aUCiToOfzQbv/cm4sBV1vR8uxseAwKJr2/Wp4EGPpP1JJlQiGXM/2JZuuGNUbUonejjaxqHfBy2ZxvKjk3+2N2ZzO4iqqmSMDBfzXP1WqTa+h94TFWujhmS7G31FP2ZywIBR1Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=0GaId8Ax; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="0GaId8Ax" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1706698215; bh=m+4+w8Nro/6qVnOqVGso2S9Ki0IT4qV76zZG6m3in1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0GaId8Ax/q346NDJYUGLxbvfCfDrWDq7vgJabX9t684hSVr8E+1aIjMVomYcStNQ/ MoqtPqUsUgqqertSxAPcycscdyKOTVGAANPGEgABOtvQ9M+F9zimmdrzb1Vnu9Sksi eEoHuTpQ6dp+t57wy9Bs0joVzhE52Om9IssLF9254ak2ESjCr7X+I4Q1U3HEefJgJk sPqIpWaVqOWp8uiGqsInrvWyDO3D8gRL8IZfUfB3DyLFTUGWPFU358gid/lJ2IRIi2 /Fve7ElvyzPTS0WHu3/t4X6+aCcC/Cq4zoQctewuGz1y9zJV2g/+3X1YiItM2X8Mot Yd/gT7FsDLJWw== Received: from benjamin-XPS-13-9310.. (cola.collaboradmins.com [195.201.22.229]) (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 madrid.collaboradmins.com (Postfix) with ESMTPSA id 6DE9D378203B; Wed, 31 Jan 2024 10:50:15 +0000 (UTC) From: Benjamin Gaignard To: hverkuil@xs4all.nl, mchehab@kernel.org, nicolas.dufresne@collabora.com Cc: linux-media@vger.kernel.org, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v2 2/2] media: verisilicon: Use V4L2_FMT_FLAG_ALL_FORMATS flag Date: Wed, 31 Jan 2024 11:50:08 +0100 Message-Id: <20240131105008.109457-3-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240131105008.109457-1-benjamin.gaignard@collabora.com> References: <20240131105008.109457-1-benjamin.gaignard@collabora.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 If V4L2_FMT_FLAG_ALL_FORMATS flag has been set when calling VIDIOC_ENUM_FMT ignore depth match and returns all the hardware supported pixels formats. Signed-off-by: Benjamin Gaignard --- drivers/media/platform/verisilicon/hantro_v4l2.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c index 941fa23c211a..6d840911c764 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -201,7 +201,13 @@ static int vidioc_enum_fmt(struct file *file, void *priv, struct hantro_ctx *ctx = fh_to_ctx(priv); const struct hantro_fmt *fmt, *formats; unsigned int num_fmts, i, j = 0; - bool skip_mode_none; + bool skip_mode_none, ignore_depth_match; + + /* + * If V4L2_FMT_FLAG_ALL_FORMATS flag is set, we want to enumerate all + * hardware supported pixels formats + */ + ignore_depth_match = !!(f->flags & V4L2_FMT_FLAG_ALL_FORMATS); /* * When dealing with an encoder: @@ -222,7 +228,7 @@ static int vidioc_enum_fmt(struct file *file, void *priv, if (skip_mode_none == mode_none) continue; - if (!hantro_check_depth_match(fmt, ctx->bit_depth)) + if (!hantro_check_depth_match(fmt, ctx->bit_depth) && !ignore_depth_match) continue; if (j == f->index) { f->pixelformat = fmt->fourcc; @@ -242,7 +248,7 @@ static int vidioc_enum_fmt(struct file *file, void *priv, for (i = 0; i < num_fmts; i++) { fmt = &formats[i]; - if (!hantro_check_depth_match(fmt, ctx->bit_depth)) + if (!hantro_check_depth_match(fmt, ctx->bit_depth) && !ignore_depth_match) continue; if (j == f->index) { f->pixelformat = fmt->fourcc;