[PATCH 1/3] drm/edid: Be stricter about stereo mode rejection

[Adam Jackson]

Either bit 5 or 6 of that byte may be set in a stereo mode.

E-EDID v1.4, Table 3.22

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 drivers/gpu/drm/drm_edid.c |    5 +++--
 include/drm/drm_edid.h     |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index eb92fe2..e7547e3 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -883,10 +883,11 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
 	if (hactive < 64 || vactive < 64)
 		return NULL;
 
-	if (pt->misc & DRM_EDID_PT_STEREO) {
-		printk(KERN_WARNING "stereo mode not supported\n");
+	if (pt->misc & DRM_EDID_PT_STEREO_MASK) {
+		DRM_DEBUG_KMS(KERN_WARNING "stereo modes not supported\n");
 		return NULL;
 	}
+
 	if (!(pt->misc & DRM_EDID_PT_SEPARATE_SYNC)) {
 		printk(KERN_WARNING "composite sync not supported\n");
 	}
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 0cac551..6350ea0 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -56,7 +56,7 @@ struct std_timing {
 #define DRM_EDID_PT_HSYNC_POSITIVE (1 << 1)
 #define DRM_EDID_PT_VSYNC_POSITIVE (1 << 2)
 #define DRM_EDID_PT_SEPARATE_SYNC  (3 << 3)
-#define DRM_EDID_PT_STEREO         (1 << 5)
+#define DRM_EDID_PT_STEREO_MASK    (3 << 5)
 #define DRM_EDID_PT_INTERLACED     (1 << 7)
 
 /* If detailed data is pixel timing */
-- 
1.7.7.6