From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 30C882DA77A for ; Mon, 25 Aug 2025 09:51:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756115508; cv=none; b=lOr2fy5+IAJwbnvHdAuk8iGJseJwed9MHGpmxSayx+GCNX1AvBysP7RsyD/b5TQ+G9TQh0ZlFlTbLIE9Dp2dIblL/ErRbADOZeIAL1bl62yDVL18ohSKASXv0l842CMCRpqTSphPj1FWwiDKelJZiH90TlJ+fkKhQwDkL2rOXRw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756115508; c=relaxed/simple; bh=dfjIyoXUR55sBMJkXA3CHkuZfHMZ3RfadmAuGybN5VY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mO1FRHFZ3Yd0cwhmMzDQsE8Ki0g/mhEoswnSeFxgzeJMui+dVIeuxxYiam+v4/O843exlaZh1lqAZ7Jm0COmf2NvKPy8bp2+LXobXdsBSsfVT0XZOO+t/S5jroKTO90RcbL9XBWJXfsmfmgeLQ+vmECJJRSTXfdter0VprA9iXM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=MLDcQ/+M; arc=none smtp.client-ip=198.175.65.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="MLDcQ/+M" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1756115508; x=1787651508; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dfjIyoXUR55sBMJkXA3CHkuZfHMZ3RfadmAuGybN5VY=; b=MLDcQ/+MegMDER2dYBq+8pPvTY6RHAKvCSGJgmBPBGEKXbNlZAFgNEF2 F3b085D7AopWuPVuwObnXTX7b0SGwb9zxUmWVmMD5oYFOL3G33pbBaKzZ m6KzFaYDToDrjoqVoZbTC0ENf5B+gV4FYdJ2i52s0bsUZgYJvnilYivJr SlXTsGQwGnh8tldtNZSUOHEp/xDqwrw6/C6Xr5IntNeOMEds/TsVdH9Hd wbdKmNejNvUgfp2Cty1BLtssBmsD7XM2FbuE6iraihcZZG0BVbZki3nr0 NeTO2uVYJPGRj/pVNX5nxCZYY+JzrYd0cLHAgAGMLGsp8XNAUvIr1Vq7H Q==; X-CSE-ConnectionGUID: 9EoiXG+AQy2l+gQceczZgA== X-CSE-MsgGUID: xPwBn53lTc+pqELsrYUICA== X-IronPort-AV: E=McAfee;i="6800,10657,11532"; a="58032177" X-IronPort-AV: E=Sophos;i="6.17,312,1747724400"; d="scan'208";a="58032177" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2025 02:51:45 -0700 X-CSE-ConnectionGUID: UYvu0bjfRwSkaOPNxAydNw== X-CSE-MsgGUID: Dx2/md+OTjOZsXzr0eC1mQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.17,312,1747724400"; d="scan'208";a="173431065" Received: from vpanait-mobl.ger.corp.intel.com (HELO kekkonen.fi.intel.com) ([10.245.245.7]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2025 02:51:38 -0700 Received: from punajuuri.localdomain (unknown [192.168.240.130]) by kekkonen.fi.intel.com (Postfix) with ESMTP id A1724121FED; Mon, 25 Aug 2025 12:51:08 +0300 (EEST) Received: from sailus by punajuuri.localdomain with local (Exim 4.98.2) (envelope-from ) id 1uqTr2-00000005agG-2aef; Mon, 25 Aug 2025 12:51:08 +0300 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo From: Sakari Ailus To: linux-media@vger.kernel.org Cc: hans@jjverkuil.nl, laurent.pinchart@ideasonboard.com, Prabhakar , Kate Hsuan , Alexander Shiyan , Dave Stevenson , Tommaso Merciai , Umang Jain , Benjamin Mugnier , Sylvain Petinot , Christophe JAILLET , Julien Massot , Naushir Patuck , "Yan, Dongcheng" , "Cao, Bingbu" , "Qiu, Tian Shu" , "Wang, Hongju" , Stefan Klug , Mirela Rabulea , =?UTF-8?q?Andr=C3=A9=20Apitzsch?= , Heimir Thor Sverrisson , Kieran Bingham , Stanislaw Gruszka , Mehdi Djait , Ricardo Ribalda Delgado , Hans de Goede , Jacopo Mondi , Tomi Valkeinen Subject: [PATCH v11 38/66] Revert "media: uapi: v4l: Don't expose generic metadata formats to userspace" Date: Mon, 25 Aug 2025 12:50:39 +0300 Message-ID: <20250825095107.1332313-39-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250825095107.1332313-1-sakari.ailus@linux.intel.com> References: <20250825095107.1332313-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This reverts commit d69c8429ea80af02e89e5b3eecb78e417ad049c8. Make the generic metadata formats visible for the userspace again. Signed-off-by: Sakari Ailus --- include/uapi/linux/videodev2.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 6a5d9ac7bdb9..2b2e070f272c 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -890,7 +890,6 @@ struct v4l2_pix_format { #define V4L2_META_FMT_RPI_FE_CFG v4l2_fourcc('R', 'P', 'F', 'C') /* PiSP FE configuration */ #define V4L2_META_FMT_RPI_FE_STATS v4l2_fourcc('R', 'P', 'F', 'S') /* PiSP FE stats */ -#ifdef __KERNEL__ /* * Line-based metadata formats. Remember to update v4l_fill_fmtdesc() when * adding new ones! @@ -902,7 +901,6 @@ struct v4l2_pix_format { #define V4L2_META_FMT_GENERIC_16 v4l2_fourcc('M', 'E', 'T', 'G') /* Generic 16-bit 8-bit metadata */ #define V4L2_META_FMT_GENERIC_CSI2_20 v4l2_fourcc('M', 'E', 'C', 'K') /* 20-bit CSI-2 packed 8-bit metadata */ #define V4L2_META_FMT_GENERIC_24 v4l2_fourcc('M', 'E', 'T', 'O') /* Generic 24-bit 8-bit metadata */ -#endif /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe -- 2.47.2