From patchwork Sun Mar 2 00:05:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrik Jakobsson X-Patchwork-Id: 3748601 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EB0969F381 for ; Sun, 2 Mar 2014 00:05:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E5F6D20395 for ; Sun, 2 Mar 2014 00:05:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4ABA2202EC for ; Sun, 2 Mar 2014 00:05:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 89D68FABAE; Sat, 1 Mar 2014 16:05:24 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-la0-f47.google.com (mail-la0-f47.google.com [209.85.215.47]) by gabe.freedesktop.org (Postfix) with ESMTP id 8CC7CFABAE for ; Sat, 1 Mar 2014 16:05:22 -0800 (PST) Received: by mail-la0-f47.google.com with SMTP id y1so3659268lam.6 for ; Sat, 01 Mar 2014 16:05:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=PNTvVtutwTxQldquTP/aYTU5/X0Dy+20ebgGMPczuRM=; b=MNczMkC//dBaV3r8VNPnQHeGY339MpZD3yLba5NvCgd8sXGy58f4DRsZQvHVA5cf5k Xd1fdi7frsVihcrcnbokr39nRSr+LdVXT0SCcfE1/7CPKuTLtr0UTJGvReypxOoKnGmU XZN1N3e4p/0S+w+kvSrlR4kzjfV/1NyfpX/zE8yhxN/LyDyl8uad53h+GE9Mxfk4eY/C Rtyz/E+cGxx3aF74WENK1Ptj86MFaY1qAHJZE4wb7usTkdmDrNOc0WW3/5QPeD760vyo wnXMhdqW7AsOAPRr5J7lp8Zea8pE1QAAxROrsU6gspUDPa/IPhMB3IWf+Xhbk6uHlowH 2T9g== X-Received: by 10.112.118.20 with SMTP id ki20mr5450627lbb.45.1393718720422; Sat, 01 Mar 2014 16:05:20 -0800 (PST) Received: from patrik-air.lan (h138n8-oer-a32.ias.bredband.telia.com. [2.248.103.138]) by mx.google.com with ESMTPSA id h7sm9937293lbj.1.2014.03.01.16.05.20 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 01 Mar 2014 16:05:20 -0800 (PST) From: Patrik Jakobsson To: intel-gfx@lists.freedesktop.org Date: Sun, 2 Mar 2014 01:05:06 +0100 Message-Id: <1393718706-13853-1-git-send-email-patrik.r.jakobsson@gmail.com> X-Mailer: git-send-email 1.8.3.2 Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH] drm/i915: Don't just say it, actually force edp vdd X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 This solves the blank screen problem on the MacBook Air 6,2. The comments state that we need to force edp vdd so lets put it back. The EDP_FORCE_VDD bit was removed in commit: commit dff392dbd258381a6c3164f38420593f2d291e3b drm/i915: don't touch the VDD when disabling the panel Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74628 Cc: Paulo Zanoni Cc: Chris Wilson Signed-off-by: Patrik Jakobsson --- drivers/gpu/drm/i915/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 57552eb..44de6f7 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1252,7 +1252,7 @@ void ironlake_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_BLC_ENABLE); + pp &= ~(POWER_TARGET_ON | EDP_FORCE_VDD | PANEL_POWER_RESET | EDP_BLC_ENABLE); pp_ctrl_reg = _pp_ctrl_reg(intel_dp);