1 files changed, 67 insertions, 36 deletions

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 3e927ce7557d..ece03fc2d386 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -508,25 +508,10 @@ static void
 cea_for_each_detailed_block(u8 *ext, detailed_cb *cb, void *closure)
 {
         int i, n = 0;
-        u8 rev = ext[0x01], d = ext[0x02];
+        u8 d = ext[0x02];
         u8 *det_base = ext + d;
 
-        switch (rev) {
-        case 0:
-                /* can't happen */
-                return;
-        case 1:
-                /* have to infer how many blocks we have, check pixel clock */
-                for (i = 0; i < 6; i++)
-                        if (det_base[18*i] || det_base[18*i+1])
-                                n++;
-                break;
-        default:
-                /* explicit count */
-                n = min(ext[0x03] & 0x0f, 6);
-                break;
-        }
-
+        n = (127 - d) / 18;
         for (i = 0; i < n; i++)
                 cb((struct detailed_timing *)(det_base + 18 * i), closure);
 }
@@ -1319,6 +1304,7 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,
 
 #define HDMI_IDENTIFIER 0x000C03
 #define AUDIO_BLOCK     0x01
+#define VIDEO_BLOCK     0x02
 #define VENDOR_BLOCK    0x03
 #define SPEAKER_BLOCK   0x04
 #define EDID_BASIC_AUDIO        (1 << 6)
@@ -1349,6 +1335,47 @@ u8 *drm_find_cea_extension(struct edid *edid)
 }
 EXPORT_SYMBOL(drm_find_cea_extension);
 
+static int
+do_cea_modes (struct drm_connector *connector, u8 *db, u8 len)
+{
+        struct drm_device *dev = connector->dev;
+        u8 * mode, cea_mode;
+        int modes = 0;
+
+        for (mode = db; mode < db + len; mode++) {
+                cea_mode = (*mode & 127) - 1; /* CEA modes are numbered 1..127 */
+                if (cea_mode < drm_num_cea_modes) {
+                        struct drm_display_mode *newmode;
+                        newmode = drm_mode_duplicate(dev,
+                                                     &edid_cea_modes[cea_mode]);
+                        if (newmode) {
+                                drm_mode_probed_add(connector, newmode);
+                                modes++;
+                        }
+                }
+        }
+
+        return modes;
+}
+
+static int
+add_cea_modes(struct drm_connector *connector, struct edid *edid)
+{
+        u8 * cea = drm_find_cea_extension(edid);
+        u8 * db, dbl;
+        int modes = 0;
+
+        if (cea && cea[1] >= 3) {
+                for (db = cea + 4; db < cea + cea[2]; db += dbl + 1) {
+                        dbl = db[0] & 0x1f;
+                        if (((db[0] & 0xe0) >> 5) == VIDEO_BLOCK)
+                                modes += do_cea_modes (connector, db+1, dbl);
+                }
+        }
+
+        return modes;
+}
+
 static void
 parse_hdmi_vsdb(struct drm_connector *connector, uint8_t *db)
 {
@@ -1432,26 +1459,29 @@ void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid)
         eld[18] = edid->prod_code[0];
         eld[19] = edid->prod_code[1];
 
-        for (db = cea + 4; db < cea + cea[2]; db += dbl + 1) {
-                dbl = db[0] & 0x1f;
-
-                switch ((db[0] & 0xe0) >> 5) {
-                case AUDIO_BLOCK:       /* Audio Data Block, contains SADs */
-                        sad_count = dbl / 3;
-                        memcpy(eld + 20 + mnl, &db[1], dbl);
-                        break;
-                case SPEAKER_BLOCK:     /* Speaker Allocation Data Block */
-                        eld[7] = db[1];
-                        break;
-                case VENDOR_BLOCK:
-                        /* HDMI Vendor-Specific Data Block */
-                        if (db[1] == 0x03 && db[2] == 0x0c && db[3] == 0)
-                                parse_hdmi_vsdb(connector, db);
-                        break;
-                default:
-                        break;
+        if (cea[1] >= 3)
+                for (db = cea + 4; db < cea + cea[2]; db += dbl + 1) {
+                        dbl = db[0] & 0x1f;
+                        
+                        switch ((db[0] & 0xe0) >> 5) {
+                        case AUDIO_BLOCK:
+                                /* Audio Data Block, contains SADs */
+                                sad_count = dbl / 3;
+                                memcpy(eld + 20 + mnl, &db[1], dbl);
+                                break;
+                        case SPEAKER_BLOCK:
+                                /* Speaker Allocation Data Block */
+                                eld[7] = db[1];
+                                break;
+                        case VENDOR_BLOCK:
+                                /* HDMI Vendor-Specific Data Block */
+                                if (db[1] == 0x03 && db[2] == 0x0c && db[3] == 0)
+                                        parse_hdmi_vsdb(connector, db);
+                                break;
+                        default:
+                                break;
+                        }
                 }
-        }
         eld[5] |= sad_count << 4;
         eld[2] = (20 + mnl + sad_count * 3 + 3) / 4;
 
@@ -1722,6 +1752,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
         num_modes += add_standard_modes(connector, edid);
         num_modes += add_established_modes(connector, edid);
         num_modes += add_inferred_modes(connector, edid);
+        num_modes += add_cea_modes(connector, edid);
 
         if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))
                 edid_fixup_preferred(connector, quirks);