---

yaml --- r: 260188 b: refs/heads/master c: b562674 h: refs/heads/master v: v3
git-mirror · Jul 7, 2011 · 9f1e2d6 · 9f1e2d6
1 parent 2302778
commit 9f1e2d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46e484566fe4dc8a34e0ccc154e2f8b939b9ec96
+refs/heads/master: b5626747eca6d02124544d1d69049220f1c01fb1
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -7061,6 +7061,11 @@ int intel_framebuffer_init(struct drm_device *dev,
 	switch (mode_cmd->bpp) {
 	case 8:
 	case 16:
+		/* Only pre-ILK can handle 5:5:5 */
+		if (mode_cmd->depth == 15 && !HAS_PCH_SPLIT(dev))
+			return -EINVAL;
+		break;
+
 	case 24:
 	case 32:
 		break;