From patchwork Thu Oct 10 04:17:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1174279 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46pd9d6BvRz9sPc; Thu, 10 Oct 2019 15:18:13 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iIPty-0007EY-4P; Thu, 10 Oct 2019 04:18:10 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iIPtw-0007E3-66 for kernel-team@lists.ubuntu.com; Thu, 10 Oct 2019 04:18:08 +0000 Received: from [222.130.143.150] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iIPtv-00012R-Et for kernel-team@lists.ubuntu.com; Thu, 10 Oct 2019 04:18:08 +0000 From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][OEM-B-OSP1][PATCH RESEND 1/1] Revert "UBUNTU: SAUCE: i915: set disable_power_well=0 for icl temporarily" Date: Thu, 10 Oct 2019 12:17:46 +0800 Message-Id: <20191010041746.9396-2-hui.wang@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191010041746.9396-1-hui.wang@canonical.com> References: <20191010041746.9396-1-hui.wang@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1839950 This reverts commit 63361ff9a85dca6bb493638e1fffcff38b755702. After applying the fix of #1847192, we can't reproduce the hdmi audio issue anymore on the icl laptop even without disable_power_well=0, and disable_power_well=0 will prevent the CPU from entering PC10 power state, let us revert this patch. Signed-off-by: Hui Wang Acked-by: Connor Kuehl --- drivers/gpu/drm/i915/intel_runtime_pm.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index cbe3ac3003c2..a4cd90251491 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -3037,11 +3037,6 @@ static int sanitize_disable_power_well_option(const struct drm_i915_private *dev_priv, int disable_power_well) { - struct pci_dev *pdev = dev_priv->drm.pdev; - /* icl hdmi audio needs to set disable_power_well=0 temporarily, will remove it later */ - if ((pdev->device == 0x8a56) || (pdev->device == 0x8a52)) - return 0; - if (disable_power_well >= 0) return !!disable_power_well;