aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2013-10-16 10:06:17 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-10-18 10:00:06 -0400
commit6da7f10d296f4ac625f96b39eef22c41398727e3 (patch)
tree977f91d3d7e848b9900c36a47691cb330d9eb892
parent3c9d87e3acb6d2e5a3c3f42ab42f206cbac13807 (diff)
drm/i915/dp: don't mention eDP bpp clamping if it doesn't affect bpp
This is useful with the follow-up patch that frobs dev_priv->vbt.edp_bpp, and the value no longer comes directly from VBT. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 7ee9210e6133..cea8624a0c1a 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -822,10 +822,11 @@ intel_dp_compute_config(struct intel_encoder *encoder,
822 /* Walk through all bpp values. Luckily they're all nicely spaced with 2 822 /* Walk through all bpp values. Luckily they're all nicely spaced with 2
823 * bpc in between. */ 823 * bpc in between. */
824 bpp = pipe_config->pipe_bpp; 824 bpp = pipe_config->pipe_bpp;
825 if (is_edp(intel_dp) && dev_priv->vbt.edp_bpp) { 825 if (is_edp(intel_dp) && dev_priv->vbt.edp_bpp &&
826 dev_priv->vbt.edp_bpp < bpp) {
826 DRM_DEBUG_KMS("clamping bpp for eDP panel to BIOS-provided %i\n", 827 DRM_DEBUG_KMS("clamping bpp for eDP panel to BIOS-provided %i\n",
827 dev_priv->vbt.edp_bpp); 828 dev_priv->vbt.edp_bpp);
828 bpp = min_t(int, bpp, dev_priv->vbt.edp_bpp); 829 bpp = dev_priv->vbt.edp_bpp;
829 } 830 }
830 831
831 for (; bpp >= 6*3; bpp -= 2*3) { 832 for (; bpp >= 6*3; bpp -= 2*3) {