From c6145b4591cf5bf9fccbdcb7f0afbf8f7e0a89cc Mon Sep 17 00:00:00 2001
From: Christian Schmidt <schmidt@digadd.de>
Date: Mon, 19 Dec 2011 20:03:43 +0100
Subject: [PATCH] --- yaml --- r: 282499 b: refs/heads/master c:
 4966b2a9351500cf36f424dfe7a683036fce5622 h: refs/heads/master i:   282497:
 6fbd7c3539901bac3e3af0ea7316c511ca62a473   282495:
 d5d2e7af1eb8e428b6b1f2d463bff33135eff116 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/gpu/drm/drm_edid.c | 19 ++-----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index f4c699bd37f1..5064a9f595d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0ab734d62ef4c35ffa5e39f9ec1e6d6284f05fa
+refs/heads/master: 4966b2a9351500cf36f424dfe7a683036fce5622
diff --git a/trunk/drivers/gpu/drm/drm_edid.c b/trunk/drivers/gpu/drm/drm_edid.c
index 478b122ad1ba..ece03fc2d386 100644
--- a/trunk/drivers/gpu/drm/drm_edid.c
+++ b/trunk/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);
 }