From patchwork Fri Jun 5 15:34:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 6556121 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DD0839F326 for ; Fri, 5 Jun 2015 15:34:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A47B206D9 for ; Fri, 5 Jun 2015 15:34:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C0EE92067D for ; Fri, 5 Jun 2015 15:34:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 09F5C6E06E; Fri, 5 Jun 2015 08:34:40 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E6DA6E06E for ; Fri, 5 Jun 2015 08:34:39 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 05 Jun 2015 08:34:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,559,1427785200"; d="scan'208";a="741655688" Received: from pjbrady-mobl.ger.corp.intel.com (HELO strange.ger.corp.intel.com) ([10.252.28.101]) by orsmga002.jf.intel.com with ESMTP; 05 Jun 2015 08:34:37 -0700 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Fri, 5 Jun 2015 16:34:37 +0100 Message-Id: <1433518477-21985-1-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: Subject: [Intel-gfx] [PATCH i-g-t v2] pm_rpm: Update the debugfs filename X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 v2: Try first to open i915_pc8_status to make the transition (or just running on older kernels) better. (Paulo) Signed-off-by: Damien Lespiau --- tests/pm_rpm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index a1f4013..238a6e3 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -670,8 +670,11 @@ static void setup_pc8(void) return; pc8_status_fd = igt_debugfs_open("i915_pc8_status", O_RDONLY); + if (pc8_status_fd == -1) + pc8_status_fd = igt_debugfs_open("i915_runtime_pm_status", + O_RDONLY); igt_assert_f(pc8_status_fd >= 0, - "Can't open /sys/kernel/debug/dri/0/i915_pc8_status"); + "Can't open /sys/kernel/debug/dri/0/i915_runtime_pm_status"); has_pc8 = true; }