| From 2f4f649a69a9eb51f6e98130e19dd90a260a4145 Mon Sep 17 00:00:00 2001 |
| From: Jani Nikula <jani.nikula@intel.com> |
| Date: Mon, 12 Nov 2012 14:33:44 +0200 |
| Subject: drm/i915: do not ignore eDP bpc settings from vbt |
| |
| From: Jani Nikula <jani.nikula@intel.com> |
| |
| commit 2f4f649a69a9eb51f6e98130e19dd90a260a4145 upstream. |
| |
| There are laptops out there that need the eDP bpc from VBT. This is |
| effectively a revert of |
| |
| commit 4344b813f105a19f793f1fd93ad775b784648b95 |
| Author: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Date: Fri Aug 10 11:10:20 2012 +0200 |
| |
| drm/i915: ignore eDP bpc settings from vbt |
| |
| but putting the VBT check after the EDID check to see them both in dmesg if |
| this clamps more than the EDID. We have enough history with bpc clamping to |
| warrant the extra debug info. |
| |
| Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=47641 |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56401 |
| Signed-off-by: Jani Nikula <jani.nikula@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 11 +++++++++++ |
| 1 file changed, 11 insertions(+) |
| |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -3791,6 +3791,17 @@ static bool intel_choose_pipe_bpp_dither |
| } |
| } |
| |
| + 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.) |
