| From 20f582a1a0d9696587528f41fcb1822e81d11b54 Mon Sep 17 00:00:00 2001 |
| From: Imre Deak <imre.deak@intel.com> |
| Date: Thu, 18 Jul 2013 17:44:13 +0300 |
| Subject: drm/i915: restore debug message lost in merge resolution |
| |
| Restore debug message lost in merge commit e1b73cba13. Also clarify it |
| that we are only clamping bpp not overwriting it. |
| |
| Signed-off-by: Imre Deak <imre.deak@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 7984211ee8e1fa03cd4bc9ef3d347f94f8a2c8a8) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_dp.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c |
| index 55f3c970a766..db9cb317f5ce 100644 |
| --- a/drivers/gpu/drm/i915/intel_dp.c |
| +++ b/drivers/gpu/drm/i915/intel_dp.c |
| @@ -729,8 +729,11 @@ intel_dp_compute_config(struct intel_encoder *encoder, |
| /* Walk through all bpp values. Luckily they're all nicely spaced with 2 |
| * bpc in between. */ |
| bpp = pipe_config->pipe_bpp; |
| - if (is_edp(intel_dp) && dev_priv->vbt.edp_bpp) |
| + if (is_edp(intel_dp) && dev_priv->vbt.edp_bpp) { |
| + DRM_DEBUG_KMS("clamping bpp for eDP panel to BIOS-provided %i\n", |
| + dev_priv->vbt.edp_bpp); |
| bpp = min_t(int, bpp, dev_priv->vbt.edp_bpp); |
| + } |
| |
| for (; bpp >= 6*3; bpp -= 2*3) { |
| mode_rate = intel_dp_link_required(adjusted_mode->clock, bpp); |
| -- |
| 1.8.5.rc3 |
| |
