From patchwork Mon Aug 25 17:58:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 4777241 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 6CF9AC0338 for ; Tue, 26 Aug 2014 00:57:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8E35420127 for ; Tue, 26 Aug 2014 00:57:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 892E82011E for ; Tue, 26 Aug 2014 00:57:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 13CDE6E42E; Mon, 25 Aug 2014 17:57:08 -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 C8C2189DED 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="593215876" 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:45 -0700 Message-Id: <1408989525-10175-2-git-send-email-rodrigo.vivi@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1408989525-10175-1-git-send-email-rodrigo.vivi@intel.com> References: <1408989525-10175-1-git-send-email-rodrigo.vivi@intel.com> Cc: Rodrigo Vivi Subject: [Intel-gfx] [PATCH 2/2] tests/kms_psr_sink_crc: Fix edp_psr debugfs interface run only on HAS_PSR. 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 Tests were broken on platforms that doesn't have psr or on new kernel that contains new interface. A lot more need to be done to get these tests really useful, but for now lets avoid it breaking tests framework. Signed-off-by: Rodrigo Vivi --- tests/kms_psr_sink_crc.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/tests/kms_psr_sink_crc.c b/tests/kms_psr_sink_crc.c index 909d6ca..312147e 100644 --- a/tests/kms_psr_sink_crc.c +++ b/tests/kms_psr_sink_crc.c @@ -37,6 +37,8 @@ #include "igt_debugfs.h" #include "igt_kms.h" +#define HAS_PSR(dev) (IS_HASWELL(dev) | IS_BROADWELL(dev)) + enum tests { TEST_PAGE_FLIP, TEST_MMAP_CPU, @@ -259,7 +261,7 @@ static void fill_render(data_t *data, uint32_t handle, gem_bo_busy(data->drm_fd, handle); } -static bool psr_sink_support(data_t *data) +static bool psr_enabled(data_t *data) { int ret; FILE *file; @@ -269,14 +271,17 @@ static bool psr_sink_support(data_t *data) 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_assert(ret != 0); + ret = fscanf(file, "Source_OK: %s\n", str); + igt_assert(ret != 0); + ret = fscanf(file, "Enabled: %s\n", str); + igt_assert(ret != 0); fclose(file); return strcmp(str, "yes") == 0; } -static bool psr_enabled(data_t *data) +static bool psr_active(data_t *data) { int ret; FILE *file; @@ -287,12 +292,18 @@ static bool psr_enabled(data_t *data) ret = fscanf(file, "Sink_Support: %s\n", str); igt_assert(ret != 0); - ret = fscanf(file, "Source_OK: %s\n", str); igt_assert(ret != 0); - ret = fscanf(file, "Enabled: %s\n", str); igt_assert(ret != 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); fclose(file); return strcmp(str, "yes") == 0; @@ -301,7 +312,7 @@ static bool psr_enabled(data_t *data) static bool wait_psr_entry(data_t *data, int timeout) { while (timeout--) { - if (psr_enabled(data)) + if (psr_active(data)) return true; sleep(1); } @@ -513,8 +524,6 @@ static void test_sprite(data_t *data) igt_output_t *output; drmModeModeInfo *mode; - igt_skip_on(IS_HASWELL(data->devid)); - for_each_connected_output(display, output) { drmModeConnectorPtr c = output->config.connector; @@ -593,7 +602,9 @@ igt_main data.devid = intel_get_drm_devid(data.drm_fd); - igt_require(psr_sink_support(&data)); + igt_skip_on(!HAS_PSR(data.devid)); + + igt_skip_on(!psr_enabled(&data)); data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096); igt_assert(data.bufmgr);