1 files changed, 73 insertions, 21 deletions

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 2e678f1540ae..af62ba051501 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2739,7 +2739,7 @@ static int
 do_hdmi_vsdb_modes(struct drm_connector *connector, const u8 *db, u8 len,
                    const u8 *video_db, u8 video_len)
 {
-        int modes = 0, offset = 0, i, multi_present = 0;
+        int modes = 0, offset = 0, i, multi_present = 0, multi_len;
         u8 vic_len, hdmi_3d_len = 0;
         u16 mask;
         u16 structure_all;
@@ -2785,32 +2785,84 @@ do_hdmi_vsdb_modes(struct drm_connector *connector, const u8 *db, u8 len,
         }
         offset += 1 + vic_len;
 
-        if (!(multi_present == 1 || multi_present == 2))
-                goto out;
+        if (multi_present == 1)
+                multi_len = 2;
+        else if (multi_present == 2)
+                multi_len = 4;
+        else
+                multi_len = 0;
 
-        if ((multi_present == 1 && len < (9 + offset)) ||
-            (multi_present == 2 && len < (11 + offset)))
+        if (len < (8 + offset + hdmi_3d_len - 1))
                 goto out;
 
-        if ((multi_present == 1 && hdmi_3d_len < 2) ||
-            (multi_present == 2 && hdmi_3d_len < 4))
+        if (hdmi_3d_len < multi_len)
                 goto out;
 
-        /* 3D_Structure_ALL */
-        structure_all = (db[8 + offset] << 8) | db[9 + offset];
+        if (multi_present == 1 || multi_present == 2) {
+                /* 3D_Structure_ALL */
+                structure_all = (db[8 + offset] << 8) | db[9 + offset];
 
-        /* check if 3D_MASK is present */
-        if (multi_present == 2)
-                mask = (db[10 + offset] << 8) | db[11 + offset];
-        else
-                mask = 0xffff;
-
-        for (i = 0; i < 16; i++) {
-                if (mask & (1 << i))
-                        modes += add_3d_struct_modes(connector,
-                                                     structure_all,
-                                                     video_db,
-                                                     video_len, i);
+                /* check if 3D_MASK is present */
+                if (multi_present == 2)
+                        mask = (db[10 + offset] << 8) | db[11 + offset];
+                else
+                        mask = 0xffff;
+
+                for (i = 0; i < 16; i++) {
+                        if (mask & (1 << i))
+                                modes += add_3d_struct_modes(connector,
+                                                structure_all,
+                                                video_db,
+                                                video_len, i);
+                }
+        }
+
+        offset += multi_len;
+
+        for (i = 0; i < (hdmi_3d_len - multi_len); i++) {
+                int vic_index;
+                struct drm_display_mode *newmode = NULL;
+                unsigned int newflag = 0;
+                bool detail_present;
+
+                detail_present = ((db[8 + offset + i] & 0x0f) > 7);
+
+                if (detail_present && (i + 1 == hdmi_3d_len - multi_len))
+                        break;
+
+                /* 2D_VIC_order_X */
+                vic_index = db[8 + offset + i] >> 4;
+
+                /* 3D_Structure_X */
+                switch (db[8 + offset + i] & 0x0f) {
+                case 0:
+                        newflag = DRM_MODE_FLAG_3D_FRAME_PACKING;
+                        break;
+                case 6:
+                        newflag = DRM_MODE_FLAG_3D_TOP_AND_BOTTOM;
+                        break;
+                case 8:
+                        /* 3D_Detail_X */
+                        if ((db[9 + offset + i] >> 4) == 1)
+                                newflag = DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF;
+                        break;
+                }
+
+                if (newflag != 0) {
+                        newmode = drm_display_mode_from_vic_index(connector,
+                                                                  video_db,
+                                                                  video_len,
+                                                                  vic_index);
+
+                        if (newmode) {
+                                newmode->flags |= newflag;
+                                drm_mode_probed_add(connector, newmode);
+                                modes++;
+                        }
+                }
+
+                if (detail_present)
+                        i++;
         }
 
 out: