From patchwork Thu Oct 25 15:11:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [quantal] Revert "drm/i915: ignore eDP bpc settings from vbt" Date: Thu, 25 Oct 2012 05:11:25 -0000 From: Robert Hooker X-Patchwork-Id: 194209 Message-Id: <1351177885-24442-1-git-send-email-sarvatt@ubuntu.com> To: kernel-team@lists.ubuntu.com Cc: Robert Hooker From: Robert Hooker BugLink: http://bugs.launchpad.net/bugs/1070978 This commit breaks display bringup on a recent Lenovo eDP machine. This reverts commit 33fbdc047b30be3781d0b861adb6ef96fa052355. Signed-off-by: Robert Hooker --- drivers/gpu/drm/i915/intel_display.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index bc68a86..cf791d8 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3602,6 +3602,17 @@ static bool intel_choose_pipe_bpp_dither(struct drm_crtc *crtc, continue; } + 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; + } + /* Not one of the known troublemakers, check the EDID */ list_for_each_entry(connector, &dev->mode_config.connector_list, head) {