Commit 2f4f649a authored Nov 12, 2012 by Jani Nikula Committed by Daniel Vetter Nov 13, 2012

drm/i915: do not ignore eDP bpc settings from vbt

There are laptops out there that need the eDP bpc from VBT. This is
effectively a revert of

commit 4344b813
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>

parent d0ddfbd3

drivers/gpu/drm/i915/intel_display.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -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.)