From patchwork Wed May 25 13:51:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Vlad X-Patchwork-Id: 9135405 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 B494C607D5 for ; Wed, 25 May 2016 13:47:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A7A0E28110 for ; Wed, 25 May 2016 13:47:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C914282B3; Wed, 25 May 2016 13:47:37 +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]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 471B828110 for ; Wed, 25 May 2016 13:47:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 17E1C6E94D; Wed, 25 May 2016 13:47:36 +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 ESMTP id 8E5F76E94D for ; Wed, 25 May 2016 13:47:33 +0000 (UTC) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP; 25 May 2016 06:47:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,364,1459839600"; d="scan'208";a="814561089" Received: from mcvlad-wk.rb.intel.com ([10.237.105.57]) by orsmga003.jf.intel.com with ESMTP; 25 May 2016 06:47:32 -0700 From: Marius Vlad To: intel-gfx@lists.freedesktop.org Date: Wed, 25 May 2016 16:51:12 +0300 Message-Id: <1464184272-4020-1-git-send-email-marius.c.vlad@intel.com> X-Mailer: git-send-email 2.8.0.rc3 Subject: [Intel-gfx] [PATCH i-g-t] tests/kms_cursor_legacy: Fix igt_fixture. 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 Either use a igt_fixture for crtcs or remove it entirely and use the one already in igt_main. CC: Chris Wilson Signed-off-by: Marius Vlad --- tests/kms_cursor_legacy.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c index 14281d1..fb77ec1 100644 --- a/tests/kms_cursor_legacy.c +++ b/tests/kms_cursor_legacy.c @@ -132,21 +132,24 @@ igt_main igt_subtest_group { for (int n = 0; n < 26; n++) { - uint32_t *crtcs = &data.resources->crtcs[n]; errno = 0; igt_fixture igt_skip_on(n >= data.resources->count_crtcs); igt_subtest_f("single-%c-bo", 'A' + n) - stress(&data, crtcs, 1, 1, DRM_MODE_CURSOR_BO, 20); + stress(&data, data.resources->crtcs, + 1, 1, DRM_MODE_CURSOR_BO, 20); igt_subtest_f("single-%c-move", 'A' + n) - stress(&data, crtcs, 1, 1, DRM_MODE_CURSOR_MOVE, 20); + stress(&data, data.resources->crtcs, + 1, 1, DRM_MODE_CURSOR_MOVE, 20); igt_subtest_f("forked-%c-bo", 'A' + n) - stress(&data, crtcs, 1, ncpus, DRM_MODE_CURSOR_BO, 20); + stress(&data, data.resources->crtcs, + 1, ncpus, DRM_MODE_CURSOR_BO, 20); igt_subtest_f("forked-%c-move", 'A' + n) - stress(&data, crtcs, 1, ncpus, DRM_MODE_CURSOR_MOVE, 20); + stress(&data, data.resources->crtcs, + 1, ncpus, DRM_MODE_CURSOR_MOVE, 20); } }