Try to find and parse more CEA ext blocks if edid->extensions
is greater than one.

v2: split prvious patch to two. And do CEA block parsing
    in this one.
v3: simplify this patch based on previous change.
v4: refine patch v3.

Cc: Jani Nikula <jani.nik...@linux.intel.com>
Cc: Ville Syrjala <ville.syrj...@linux.intel.com>
Cc: Ankit Nautiyal <ankit.k.nauti...@intel.com>
Cc: Drew Davenport <ddavenp...@chromium.org>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>
Signed-off-by: Lee Shawn C <shawn.c....@intel.com>
---
 drivers/gpu/drm/drm_edid.c | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 78c415aa6889..9fa84881fbba 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4320,16 +4320,22 @@ static void drm_parse_y420cmdb_bitmap(struct 
drm_connector *connector,
 static int
 add_cea_modes(struct drm_connector *connector, struct edid *edid)
 {
-       const u8 *cea, *db, *hdmi = NULL, *video = NULL;
-       u8 dbl, hdmi_len, video_len = 0;
        int modes = 0, cea_ext_index = 0, displayid_ext_index = 0;
 
-       cea = drm_find_cea_extension(edid, &cea_ext_index, 
&displayid_ext_index);
-       if (cea && cea_revision(cea) >= 3) {
+       for (;;) {
+               const u8 *cea, *db, *hdmi = NULL, *video = NULL;
+               u8 dbl, hdmi_len = 0, video_len = 0;
                int i, start, end;
 
+               cea = drm_find_cea_extension(edid, &cea_ext_index, 
&displayid_ext_index);
+               if (!cea)
+                       break;
+
+               if (cea_revision(cea) < 3)
+                       continue;
+
                if (cea_db_offsets(cea, &start, &end))
-                       return 0;
+                       continue;
 
                for_each_cea_db(cea, i, start, end) {
                        db = &cea[i];
@@ -4351,15 +4357,15 @@ add_cea_modes(struct drm_connector *connector, struct 
edid *edid)
                                                          dbl - 1);
                        }
                }
-       }
 
-       /*
-        * We parse the HDMI VSDB after having added the cea modes as we will
-        * be patching their flags when the sink supports stereo 3D.
-        */
-       if (hdmi)
-               modes += do_hdmi_vsdb_modes(connector, hdmi, hdmi_len, video,
-                                           video_len);
+               /*
+                * We parse the HDMI VSDB after having added the cea modes as 
we will
+                * be patching their flags when the sink supports stereo 3D.
+                */
+               if (hdmi)
+                       modes += do_hdmi_vsdb_modes(connector, hdmi, hdmi_len, 
video,
+                                                   video_len);
+       }
 
        return modes;
 }
-- 
2.17.1

Reply via email to