From patchwork Tue Jul 11 22:48:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jim.bride@linux.intel.com X-Patchwork-Id: 9835621 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9E799602BD for ; Tue, 11 Jul 2017 22:51:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85AB9285C3 for ; Tue, 11 Jul 2017 22:51:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A6AE285CD; Tue, 11 Jul 2017 22:51:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1CC3A285C3 for ; Tue, 11 Jul 2017 22:51:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6EAC36E335; Tue, 11 Jul 2017 22:51:10 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0662B6E322 for ; Tue, 11 Jul 2017 22:51:08 +0000 (UTC) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jul 2017 15:51:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,347,1496127600"; d="scan'208";a="123996635" Received: from shiv.jf.intel.com ([10.54.75.141]) by orsmga005.jf.intel.com with ESMTP; 11 Jul 2017 15:51:06 -0700 From: Jim Bride To: intel-gfx@lists.freedesktop.org Date: Tue, 11 Jul 2017 15:48:34 -0700 Message-Id: <1499813316-15038-10-git-send-email-jim.bride@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499813316-15038-1-git-send-email-jim.bride@linux.intel.com> References: <1499813316-15038-1-git-send-email-jim.bride@linux.intel.com> Subject: [Intel-gfx] [PATCH IGT 09/11] lib: Add igt_psr_valid_connector() and change tests to use it. 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-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jim Bride --- lib/igt_psr.c | 11 +++++++++++ lib/igt_psr.h | 1 + tests/kms_frontbuffer_tracking.c | 12 +++++++----- tests/kms_psr_sink_crc.c | 2 +- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lib/igt_psr.c b/lib/igt_psr.c index 8dda659..178842e 100644 --- a/lib/igt_psr.c +++ b/lib/igt_psr.c @@ -127,3 +127,14 @@ void igt_psr_print_status(int fd) igt_debugfs_read(fd, "i915_edp_psr_status", buf); igt_info("PSR status:\n%s\n", buf); } + +/** + * igt_psr_valid_connector: + * @connector: a drmModeConnector pointer to check + * + * Returns true if connector is an eDP connector. + */ +bool igt_psr_valid_connector(drmModeConnectorPtr connector) +{ + return (connector->connector_type == DRM_MODE_CONNECTOR_eDP); +} diff --git a/lib/igt_psr.h b/lib/igt_psr.h index d6db297..08bccef 100644 --- a/lib/igt_psr.h +++ b/lib/igt_psr.h @@ -33,5 +33,6 @@ bool igt_psr_possible(int fd); bool igt_psr_active(int fd); bool igt_psr_await_status(int fd, bool active); void igt_psr_print_status(int fd); +bool igt_psr_valid_connector(drmModeConnectorPtr connector); #endif /* IGT_PSR_H */ diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index ee611b9..6f52c49 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -424,11 +424,12 @@ static void init_mode_params(struct modeset_params *params, uint32_t crtc_id, static bool connector_get_mode(drmModeConnectorPtr c, drmModeModeInfoPtr *mode) { *mode = NULL; + bool valid = igt_psr_valid_connector(c); if (c->connection != DRM_MODE_CONNECTED || !c->count_modes) return false; - if (c->connector_type == DRM_MODE_CONNECTOR_eDP && opt.no_edp) + if (valid && opt.no_edp) return false; if (opt.small_modes) @@ -461,7 +462,7 @@ static bool find_connector(bool edp_only, bool pipe_a, uint32_t forbidden_id, for (i = 0; i < drm.res->count_connectors; i++) { c = drm.connectors[i]; - if (edp_only && c->connector_type != DRM_MODE_CONNECTOR_eDP) + if (edp_only && !igt_psr_valid_connector(c)) continue; if (pipe_a && !connector_supports_pipe_a(c)) continue; @@ -1395,7 +1396,7 @@ static void setup_sink_crc(void) drmModeConnectorPtr c; c = get_connector(prim_mode_params.connector_id); - if (c->connector_type != DRM_MODE_CONNECTOR_eDP) { + if (!igt_psr_valid_connector(c)) { igt_info("Sink CRC not supported: primary screen is not eDP\n"); sink_crc.supported = false; return; @@ -1531,8 +1532,9 @@ static bool psr_sink_has_support(void) static void setup_psr(void) { - if (get_connector(prim_mode_params.connector_id)->connector_type != - DRM_MODE_CONNECTOR_eDP) { + drmModeConnectorPtr c = get_connector(prim_mode_params.connector_id); + + if (!igt_psr_valid_connector(c)) { igt_info("Can't test PSR: no usable eDP screen.\n"); return; } diff --git a/tests/kms_psr_sink_crc.c b/tests/kms_psr_sink_crc.c index c9f7993..da8c173 100644 --- a/tests/kms_psr_sink_crc.c +++ b/tests/kms_psr_sink_crc.c @@ -103,7 +103,7 @@ static void setup_output(data_t *data) for_each_pipe_with_valid_output(display, pipe, output) { drmModeConnectorPtr c = output->config.connector; - if (c->connector_type != DRM_MODE_CONNECTOR_eDP) + if (!igt_psr_valid_connector(c)) continue; igt_output_set_pipe(output, pipe);