Enable Dynamic Range and Mastering Infoframe for HDR content, which is defined in CEA 861.3 spec. The metadata will be computed based on blending policy in userspace compositors and passed as a connector property blob to driver. The same will be sent as infoframe to panel which support HDR. Added the const version of infoframe for DRM metadata for HDR. v2: Rebase and added Ville's POC changes. v3: No Change v4: Addressed Shashank's review comments and merged the patch making drm infoframe function arguments as constant. v5: Rebase v6: Fixed checkpatch warnings with --strict option. Addressed Shashank's review comments and added his RB. v7: Addressed Brian Starkey's review comments. Merged 2 patches into one. v8: Addressed Jonas Karlman review comments. v9: Addressed Jonas Karlman review comments. v10: Addressed Ville's review comments. v11: Added BUILD_BUG_ON and sizeof instead of magic numbers as per Ville's comments.
Showing the changes to include/linux (1 of 4 files). Show all
Unified · Split
| @@ -47,6 +47,7 @@ enum hdmi_infoframe_type { · 46 unmodified lines | |||
| 47 | HDMI_INFOFRAME_TYPE_AVI = 0x82, | 47 | HDMI_INFOFRAME_TYPE_AVI = 0x82, |
| 48 | HDMI_INFOFRAME_TYPE_SPD = 0x83, | 48 | HDMI_INFOFRAME_TYPE_SPD = 0x83, |
| 49 | HDMI_INFOFRAME_TYPE_AUDIO = 0x84, | 49 | HDMI_INFOFRAME_TYPE_AUDIO = 0x84, |
| 50 | HDMI_INFOFRAME_TYPE_DRM = 0x87, | ||
| 50 | }; | 51 | }; |
| 51 | 52 | ||
| 52 | #define HDMI_IEEE_OUI 0x000c03 | 53 | #define HDMI_IEEE_OUI 0x000c03 |
| @@ -55,6 +56,7 @@ enum hdmi_infoframe_type { · 2 unmodified lines | |||
| 55 | #define HDMI_AVI_INFOFRAME_SIZE 13 | 56 | #define HDMI_AVI_INFOFRAME_SIZE 13 |
| 56 | #define HDMI_SPD_INFOFRAME_SIZE 25 | 57 | #define HDMI_SPD_INFOFRAME_SIZE 25 |
| 57 | #define HDMI_AUDIO_INFOFRAME_SIZE 10 | 58 | #define HDMI_AUDIO_INFOFRAME_SIZE 10 |
| 59 | #define HDMI_DRM_INFOFRAME_SIZE 26 | ||
| 58 | 60 | ||
| 59 | #define HDMI_INFOFRAME_SIZE(type) \ | 61 | #define HDMI_INFOFRAME_SIZE(type) \ |
| 60 | (HDMI_INFOFRAME_HEADER_SIZE + HDMI_ ## type ## _INFOFRAME_SIZE) | 62 | (HDMI_INFOFRAME_HEADER_SIZE + HDMI_ ## type ## _INFOFRAME_SIZE) |
| @@ -185,12 +187,37 @@ struct hdmi_avi_infoframe { · 124 unmodified lines | |||
| 185 | unsigned short right_bar; | 187 | unsigned short right_bar; |
| 186 | }; | 188 | }; |
| 187 | 189 | ||
| 190 | /* DRM Infoframe as per CTA 861.G spec */ | ||
| 191 | struct hdmi_drm_infoframe { | ||
| 192 | enum hdmi_infoframe_type type; | ||
| 193 | unsigned char version; | ||
| 194 | unsigned char length; | ||
| 195 | enum hdmi_eotf eotf; | ||
| 196 | enum hdmi_metadata_type metadata_type; | ||
| 197 | struct { | ||
| 198 | u16 x, y; | ||
| 199 | } display_primaries[3]; | ||
| 200 | struct { | ||
| 201 | u16 x, y; | ||
| 202 | } white_point; | ||
| 203 | u16 max_display_mastering_luminance; | ||
| 204 | u16 min_display_mastering_luminance; | ||
| 205 | u16 max_cll; | ||
| 206 | u16 max_fall; | ||
| 207 | }; | ||
| 208 | |||
| 188 | int hdmi_avi_infoframe_init(struct hdmi_avi_infoframe *frame); | 209 | int hdmi_avi_infoframe_init(struct hdmi_avi_infoframe *frame); |
| 189 | ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, void *buffer, | 210 | ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, void *buffer, |
| 190 | size_t size); | 211 | size_t size); |
| 191 | ssize_t hdmi_avi_infoframe_pack_only(const struct hdmi_avi_infoframe *frame, | 212 | ssize_t hdmi_avi_infoframe_pack_only(const struct hdmi_avi_infoframe *frame, |
| 192 | void *buffer, size_t size); | 213 | void *buffer, size_t size); |
| 193 | int hdmi_avi_infoframe_check(struct hdmi_avi_infoframe *frame); | 214 | int hdmi_avi_infoframe_check(struct hdmi_avi_infoframe *frame); |
| 215 | int hdmi_drm_infoframe_init(struct hdmi_drm_infoframe *frame); | ||
| 216 | ssize_t hdmi_drm_infoframe_pack(struct hdmi_drm_infoframe *frame, void *buffer, | ||
| 217 | size_t size); | ||
| 218 | ssize_t hdmi_drm_infoframe_pack_only(const struct hdmi_drm_infoframe *frame, | ||
| 219 | void *buffer, size_t size); | ||
| 220 | int hdmi_drm_infoframe_check(struct hdmi_drm_infoframe *frame); | ||
| 194 | 221 | ||
| 195 | enum hdmi_spd_sdi { | 222 | enum hdmi_spd_sdi { |
| 196 | HDMI_SPD_SDI_UNKNOWN, | 223 | HDMI_SPD_SDI_UNKNOWN, |
| @@ -381,6 +408,7 @@ union hdmi_infoframe { · 184 unmodified lines | |||
| 381 | struct hdmi_spd_infoframe spd; | 408 | struct hdmi_spd_infoframe spd; |
| 382 | union hdmi_vendor_any_infoframe vendor; | 409 | union hdmi_vendor_any_infoframe vendor; |
| 383 | struct hdmi_audio_infoframe audio; | 410 | struct hdmi_audio_infoframe audio; |
| 411 | struct hdmi_drm_infoframe drm; | ||
| 384 | }; | 412 | }; |
| 385 | 413 | ||
| 386 | ssize_t hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, | 414 | ssize_t hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, |