From patchwork Wed May 21 19:23:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 4218531 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 5F84DBEEAB for ; Wed, 21 May 2014 19:23:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7E1DF20379 for ; Wed, 21 May 2014 19:23:54 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9F8F320166 for ; Wed, 21 May 2014 19:23:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E6526EACF; Wed, 21 May 2014 12:23:53 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yk0-f180.google.com (mail-yk0-f180.google.com [209.85.160.180]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B0526EACF for ; Wed, 21 May 2014 12:23:52 -0700 (PDT) Received: by mail-yk0-f180.google.com with SMTP id q9so1961348ykb.25 for ; Wed, 21 May 2014 12:23:52 -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:in-reply-to:references; bh=GXQYaOsYZkauTSOeS3RsC6aDdO03Ejz/HboQwR5WG6Y=; b=PxQfVxguyvrBWBoht7eluMBFNC9vwVzW8q3rKjGvCZr2hN210H9Nf4oNTnCYWvfdI9 ngxeosIh7ZcOsuKaUzH/JVPkgt5CMknj4+ssQEVX7HtOwJ/HXsiTnaMhVIR1cwDtj0HR wfTI1V6gNIFQuXJWezytGFr6Kp8HHXCL9btxAExW2cctiATjvTMr0qcRX+BahSgGUxp9 hwadPS8SQEU2MyAHcEbXLjRMhIISwe6e8bzx2xFdmxXaZTOnEIv2sAjEpqxMMxJ+EsjP oeQknt2GaE/T8QojNTR1nfJybKjS5Eb7UIJUQwEoahss42M65Y0U5TvrccGfsoNDhLOo Yvrg== X-Received: by 10.236.108.176 with SMTP id q36mr77486288yhg.18.1400700232169; Wed, 21 May 2014 12:23:52 -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.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 May 2014 12:23:51 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Wed, 21 May 2014 16:23:21 -0300 Message-Id: <1400700202-2905-2-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1400700202-2905-1-git-send-email-przanoni@gmail.com> References: <1400700202-2905-1-git-send-email-przanoni@gmail.com> Cc: Daniel Vetter , Paulo Zanoni Subject: [Intel-gfx] [PATCH 2/3] drm/i915: don't read HSW_AUD_PIN_ELD_CP_VLD wehn the powe rwell is off (2) 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. This can be reproduced by running the pm_rpm tests of the test suite. It can probably be reproduced by any of the tests that do modesets too. Regression introduced by: commit acfa75b02e72bad7c93564ac379712e29c001432 Author: Daniel Vetter Date: Thu Apr 24 23:54:51 2014 +0200 drm/i915: Simplify audio handling on DDI ports Cc: Daniel Vetter Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_ddi.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 355f569..54a3bb7 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -1372,10 +1372,12 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder) struct drm_i915_private *dev_priv = dev->dev_private; uint32_t tmp; - tmp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD); - tmp &= ~((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << - (pipe * 4)); - I915_WRITE(HSW_AUD_PIN_ELD_CP_VLD, tmp); + if (intel_display_power_enabled(dev_priv, POWER_DOMAIN_AUDIO)) { + tmp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD); + tmp &= ~((AUDIO_OUTPUT_ENABLE_A | AUDIO_ELD_VALID_A) << + (pipe * 4)); + I915_WRITE(HSW_AUD_PIN_ELD_CP_VLD, tmp); + } if (type == INTEL_OUTPUT_EDP) { struct intel_dp *intel_dp = enc_to_intel_dp(encoder);