From patchwork Wed Jul 16 21:49:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Taylor, Clinton A" X-Patchwork-Id: 4571671 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1C938C0515 for ; Wed, 16 Jul 2014 21:51:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50551201FA for ; Wed, 16 Jul 2014 21:51:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id AF217201B9 for ; Wed, 16 Jul 2014 21:50:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3820889E46; Wed, 16 Jul 2014 14:50:59 -0700 (PDT) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id A157289E43 for ; Wed, 16 Jul 2014 14:50:57 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 16 Jul 2014 14:50:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,673,1400050800"; d="scan'208";a="574315305" Received: from cataylo2-ubuntu64-12.jf.intel.com ([10.7.200.177]) by orsmga002.jf.intel.com with ESMTP; 16 Jul 2014 14:50:56 -0700 From: clinton.a.taylor@intel.com To: Intel-gfx@lists.freedesktop.org Date: Wed, 16 Jul 2014 14:49:38 -0700 Message-Id: <1405547387-14051-3-git-send-email-clinton.a.taylor@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1405547387-14051-1-git-send-email-clinton.a.taylor@intel.com> References: <1405547387-14051-1-git-send-email-clinton.a.taylor@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 02/11] CHROMIUM: drm/i915: do not explicitly disable backlight in panel_off X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jesse Barnes Per eDP spec, we must disable the backlight in order to power down the panel. However, in our code, we have always disabled the backlight before we try to turn off the panel. The assertions from the previous patch make sure this is the case. Signed-off-by: Jesse Barnes Signed-off-by: Wayne Boyer Change-Id: I68ae4ee80cee40aa4745697ce7acf3883ffb721d Reviewed-on: https://chromium-review.googlesource.com/194250 Reviewed-by: Stéphane Marchesin Reviewed-by: Aaron Durbin Tested-by: Wayne Boyer Commit-Queue: Wayne Boyer Conflicts: drivers/gpu/drm/i915/intel_dp.c --- drivers/gpu/drm/i915/intel_dp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 90b24f6..9242499 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1371,8 +1371,7 @@ void intel_edp_panel_off(struct intel_dp *intel_dp) pp = ironlake_get_pp_control(intel_dp); /* We need to switch off panel power _and_ force vdd, for otherwise some * panels get very unhappy and cease to work. */ - pp &= ~(POWER_TARGET_ON | PANEL_POWER_RESET | EDP_FORCE_VDD | - EDP_BLC_ENABLE); + pp &= ~(POWER_TARGET_ON | EDP_FORCE_VDD | PANEL_POWER_RESET); pp_ctrl_reg = _pp_ctrl_reg(intel_dp);