[media] hdmi: add new HDMI 2.0 defines

Add new Video InfoFrame colorspace information introduced in HDMI 2.0
and new Audio Coding Extension Types, also from HDMI 2.0.

HDMI_CONTENT_TYPE_NONE was renamed to _GRAPHICS since that's what
it is called in CEA-861-F.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index cbb5790a35cd7f360ac602ddca36ab331319a649..5afc0bff2bbe3908dbffc7b6bca71ad1ba0355bb 100644 (file)
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -52,12 +52,18 @@ enum hdmi_colorspace {
        HDMI_COLORSPACE_RGB,
        HDMI_COLORSPACE_YUV422,
        HDMI_COLORSPACE_YUV444,
+       HDMI_COLORSPACE_YUV420,
+       HDMI_COLORSPACE_RESERVED4,
+       HDMI_COLORSPACE_RESERVED5,
+       HDMI_COLORSPACE_RESERVED6,
+       HDMI_COLORSPACE_IDO_DEFINED,
 };
 
 enum hdmi_scan_mode {
        HDMI_SCAN_MODE_NONE,
        HDMI_SCAN_MODE_OVERSCAN,
        HDMI_SCAN_MODE_UNDERSCAN,
+       HDMI_SCAN_MODE_RESERVED,
 };
 
 enum hdmi_colorimetry {
@@ -71,6 +77,7 @@ enum hdmi_picture_aspect {
        HDMI_PICTURE_ASPECT_NONE,
        HDMI_PICTURE_ASPECT_4_3,
        HDMI_PICTURE_ASPECT_16_9,
+       HDMI_PICTURE_ASPECT_RESERVED,
 };
 
 enum hdmi_active_aspect {
@@ -92,12 +99,18 @@ enum hdmi_extended_colorimetry {
        HDMI_EXTENDED_COLORIMETRY_S_YCC_601,
        HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601,
        HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB,
+
+       /* The following EC values are only defined in CEA-861-F. */
+       HDMI_EXTENDED_COLORIMETRY_BT2020_CONST_LUM,
+       HDMI_EXTENDED_COLORIMETRY_BT2020,
+       HDMI_EXTENDED_COLORIMETRY_RESERVED,
 };
 
 enum hdmi_quantization_range {
        HDMI_QUANTIZATION_RANGE_DEFAULT,
        HDMI_QUANTIZATION_RANGE_LIMITED,
        HDMI_QUANTIZATION_RANGE_FULL,
+       HDMI_QUANTIZATION_RANGE_RESERVED,
 };
 
 /* non-uniform picture scaling */
@@ -114,7 +127,7 @@ enum hdmi_ycc_quantization_range {
 };
 
 enum hdmi_content_type {
-       HDMI_CONTENT_TYPE_NONE,
+       HDMI_CONTENT_TYPE_GRAPHICS,
        HDMI_CONTENT_TYPE_PHOTO,
        HDMI_CONTENT_TYPE_CINEMA,
        HDMI_CONTENT_TYPE_GAME,
@@ -194,6 +207,7 @@ enum hdmi_audio_coding_type {
        HDMI_AUDIO_CODING_TYPE_MLP,
        HDMI_AUDIO_CODING_TYPE_DST,
        HDMI_AUDIO_CODING_TYPE_WMA_PRO,
+       HDMI_AUDIO_CODING_TYPE_CXT,
 };
 
 enum hdmi_audio_sample_size {
@@ -216,9 +230,23 @@ enum hdmi_audio_sample_frequency {
 
 enum hdmi_audio_coding_type_ext {
        HDMI_AUDIO_CODING_TYPE_EXT_STREAM,
+
+       /*
+        * The next three CXT values are defined in CEA-861-E only.
+        * They do not exist in older versions, and in CEA-861-F they are
+        * defined as 'Not in use'.
+        */
        HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC,
        HDMI_AUDIO_CODING_TYPE_EXT_HE_AAC_V2,
        HDMI_AUDIO_CODING_TYPE_EXT_MPEG_SURROUND,
+
+       /* The following CXT values are only defined in CEA-861-F. */
+       HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC,
+       HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_V2,
+       HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC,
+       HDMI_AUDIO_CODING_TYPE_EXT_DRA,
+       HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_HE_AAC_SURROUND,
+       HDMI_AUDIO_CODING_TYPE_EXT_MPEG4_AAC_LC_SURROUND = 10,
 };
 
 struct hdmi_audio_infoframe {