From patchwork Thu Oct 25 15:11:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hooker X-Patchwork-Id: 194209 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id DA5122C0091 for ; Fri, 26 Oct 2012 02:12:03 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TRP6C-0003nh-4q; Thu, 25 Oct 2012 15:11:56 +0000 Received: from mail-vc0-f177.google.com ([209.85.220.177]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TRP5m-0003cT-8W for kernel-team@lists.ubuntu.com; Thu, 25 Oct 2012 15:11:30 +0000 Received: by mail-vc0-f177.google.com with SMTP id p16so2285750vcq.8 for ; Thu, 25 Oct 2012 08:11:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=VnB5TyIdKbSZEDJiCsI79Ju0AS04IrVwMjAUujCzmNc=; b=ookSWRFAKtMAM7ipjs9QUrBCrm30r44AxVbSbWOxr5Xp3lRI/fyLHPr0mDp5K5ZyUw CtAS5aPnvxYyROT0UqEQidxYlIc6mBtTj+edxUsk4WMF8K79xfMemEB8Q7jNMzWiaK9m mcmREmp2RWghBxzIlRXHxPkRPwYbtolR5q8hqOB3oLO4Om5GeEnRSbHqqEnh1fh0G+PE tR56ux75k8ZtHB2REAYgrC6McbTH0/gNPsjaxYPo7KfXTqiO2yYjBbw1pXumiRBX7D/K DSGfKv+C4CIjbSu5BXOJ4beTKKZpBTDnVVaCM/fa+jWA/rjaM6sIM97CDQqUw7hYMN07 /N+A== Received: by 10.52.98.196 with SMTP id ek4mr26826587vdb.38.1351177889599; Thu, 25 Oct 2012 08:11:29 -0700 (PDT) Received: from localhost.localdomain (c-68-34-39-96.hsd1.va.comcast.net. [68.34.39.96]) by mx.google.com with ESMTPS id w17sm19106028vdf.16.2012.10.25.08.11.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 08:11:28 -0700 (PDT) From: Robert Hooker To: kernel-team@lists.ubuntu.com Subject: [PATCH quantal] Revert "drm/i915: ignore eDP bpc settings from vbt" Date: Thu, 25 Oct 2012 11:11:25 -0400 Message-Id: <1351177885-24442-1-git-send-email-sarvatt@ubuntu.com> X-Mailer: git-send-email 1.7.10.4 Cc: Robert Hooker X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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) {