From patchwork Tue Oct 16 14:34:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Imre Deak X-Patchwork-Id: 1601071 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 5DCE440ABA for ; Tue, 16 Oct 2012 14:48:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D956A0883 for ; Tue, 16 Oct 2012 07:48:35 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id C4B6D9F616 for ; Tue, 16 Oct 2012 07:35:34 -0700 (PDT) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 16 Oct 2012 07:35:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,593,1344236400"; d="scan'208";a="205092377" Received: from ideak-desk.fi.intel.com (HELO localhost) ([10.237.72.98]) by azsmga001.ch.intel.com with ESMTP; 16 Oct 2012 07:35:33 -0700 From: Imre Deak To: intel-gfx@lists.freedesktop.org Date: Tue, 16 Oct 2012 17:34:50 +0300 Message-Id: <1350398096-3649-17-git-send-email-imre.deak@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350398096-3649-1-git-send-email-imre.deak@intel.com> References: <1350398096-3649-1-git-send-email-imre.deak@intel.com> Subject: [Intel-gfx] [PATCH 16/22] flip_test: store crtc_idx in the test context obj X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org For DRM_IOCTL_WAIT_VBLANK we'll have to pass the crtc_idx - as opposed to the crtc id required by the rest of the IOCTLs we use. No functional change. Signed-off-by: Imre Deak --- tests/flip_test.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/flip_test.c b/tests/flip_test.c index f07c0db..85fa0f2 100644 --- a/tests/flip_test.c +++ b/tests/flip_test.c @@ -85,6 +85,7 @@ struct event_state { struct test_output { uint32_t id; + int crtc_idx; int mode_valid; drmModeModeInfo mode; drmModeEncoder *encoder; @@ -533,11 +534,13 @@ static unsigned event_loop(struct test_output *o, unsigned duration_sec) return tv_dur.tv_sec * 1000 * 1000 + tv_dur.tv_usec; } -static void flip_mode(struct test_output *o, int crtc, int duration) +static void flip_mode(struct test_output *o, int duration) { int bpp = 32, depth = 24; unsigned ellapsed; + int crtc; + crtc = resources->crtcs[o->crtc_idx]; connector_find_preferred_mode(o, crtc); if (!o->mode_valid) return; @@ -620,8 +623,9 @@ static int run_test(int duration, int flags) o.id = resources->connectors[c]; o.flags = flags; o.flip_state.name = "flip"; + o.crtc_idx = i; - flip_mode(&o, resources->crtcs[i], duration); + flip_mode(&o, duration); } }