Pull media updates from Mauro Carvalho Chehab: - new dvb frontend driver: lnbh29 - new sensor drivers: imx319 and imx 355 - some old soc_camera driver renames to avoid conflict with new drivers - new i.MX Pixel Pipeline (PXP) mem-to-mem platform driver - a new V4L2 frontend for the FWHT codec - several other improvements, bug fixes, code cleanups, etc * tag 'media/v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (289 commits) media: rename soc_camera I2C drivers media: cec: forgot to cancel delayed work media: vivid: Support 480p for webcam capture media: v4l2-tpg: fix kernel oops when enabling HFLIP and OSD media: vivid: Add 16-bit bayer to format list media: v4l2-tpg-core: Add 16-bit bayer media: pvrusb2: replace `printk` with `pr_*` media: venus: vdec: fix decoded data size media: cx231xx: fix potential sign-extension overflow on large shift media: dt-bindings: media: rcar_vin: add device tree support for r8a7744 media: isif: fix a NULL pointer dereference bug media: exynos4-is: make const array config_ids static media: cx23885: make const array addr_list static media: ivtv: make const array addr_list static media: bttv-input: make const array addr_list static media: cx18: Don't check for address of video_dev media: dw9807-vcm: Fix probe error handling media: dw9714: Remove useless error message media: dw9714: Fix error handling in probe function media: cec: name for RC passthrough device does not need 'RC for' ...
Showing the changes to include/uapi/linux (2 of 578 files). Show all
Unified · Split
| @@ -152,10 +152,13 @@ static inline void cec_msg_set_reply_to(struct cec_msg *msg, · 151 unmodified lines | ||
| 152 | 152 | #define CEC_TX_STATUS_LOW_DRIVE (1 << 3) |
| 153 | 153 | #define CEC_TX_STATUS_ERROR (1 << 4) |
| 154 | 154 | #define CEC_TX_STATUS_MAX_RETRIES (1 << 5) |
| 155 | +#define CEC_TX_STATUS_ABORTED (1 << 6) | |
| 156 | +#define CEC_TX_STATUS_TIMEOUT (1 << 7) | |
| 155 | 157 | |
| 156 | 158 | #define CEC_RX_STATUS_OK (1 << 0) |
| 157 | 159 | #define CEC_RX_STATUS_TIMEOUT (1 << 1) |
| 158 | 160 | #define CEC_RX_STATUS_FEATURE_ABORT (1 << 2) |
| 161 | +#define CEC_RX_STATUS_ABORTED (1 << 3) | |
| 159 | 162 | |
| 160 | 163 | static inline int cec_msg_status_is_ok(const struct cec_msg *msg) |
| 161 | 164 | { |
| @@ -225,8 +225,8 @@ enum v4l2_colorspace { · 224 unmodified lines | ||
| 225 | 225 | /* For RGB colorspaces such as produces by most webcams. */ |
| 226 | 226 | V4L2_COLORSPACE_SRGB = 8, |
| 227 | 227 | |
| 228 | − /* AdobeRGB colorspace */ | |
| 229 | − V4L2_COLORSPACE_ADOBERGB = 9, | |
| 228 | + /* opRGB colorspace */ | |
| 229 | + V4L2_COLORSPACE_OPRGB = 9, | |
| 230 | 230 | |
| 231 | 231 | /* BT.2020 colorspace, used for UHDTV. */ |
| 232 | 232 | V4L2_COLORSPACE_BT2020 = 10, |
| @@ -258,7 +258,7 @@ enum v4l2_xfer_func { · 25 unmodified lines | ||
| 258 | 258 | * |
| 259 | 259 | * V4L2_COLORSPACE_SRGB, V4L2_COLORSPACE_JPEG: V4L2_XFER_FUNC_SRGB |
| 260 | 260 | * |
| 261 | − * V4L2_COLORSPACE_ADOBERGB: V4L2_XFER_FUNC_ADOBERGB | |
| 261 | + * V4L2_COLORSPACE_OPRGB: V4L2_XFER_FUNC_OPRGB | |
| 262 | 262 | * |
| 263 | 263 | * V4L2_COLORSPACE_SMPTE240M: V4L2_XFER_FUNC_SMPTE240M |
| 264 | 264 | * |
| @@ -269,7 +269,7 @@ enum v4l2_xfer_func { · 4 unmodified lines | ||
| 269 | 269 | V4L2_XFER_FUNC_DEFAULT = 0, |
| 270 | 270 | V4L2_XFER_FUNC_709 = 1, |
| 271 | 271 | V4L2_XFER_FUNC_SRGB = 2, |
| 272 | − V4L2_XFER_FUNC_ADOBERGB = 3, | |
| 272 | + V4L2_XFER_FUNC_OPRGB = 3, | |
| 273 | 273 | V4L2_XFER_FUNC_SMPTE240M = 4, |
| 274 | 274 | V4L2_XFER_FUNC_NONE = 5, |
| 275 | 275 | V4L2_XFER_FUNC_DCI_P3 = 6, |
| @@ -281,7 +281,7 @@ enum v4l2_xfer_func { · 5 unmodified lines | ||
| 281 | 281 | * This depends on the colorspace. |
| 282 | 282 | */ |
| 283 | 283 | #define V4L2_MAP_XFER_FUNC_DEFAULT(colsp) \ |
| 284 | − ((colsp) == V4L2_COLORSPACE_ADOBERGB ? V4L2_XFER_FUNC_ADOBERGB : \ | |
| 284 | + ((colsp) == V4L2_COLORSPACE_OPRGB ? V4L2_XFER_FUNC_OPRGB : \ | |
| 285 | 285 | ((colsp) == V4L2_COLORSPACE_SMPTE240M ? V4L2_XFER_FUNC_SMPTE240M : \ |
| 286 | 286 | ((colsp) == V4L2_COLORSPACE_DCI_P3 ? V4L2_XFER_FUNC_DCI_P3 : \ |
| 287 | 287 | ((colsp) == V4L2_COLORSPACE_RAW ? V4L2_XFER_FUNC_NONE : \ |
| @@ -295,7 +295,7 @@ enum v4l2_ycbcr_encoding { · 7 unmodified lines | ||
| 295 | 295 | * |
| 296 | 296 | * V4L2_COLORSPACE_SMPTE170M, V4L2_COLORSPACE_470_SYSTEM_M, |
| 297 | 297 | * V4L2_COLORSPACE_470_SYSTEM_BG, V4L2_COLORSPACE_SRGB, |
| 298 | − * V4L2_COLORSPACE_ADOBERGB and V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601 | |
| 298 | + * V4L2_COLORSPACE_OPRGB and V4L2_COLORSPACE_JPEG: V4L2_YCBCR_ENC_601 | |
| 299 | 299 | * |
| 300 | 300 | * V4L2_COLORSPACE_REC709 and V4L2_COLORSPACE_DCI_P3: V4L2_YCBCR_ENC_709 |
| 301 | 301 | * |
| @@ -382,6 +382,17 @@ enum v4l2_quantization { · 80 unmodified lines | ||
| 382 | 382 | (((is_rgb_or_hsv) || (colsp) == V4L2_COLORSPACE_JPEG) ? \ |
| 383 | 383 | V4L2_QUANTIZATION_FULL_RANGE : V4L2_QUANTIZATION_LIM_RANGE)) |
| 384 | 384 | |
| 385 | +/* | |
| 386 | + * Deprecated names for opRGB colorspace (IEC 61966-2-5) | |
| 387 | + * | |
| 388 | + * WARNING: Please don't use these deprecated defines in your code, as | |
| 389 | + * there is a chance we have to remove them in the future. | |
| 390 | + */ | |
| 391 | +#ifndef __KERNEL__ | |
| 392 | +#define V4L2_COLORSPACE_ADOBERGB V4L2_COLORSPACE_OPRGB | |
| 393 | +#define V4L2_XFER_FUNC_ADOBERGB V4L2_XFER_FUNC_OPRGB | |
| 394 | +#endif | |
| 395 | + | |
| 385 | 396 | enum v4l2_priority { |
| 386 | 397 | V4L2_PRIORITY_UNSET = 0, /* not initialized */ |
| 387 | 398 | V4L2_PRIORITY_BACKGROUND = 1, |
| @@ -703,6 +714,7 @@ struct v4l2_pix_format { · 315 unmodified lines | ||
| 703 | 714 | #define V4L2_META_FMT_VSP1_HGO v4l2_fourcc('V', 'S', 'P', 'H') /* R-Car VSP1 1-D Histogram */ |
| 704 | 715 | #define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T') /* R-Car VSP1 2-D Histogram */ |
| 705 | 716 | #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H') /* UVC Payload Header metadata */ |
| 717 | +#define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X') /* D4XX Payload Header metadata */ | |
| 706 | 718 | |
| 707 | 719 | /* priv field value to indicates that subsequent fields are valid. */ |
| 708 | 720 | #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe |
| @@ -1400,6 +1412,13 @@ struct v4l2_bt_timings { · 691 unmodified lines | ||
| 1400 | 1412 | * InfoFrame). |
| 1401 | 1413 | */ |
| 1402 | 1414 | #define V4L2_DV_FL_HAS_HDMI_VIC (1 << 8) |
| 1415 | +/* | |
| 1416 | + * CEA-861 specific: only valid for video receivers. | |
| 1417 | + * If set, then HW can detect the difference between regular FPS and | |
| 1418 | + * 1000/1001 FPS. Note: This flag is only valid for HDMI VIC codes with | |
| 1419 | + * the V4L2_DV_FL_CAN_REDUCE_FPS flag set. | |
| 1420 | + */ | |
| 1421 | +#define V4L2_DV_FL_CAN_DETECT_REDUCED_FPS (1 << 9) | |
| 1403 | 1422 | |
| 1404 | 1423 | /* A few useful defines to calculate the total blanking and frame sizes */ |
| 1405 | 1424 | #define V4L2_DV_BT_BLANKING_WIDTH(bt) \ |