From patchwork Tue Oct 16 14:34:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Imre Deak X-Patchwork-Id: 1600981 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id A7759DFFED for ; Tue, 16 Oct 2012 14:44:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C85629EFF6 for ; Tue, 16 Oct 2012 07:44:29 -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 2EFE99F3BA for ; Tue, 16 Oct 2012 07:35:16 -0700 (PDT) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 16 Oct 2012 07:35:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,593,1344236400"; d="scan'208";a="205092195" 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:14 -0700 From: Imre Deak To: intel-gfx@lists.freedesktop.org Date: Tue, 16 Oct 2012 17:34:41 +0300 Message-Id: <1350398096-3649-8-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 07/22] flip_test: factor out drmModePageFlip 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 better readability and to prepare for the upcoming patch marking pending flip events with a flag. No functional change. Signed-off-by: Imre Deak --- tests/flip_test.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/flip_test.c b/tests/flip_test.c index aa611f5..06768a4 100644 --- a/tests/flip_test.c +++ b/tests/flip_test.c @@ -157,6 +157,12 @@ static int set_dpms(struct test_output *o, int mode) return drmModeConnectorSetProperty(drm_fd, o->id, dpms, mode); } +static int do_page_flip(struct test_output *o, int fb_id) +{ + return drmModePageFlip(drm_fd, o->crtc, fb_id, DRM_MODE_PAGE_FLIP_EVENT, + o); +} + static bool analog_tv_connector(struct test_output *o) { @@ -220,8 +226,7 @@ static void page_flip_handler(int fd, unsigned int frame, unsigned int sec, new_fb_id = o->fb_ids[o->current_fb_id]; if (o->flags & TEST_EINVAL && o->count > 1) - assert(drmModePageFlip(drm_fd, o->crtc, new_fb_id, - DRM_MODE_PAGE_FLIP_EVENT, o) == expected_einval); + assert(do_page_flip(o, new_fb_id) == expected_einval); if (o->flags & TEST_MODESET) { if (drmModeSetCrtc(drm_fd, o->crtc, @@ -240,12 +245,10 @@ static void page_flip_handler(int fd, unsigned int frame, unsigned int sec, o->count++; printf("."); fflush(stdout); - do_or_die(drmModePageFlip(drm_fd, o->crtc, new_fb_id, - DRM_MODE_PAGE_FLIP_EVENT, o)); + do_or_die(do_page_flip(o, new_fb_id)); if (o->flags & TEST_EBUSY) - assert(drmModePageFlip(drm_fd, o->crtc, new_fb_id, - DRM_MODE_PAGE_FLIP_EVENT, o) == -EBUSY); + assert(do_page_flip(o, new_fb_id) == -EBUSY); if (o->flags & TEST_DPMS) do_or_die(set_dpms(o, DRM_MODE_DPMS_OFF)); @@ -262,8 +265,7 @@ static void page_flip_handler(int fd, unsigned int frame, unsigned int sec, } if (o->flags & TEST_EINVAL) - assert(drmModePageFlip(drm_fd, o->crtc, new_fb_id, - DRM_MODE_PAGE_FLIP_EVENT, o) == expected_einval); + assert(do_page_flip(o, new_fb_id) == expected_einval); o->last_flip_received = now; o->last_flip_ts = pageflip_ts; @@ -436,8 +438,7 @@ static void flip_mode(struct test_output *o, int crtc, int duration) gettimeofday(&o->last_flip_received, NULL); - if (drmModePageFlip(drm_fd, o->crtc, o->fb_ids[1], - DRM_MODE_PAGE_FLIP_EVENT, o)) { + if (do_page_flip(o, o->fb_ids[1])) { fprintf(stderr, "failed to page flip: %s\n", strerror(errno)); exit(4); }