#define VIDEO_BLOCK     0x02
 #define VENDOR_BLOCK    0x03
 #define SPEAKER_BLOCK  0x04
+#define HDR_STATIC_METADATA_BLOCK      0x6
 #define USE_EXTENDED_TAG 0x07
 #define EXT_VIDEO_CAPABILITY_BLOCK 0x00
 #define EXT_VIDEO_DATA_BLOCK_420       0x0E
        mode->clock = clock;
 }
 
+static bool cea_db_is_hdmi_hdr_metadata_block(const u8 *db)
+{
+       if (cea_db_tag(db) != USE_EXTENDED_TAG)
+               return false;
+
+       if (db[1] != HDR_STATIC_METADATA_BLOCK)
+               return false;
+
+       if (cea_db_payload_len(db) < 3)
+               return false;
+
+       return true;
+}
+
+static uint8_t eotf_supported(const u8 *edid_ext)
+{
+       return edid_ext[2] &
+               (BIT(HDMI_EOTF_TRADITIONAL_GAMMA_SDR) |
+                BIT(HDMI_EOTF_TRADITIONAL_GAMMA_HDR) |
+                BIT(HDMI_EOTF_SMPTE_ST2084));
+}
+
+static uint8_t hdr_metadata_type(const u8 *edid_ext)
+{
+       return edid_ext[3] &
+               BIT(HDMI_STATIC_METADATA_TYPE1);
+}
+
+static void
+drm_parse_hdr_metadata_block(struct drm_connector *connector, const u8 *db)
+{
+       u16 len;
+
+       len = cea_db_payload_len(db);
+
+       connector->hdr_sink_metadata.hdmi_type1.eotf =
+                                               eotf_supported(db);
+       connector->hdr_sink_metadata.hdmi_type1.metadata_type =
+                                               hdr_metadata_type(db);
+
+       if (len >= 4)
+               connector->hdr_sink_metadata.hdmi_type1.max_cll = db[4];
+       if (len >= 5)
+               connector->hdr_sink_metadata.hdmi_type1.max_fall = db[5];
+       if (len >= 6)
+               connector->hdr_sink_metadata.hdmi_type1.min_cll = db[6];
+}
+
 static void
 drm_parse_hdmi_vsdb_audio(struct drm_connector *connector, const u8 *db)
 {
                        drm_parse_y420cmdb_bitmap(connector, db);
                if (cea_db_is_vcdb(db))
                        drm_parse_vcdb(connector, db);
+               if (cea_db_is_hdmi_hdr_metadata_block(db))
+                       drm_parse_hdr_metadata_block(connector, db);
        }
 }