From patchwork Wed Jan 29 20:20:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 3554441 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 4B00FC02DC for ; Wed, 29 Jan 2014 20:21:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 73BA720170 for ; Wed, 29 Jan 2014 20:21:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 89DA92015E for ; Wed, 29 Jan 2014 20:20:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 75855FA98C; Wed, 29 Jan 2014 12:20:58 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 89BC1FA98C for ; Wed, 29 Jan 2014 12:20:56 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 29 Jan 2014 12:20:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,743,1384329600"; d="scan'208";a="472841639" Received: from unknown (HELO ironside.amr.corp.intel.com) ([10.255.13.90]) by fmsmga002.fm.intel.com with ESMTP; 29 Jan 2014 12:20:55 -0800 From: Ben Widawsky To: Intel GFX Date: Wed, 29 Jan 2014 12:20:54 -0800 Message-Id: <1391026854-32150-1-git-send-email-benjamin.widawsky@intel.com> X-Mailer: git-send-email 1.8.5.3 Cc: Ben Widawsky , Ben Widawsky Subject: [Intel-gfx] [PATCH] [TRIVIAL] drm/i915: Fix HSW debugfs frequency print 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.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 We need to do the print after we've done the math. This was broken when we introduced VLV support. Personally, I think the interface should go away now that we support it in sysfs. Historically it has allowed users to do stupid things which we might not allow in the sysfs interface - so we can keep it I guess. commit 0a073b843bcd9a660f76e497182aac97cafddc4c Author: Jesse Barnes Date: Wed Apr 17 15:54:58 2013 -0700 drm/i915: turbo & RC6 support for VLV v7 Reported-by: Rao, Ram R Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index bc8707f..3487b71 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -3230,8 +3230,6 @@ i915_max_freq_set(void *data, u64 val) flush_delayed_work(&dev_priv->rps.delayed_resume_work); - DRM_DEBUG_DRIVER("Manually setting max freq to %llu\n", val); - ret = mutex_lock_interruptible(&dev_priv->rps.hw_lock); if (ret) return ret; @@ -3249,6 +3247,8 @@ i915_max_freq_set(void *data, u64 val) gen6_set_rps(dev, val); } + DRM_DEBUG_DRIVER("Manually set max freq to %llu\n", val); + mutex_unlock(&dev_priv->rps.hw_lock); return 0;