---

yaml --- r: 335679 b: refs/heads/master c: 2f4f649 h: refs/heads/master i: 335677: ec4e202 335675: 8ca93f8 335671: 90ce4a5 335663: 681964f 335647: f357351 335615: fc0bd36 v: v3
git-mirror · Nov 13, 2012 · ef8e4b1 · ef8e4b1
1 parent 9334e91
commit ef8e4b1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0ddfbd3d1346c1f481ec2289eef350cdba64b42
+refs/heads/master: 2f4f649a69a9eb51f6e98130e19dd90a260a4145
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -3841,6 +3841,17 @@ static bool intel_choose_pipe_bpp_dither(struct drm_crtc *crtc,
 			}
 		}
 
+		if (intel_encoder->type == INTEL_OUTPUT_EDP) {
+			/* Use VBT settings if we have an eDP panel */
+			unsigned int edp_bpc = dev_priv->edp.bpp / 3;
+
+			if (edp_bpc < display_bpc) {
+				DRM_DEBUG_KMS("clamping display bpc (was %d) to eDP (%d)\n", display_bpc, edp_bpc);
+				display_bpc = edp_bpc;
+			}
+			continue;
+		}
+
 		/*
 		 * HDMI is either 12 or 8, so if the display lets 10bpc sneak
 		 * through, clamp it down.  (Note: >12bpc will be caught below.)