From patchwork Wed May 21 19:23:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 4218521 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 158F2BEEAB for ; Wed, 21 May 2014 19:23:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 555C120379 for ; Wed, 21 May 2014 19:23:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5E43C20166 for ; Wed, 21 May 2014 19:23:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E5126E0BE; Wed, 21 May 2014 12:23:42 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yk0-f172.google.com (mail-yk0-f172.google.com [209.85.160.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 4DE876E0BE for ; Wed, 21 May 2014 12:23:41 -0700 (PDT) Received: by mail-yk0-f172.google.com with SMTP id 79so1972834ykr.17 for ; Wed, 21 May 2014 12:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=O44U7gtiK4KcZ/6FfzL73yZ16Ff1P7PggEdvW25YxsY=; b=RvmzUUvtwlSZ374X254S0lV4soDzw4/etwnWdJ4v3h8ocgZmgHK9h59v2Y2wgGK38y mYhKvcB19g3BaHZuI9xVIr19E76F1ZLzSm1ksJUrex/3atIE2axdJQUXwyXUpCt+Dycl 8O80JezsrMQlRsw2bMDV5iUtk26B1f1VePclEWoDU92C7U5KH/R3ERV/zGTxW7Rmc5u3 vamqYo6mGS0nZ2qpi/ZIKMi6CKn5uFP6hXDdR4ZdadoGiEaCL45R7jx4SbkA2JMClXZ2 reNYzfbYaR6bteBZO04uG1fD4P/uhcGPELDcXsupKd7Jhw9gjDA+D5Z3oZEK4Mm59DBz YXaA== X-Received: by 10.236.123.49 with SMTP id u37mr78677998yhh.34.1400700220696; Wed, 21 May 2014 12:23:40 -0700 (PDT) Received: from localhost.localdomain (189.58.9.124.dynamic.adsl.gvt.net.br. [189.58.9.124]) by mx.google.com with ESMTPSA id m50sm4959518yha.8.2014.05.21.12.23.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 May 2014 12:23:40 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Wed, 21 May 2014 16:23:20 -0300 Message-Id: <1400700202-2905-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.9.0 Cc: Daniel Vetter , Paulo Zanoni Subject: [Intel-gfx] [PATCH 1/3] drm/i915: don't read HSW_AUD_PIN_ELD_CP_VLD when the power well is 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: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.7 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 From: Paulo Zanoni Because this will trigger "Unclaimed register" messages. All I need to reproduce this problem is to boot my HSW machine with eDP+HDMI connected. Regression introduced by: commit 9ed109a7b445e3f073d8ea72f888ec80c0532465 Author: Daniel Vetter Date: Thu Apr 24 23:54:52 2014 +0200 drm/i915: Track has_audio in the pipe config Cc: Daniel Vetter Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_ddi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 271ce19..355f569 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1560,9 +1560,11 @@ void intel_ddi_get_config(struct intel_encoder *encoder, break; } - temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD); - if (temp & (AUDIO_OUTPUT_ENABLE_A << (intel_crtc->pipe * 4))) - pipe_config->has_audio = true; + if (intel_display_power_enabled(dev_priv, POWER_DOMAIN_AUDIO)) { + temp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD); + if (temp & (AUDIO_OUTPUT_ENABLE_A << (intel_crtc->pipe * 4))) + pipe_config->has_audio = true; + } if (encoder->type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp_bpp && pipe_config->pipe_bpp > dev_priv->vbt.edp_bpp) {