Merge https://source.denx.de/u-boot/custodians/u-boot-pmic

[J-u-boot.git] / common / edid.c

diff --git a/common/edid.c b/common/edid.c
index f99f42dc406743495b2317b270f05f7623a2f26b..556c4e3434b609711ae7f5e6e83f2fcd54b57633 100644 (file)
--- a/common/edid.c
+++ b/common/edid.c
@@ -13,6 +13,7 @@
 #include <edid.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <log.h>
 #include <linux/ctype.h>
 #include <linux/string.h>
 
@@ -138,7 +139,7 @@ static void decode_timing(u8 *buf, struct display_timing *timing)
 /**
  * Check if HDMI vendor specific data block is present in CEA block
  * @param info CEA extension block
- * @return true if block is found
+ * Return: true if block is found
  */
 static bool cea_is_hdmi_vsdb_present(struct edid_cea861_info *info)
 {
@@ -168,6 +169,29 @@ static bool cea_is_hdmi_vsdb_present(struct edid_cea861_info *info)
        return false;
 }
 
+static bool edid_find_valid_timing(void *buf, int count,
+                                  struct display_timing *timing,
+                                  bool (*mode_valid)(void *priv,
+                                       const struct display_timing *timing),
+                                  void *mode_valid_priv)
+{
+       struct edid_detailed_timing *t = buf;
+       bool found = false;
+       int i;
+
+       for (i = 0; i < count && !found; i++, t++)
+               if (EDID_DETAILED_TIMING_PIXEL_CLOCK(*t) != 0) {
+                       decode_timing((u8 *)t, timing);
+                       if (mode_valid)
+                               found = mode_valid(mode_valid_priv,
+                                                  timing);
+                       else
+                               found = true;
+               }
+
+       return found;
+}
+
 int edid_get_timing_validate(u8 *buf, int buf_size,
                             struct display_timing *timing,
                             int *panel_bits_per_colourp,
@@ -176,44 +200,47 @@ int edid_get_timing_validate(u8 *buf, int buf_size,
                             void *mode_valid_priv)
 {
        struct edid1_info *edid = (struct edid1_info *)buf;
-       bool timing_done;
-       int i;
+       bool found;
 
        if (buf_size < sizeof(*edid) || edid_check_info(edid)) {
                debug("%s: Invalid buffer\n", __func__);
                return -EINVAL;
        }
 
+       if (!EDID1_INFO_VIDEO_INPUT_DIGITAL(*edid)) {
+               debug("%s: Not a digital display\n", __func__);
+               return -ENOSYS;
+       }
+
        if (!EDID1_INFO_FEATURE_PREFERRED_TIMING_MODE(*edid)) {
                debug("%s: No preferred timing\n", __func__);
                return -ENOENT;
        }
 
-       /* Look for detailed timing */
-       timing_done = false;
-       for (i = 0; i < 4; i++) {
-               struct edid_monitor_descriptor *desc;
+       /* Look for detailed timing in base EDID */
+       found = edid_find_valid_timing(edid->monitor_details.descriptor, 4,
+                                      timing, mode_valid, mode_valid_priv);
 
-               desc = &edid->monitor_details.descriptor[i];
-               if (desc->zero_flag_1 != 0) {
-                       decode_timing((u8 *)desc, timing);
-                       if (mode_valid)
-                               timing_done = mode_valid(mode_valid_priv,
-                                                        timing);
-                       else
-                               timing_done = true;
+       /* Look for detailed timing in CTA-861 Extension Block */
+       if (!found && edid->extension_flag && buf_size >= EDID_EXT_SIZE) {
+               struct edid_cea861_info *info =
+                       (struct edid_cea861_info *)(buf + sizeof(*edid));
 
-                       if (timing_done)
-                               break;
+               if (info->extension_tag == EDID_CEA861_EXTENSION_TAG) {
+                       int count = EDID_CEA861_DTD_COUNT(*info);
+                       int offset = info->dtd_offset;
+                       int size = count * sizeof(struct edid_detailed_timing);
+
+                       if (offset >= 4 && offset + size < EDID_SIZE)
+                               found = edid_find_valid_timing(
+                                       (u8 *)info + offset, count, timing,
+                                       mode_valid, mode_valid_priv);
                }
        }
-       if (!timing_done)
+
+       if (!found)
                return -EINVAL;
 
-       if (!EDID1_INFO_VIDEO_INPUT_DIGITAL(*edid)) {
-               debug("%s: Not a digital display\n", __func__);
-               return -ENOSYS;
-       }
        if (edid->version != 1 || edid->revision < 4) {
                debug("%s: EDID version %d.%d does not have required info\n",
                      __func__, edid->version, edid->revision);
@@ -247,7 +274,7 @@ int edid_get_timing(u8 *buf, int buf_size, struct display_timing *timing,
  * Snip the tailing whitespace/return of a string.
  *
  * @param string       The string to be snipped
- * @return the snipped string
+ * Return: the snipped string
  */
 static char *snip(char *string)
 {