Commit ce67eaca authored by Joe Richey's avatar Joe Richey Committed by Mauro Carvalho Chehab
Browse files

media: vicodec: Use _BITUL() macro in UAPI headers 



Replace BIT() in v4l2's UPAI header with _BITUL(). BIT() is not defined
in the UAPI headers and its usage may cause userspace build errors.

Fixes: 206bc0f6 ("media: vicodec: mark the stateless FWHT API as stable")
Signed-off-by: default avatarJoe Richey <joerichey@google.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent d170ebb0

include/uapi/linux/v4l2-controls.h

+12 −11
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#ifndef __LINUX_V4L2_CONTROLS_H

#define __LINUX_V4L2_CONTROLS_H



#include <linux/const.h>

#include <linux/types.h>



/* Control classes */
@@ -1602,30 +1603,30 @@ struct v4l2_ctrl_h264_decode_params { 
#define V4L2_FWHT_VERSION			3



/* Set if this is an interlaced format */

#define V4L2_FWHT_FL_IS_INTERLACED		BIT(0)

#define V4L2_FWHT_FL_IS_INTERLACED		_BITUL(0)

/* Set if this is a bottom-first (NTSC) interlaced format */

#define V4L2_FWHT_FL_IS_BOTTOM_FIRST		BIT(1)

#define V4L2_FWHT_FL_IS_BOTTOM_FIRST		_BITUL(1)

/* Set if each 'frame' contains just one field */

#define V4L2_FWHT_FL_IS_ALTERNATE		BIT(2)

#define V4L2_FWHT_FL_IS_ALTERNATE		_BITUL(2)

/*

 * If V4L2_FWHT_FL_IS_ALTERNATE was set, then this is set if this

 * 'frame' is the bottom field, else it is the top field.

 */

#define V4L2_FWHT_FL_IS_BOTTOM_FIELD		BIT(3)

#define V4L2_FWHT_FL_IS_BOTTOM_FIELD		_BITUL(3)

/* Set if the Y' plane is uncompressed */

#define V4L2_FWHT_FL_LUMA_IS_UNCOMPRESSED	BIT(4)

#define V4L2_FWHT_FL_LUMA_IS_UNCOMPRESSED	_BITUL(4)

/* Set if the Cb plane is uncompressed */

#define V4L2_FWHT_FL_CB_IS_UNCOMPRESSED		BIT(5)

#define V4L2_FWHT_FL_CB_IS_UNCOMPRESSED		_BITUL(5)

/* Set if the Cr plane is uncompressed */

#define V4L2_FWHT_FL_CR_IS_UNCOMPRESSED		BIT(6)

#define V4L2_FWHT_FL_CR_IS_UNCOMPRESSED		_BITUL(6)

/* Set if the chroma plane is full height, if cleared it is half height */

#define V4L2_FWHT_FL_CHROMA_FULL_HEIGHT		BIT(7)

#define V4L2_FWHT_FL_CHROMA_FULL_HEIGHT		_BITUL(7)

/* Set if the chroma plane is full width, if cleared it is half width */

#define V4L2_FWHT_FL_CHROMA_FULL_WIDTH		BIT(8)

#define V4L2_FWHT_FL_CHROMA_FULL_WIDTH		_BITUL(8)

/* Set if the alpha plane is uncompressed */

#define V4L2_FWHT_FL_ALPHA_IS_UNCOMPRESSED	BIT(9)

#define V4L2_FWHT_FL_ALPHA_IS_UNCOMPRESSED	_BITUL(9)

/* Set if this is an I Frame */

#define V4L2_FWHT_FL_I_FRAME			BIT(10)

#define V4L2_FWHT_FL_I_FRAME			_BITUL(10)



/* A 4-values flag - the number of components - 1 */

#define V4L2_FWHT_FL_COMPONENTS_NUM_MSK		GENMASK(18, 16)