From patchwork Thu Nov 14 22:38:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 3185751 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 407A0C045B for ; Thu, 14 Nov 2013 22:39:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 61BE920295 for ; Thu, 14 Nov 2013 22:39:03 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7A28E2024F for ; Thu, 14 Nov 2013 22:39:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A3D7610591D; Thu, 14 Nov 2013 14:39:00 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f46.google.com (mail-yh0-f46.google.com [209.85.213.46]) by gabe.freedesktop.org (Postfix) with ESMTP id A9CFE10591D for ; Thu, 14 Nov 2013 14:38:58 -0800 (PST) Received: by mail-yh0-f46.google.com with SMTP id c41so1405489yho.19 for ; Thu, 14 Nov 2013 14:38:58 -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=9niyRqvkVd/9KrO+a3MX+Lh8PYedwcu1XJh7GXisekE=; b=m01Q7BlcGR3ttMTth0dt1JsXwf8DdiTkC/07225wYMP6rY0C1y7g/u9qOSUxElergX Q52YhXLgFG7oAQAEnC2Ad3+gXjYI0/IG6PV2zkNyv6f1I+S6VqEsC+8tqHwFuyzkZKhu ndLT7QI39R8ebrXz4y6Gfi2P+DeCN/UZ0Iq6vpVwj1xt8FG73y8JhF8z8saGRM554jQ0 vADI54cuOH00XfJ/DHLLibAH9hL0evpzOzLLzdtRVG/hME0hQhlXyvhBVNY5ObV7dUbV F3/gnYB8NHXe8glEnjpokoD/pAkQVQEAFQLwkV7wZime8iDi+WcI4Q1hnE17EoXvV9ZV 74xg== X-Received: by 10.236.26.137 with SMTP id c9mr2857997yha.97.1384468737937; Thu, 14 Nov 2013 14:38:57 -0800 (PST) Received: from localhost.localdomain ([177.157.0.103]) by mx.google.com with ESMTPSA id s21sm80507yhk.9.2013.11.14.14.38.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Nov 2013 14:38:57 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Thu, 14 Nov 2013 20:38:29 -0200 Message-Id: <1384468709-1744-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.8.3.1 Cc: stable@vger.kernel.org, Paulo Zanoni Subject: [Intel-gfx] [PATCH] drm/i915: use the correct force_wake function at the PC8 code 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 From: Paulo Zanoni When I submitted the first patch adding these force wake functions, Chris Wilson observed that I was using the wrong functions, so I sent a second version of the patch to correct this problem. The problem is that v1 was merged instead of v2. I was able to notice the problem when running the debugfs-forcewake-user subtest of pm_pc8 from intel-gpu-tools. Cc: stable@vger.kernel.org Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) See here: http://lists.freedesktop.org/archives/intel-gfx/2013-August/031934.html http://lists.freedesktop.org/archives/intel-gfx/2013-August/031943.html http://lists.freedesktop.org/archives/intel-gfx/2013-August/031950.html diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3b7f1c4..d13f349 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6578,7 +6578,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) /* Make sure we're not on PC8 state before disabling PC8, otherwise * we'll hang the machine! */ - dev_priv->uncore.funcs.force_wake_get(dev_priv); + gen6_gt_force_wake_get(dev_priv); if (val & LCPLL_POWER_DOWN_ALLOW) { val &= ~LCPLL_POWER_DOWN_ALLOW; @@ -6612,7 +6612,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) DRM_ERROR("Switching back to LCPLL failed\n"); } - dev_priv->uncore.funcs.force_wake_put(dev_priv); + gen6_gt_force_wake_put(dev_priv); } void hsw_enable_pc8_work(struct work_struct *__work)