---

yaml --- r: 282499 b: refs/heads/master c: 4966b2a h: refs/heads/master i: 282497: 6fbd7c3 282495: d5d2e7a v: v3
git-mirror · Dec 20, 2011 · c6145b4 · c6145b4
1 parent 3ad91f3
commit c6145b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git 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
@@ -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);
 }