From patchwork Thu Aug 7 13:09:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 4691191 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 D90B49F373 for ; Thu, 7 Aug 2014 13:09:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A5C31201DD for ; Thu, 7 Aug 2014 13:09:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 744FA201DC for ; Thu, 7 Aug 2014 13:09:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EDED36E049; Thu, 7 Aug 2014 06:09:34 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yk0-f174.google.com (mail-yk0-f174.google.com [209.85.160.174]) by gabe.freedesktop.org (Postfix) with ESMTP id C8AB389FD1 for ; Thu, 7 Aug 2014 06:09:32 -0700 (PDT) Received: by mail-yk0-f174.google.com with SMTP id q9so2741301ykb.19 for ; Thu, 07 Aug 2014 06:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ukqpIdkcts35XDSp7oMxELLZD7AZk3MA9Z/CdbyAxqQ=; b=jWo7DdrNiHkSylzDeHDH7hYIe2QQFefjiLfwbnD+vF5LCOOb1WXKK/GXTqgMgpqpVg 5kcIeNF+jzQiKCyVJuF8n56Bgco+Q0Z3lulYWfT1zm/IR/tMQlCWlmbrpzzF2d2E6vWB QndDHDO9Bk56sKHJZa7OMgkdDG0O+hzBzBhv/4fKzLTmXveqir5w+oQzz6iqAODo10Ff J2lVOW2fkz1wwB32kxwWdwNIHo3VLSNbSlucOrFVPISm6TL/fsa1IjlwrBQ4u6/oCWBA SB94zxebSjvY2UmjSik/cE5K+bqbRVVGRimDeH/5HykxHniou8aBirIo9R/hTrL+Cm2I FpPw== X-Received: by 10.236.19.78 with SMTP id m54mr4629810yhm.134.1407416972363; Thu, 07 Aug 2014 06:09:32 -0700 (PDT) Received: from localhost.localdomain ([177.156.106.184]) by mx.google.com with ESMTPSA id u23sm7515674yhg.28.2014.08.07.06.09.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Aug 2014 06:09:31 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Thu, 7 Aug 2014 10:09:07 -0300 Message-Id: <1407416947-2282-6-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1407416947-2282-1-git-send-email-przanoni@gmail.com> References: <1407416947-2282-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 6/6] igt_kms: add igt_unset_all_crtcs() 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=-4.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Paulo Zanoni Both pm_rpm.c and pm_lpsp.c call it "disable_all_screens", but let's give it a name that better describes what the implementation does. Signed-off-by: Paulo Zanoni --- lib/igt_kms.c | 18 ++++++++++++++++++ lib/igt_kms.h | 1 + tests/pm_lpsp.c | 17 +++-------------- tests/pm_rpm.c | 8 +------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 6cca7e8..678b3cd 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -1560,3 +1560,21 @@ void igt_reset_connectors(void) close(drm_fd); } + +/** + * igt_unset_all_crtcs: + * @drm_fd: the DRM fd + * @resources: libdrm resources pointer + * + * Disables all the screens. + */ +void igt_unset_all_crtcs(int drm_fd, drmModeResPtr resources) +{ + int i, rc; + + for (i = 0; i < resources->count_crtcs; i++) { + rc = drmModeSetCrtc(drm_fd, resources->crtcs[i], -1, 0, 0, NULL, + 0, NULL); + igt_assert(rc == 0); + } +} diff --git a/lib/igt_kms.h b/lib/igt_kms.h index f8c500e..43e84f6 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -258,6 +258,7 @@ void igt_reset_connectors(void); bool igt_get_property(int drm_fd, uint32_t object_id, uint32_t object_type, const char *name, uint32_t *prop_id, uint64_t *value, drmModePropertyPtr *prop); +void igt_unset_all_crtcs(int drm_fd, drmModeResPtr resources); #endif /* __IGT_KMS_H__ */ diff --git a/tests/pm_lpsp.c b/tests/pm_lpsp.c index 9d3884c..b3a21ea 100644 --- a/tests/pm_lpsp.c +++ b/tests/pm_lpsp.c @@ -70,22 +70,11 @@ static bool lpsp_is_enabled(int drm_fd) return !(val & HSW_PWR_WELL_STATE_ENABLED); } -static void disable_all_screens(int drm_fd, drmModeResPtr drm_resources) -{ - int i, rc; - - for (i = 0; i < drm_resources->count_crtcs; i++) { - rc = drmModeSetCrtc(drm_fd, drm_resources->crtcs[i], -1, 0, 0, - NULL, 0, NULL); - igt_assert(rc == 0); - } -} - /* The LPSP mode is all about an enabled pipe, but we expect to also be in the * low power mode when no pipes are enabled, so do this check anyway. */ static void screens_disabled_subtest(int drm_fd, drmModeResPtr drm_res) { - disable_all_screens(drm_fd, drm_res); + igt_unset_all_crtcs(drm_fd, drm_res); igt_assert(lpsp_is_enabled(drm_fd)); } @@ -131,7 +120,7 @@ static void edp_subtest(int drm_fd, drmModeResPtr drm_res, .name = "Custom 1024x768", }; - disable_all_screens(drm_fd, drm_res); + igt_unset_all_crtcs(drm_fd, drm_res); for (i = 0; i < drm_res->count_connectors; i++) { drmModeConnectorPtr c = drm_connectors[i]; @@ -193,7 +182,7 @@ static void non_edp_subtest(int drm_fd, drmModeResPtr drm_res, uint32_t connector_id = 0, crtc_id = 0, buffer_id = 0; drmModeModeInfoPtr mode = NULL; - disable_all_screens(drm_fd, drm_res); + igt_unset_all_crtcs(drm_fd, drm_res); for (i = 0; i < drm_res->count_connectors; i++) { drmModeConnectorPtr c = drm_connectors[i]; diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index 800ab4b..84c71bd 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -232,13 +232,7 @@ static void disable_all_screens_dpms(struct mode_set_data *data) static void disable_all_screens(struct mode_set_data *data) { - int i, rc; - - for (i = 0; i < data->res->count_crtcs; i++) { - rc = drmModeSetCrtc(drm_fd, data->res->crtcs[i], -1, 0, 0, - NULL, 0, NULL); - igt_assert(rc == 0); - } + igt_unset_all_crtcs(drm_fd, data->res); } static struct scanout_fb *create_fb(struct mode_set_data *data, int width,