From patchwork Mon Aug 25 17:58:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 4777251 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D80549F2A9 for ; Tue, 26 Aug 2014 00:57:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 117362011E for ; Tue, 26 Aug 2014 00:57:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 300C42012D for ; Tue, 26 Aug 2014 00:57:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B16876E42F; Mon, 25 Aug 2014 17:57:09 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id AE98889DBD for ; Mon, 25 Aug 2014 17:57:06 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 25 Aug 2014 17:51:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,400,1406617200"; d="scan'208";a="593215875" Received: from rdvivi-hillsboro.jf.intel.com ([10.7.196.72]) by orsmga002.jf.intel.com with ESMTP; 25 Aug 2014 17:56:38 -0700 From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Mon, 25 Aug 2014 10:58:44 -0700 Message-Id: <1408989525-10175-1-git-send-email-rodrigo.vivi@intel.com> X-Mailer: git-send-email 1.9.3 Cc: Rodrigo Vivi Subject: [Intel-gfx] [PATCH 1/2] tests/pm_psr: Update pm_psr for new psr debug interface. 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=-2.7 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, 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 Signed-off-by: Rodrigo Vivi --- tests/pm_psr.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/tests/pm_psr.c b/tests/pm_psr.c index 3ab7e7a..8b92d84 100644 --- a/tests/pm_psr.c +++ b/tests/pm_psr.c @@ -32,6 +32,10 @@ #include #include "drmtest.h" +#include "intel_chipset.h" +#include "igt_debugfs.h" + +#define HAS_PSR(dev) (IS_HASWELL(dev) | IS_BROADWELL(dev)) #define SLEEP_DURATION 5000 // in milliseconds @@ -41,22 +45,31 @@ static int get_perf(const char *path) FILE *file; char str[4]; - file = fopen(path, "r"); - igt_assert(file); + file = igt_debugfs_fopen("i915_edp_psr_status", "r"); + igt_require(file); ret = fscanf(file, "Sink_Support: %s\n", str); igt_skip_on_f(ret == 0, "i915_edp_psr_status format not supported by this test case\n"); igt_require(strcmp(str, "yes") == 0); + ret = fscanf(file, "Source_OK: %s\n", str); igt_assert(ret != 0); - igt_require(strcmp(str, "yes") == 0); ret = fscanf(file, "Enabled: %s\n", str); igt_assert(ret != 0); igt_assert(strcmp(str, "yes") == 0); + ret = fscanf(file, "Active: %s\n", str); + igt_assert(ret != 0); + ret = fscanf(file, "Busy frontbuffer bits: %s\n", str); + igt_assert(ret != 0); + ret = fscanf(file, "Re-enable work scheduled: %s\n", str); + igt_assert(ret != 0); + ret = fscanf(file, "HW Enabled & Active bit: %s\n", str); + igt_assert(ret != 0); + ret = fscanf(file, "Performance_Counter: %i", &perf); igt_assert(ret != 0); @@ -68,14 +81,14 @@ static int get_perf(const char *path) igt_simple_main { - int ret, perf1, perf2; - int device = drm_get_card(); + int perf1, perf2; + int drm_fd = drm_open_any(); + uint32_t devid = intel_get_drm_devid(drm_fd); char *path; igt_skip_on_simulation(); - ret = asprintf(&path, "/sys/kernel/debug/dri/%d/i915_edp_psr_status", device); - igt_assert(ret != -1); + igt_skip_on(!HAS_PSR(devid)); perf1 = get_perf(path); sleep(SLEEP_DURATION / 1000);