From patchwork Tue Oct 16 14:34:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Imre Deak X-Patchwork-Id: 1600961 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 CF304DFFED for ; Tue, 16 Oct 2012 14:43:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EC005A0884 for ; Tue, 16 Oct 2012 07:43:35 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 17FBBA0871 for ; Tue, 16 Oct 2012 07:35:14 -0700 (PDT) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 16 Oct 2012 07:35:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,593,1344236400"; d="scan'208";a="205092166" 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:12 -0700 From: Imre Deak To: intel-gfx@lists.freedesktop.org Date: Tue, 16 Oct 2012 17:34:40 +0300 Message-Id: <1350398096-3649-7-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 06/22] flip_test: store fb width, height in test context object 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 We will need these in event handlers, so store them where the handlers have access to them. No functional change. Signed-off-by: Imre Deak --- tests/flip_test.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/flip_test.c b/tests/flip_test.c index ed8c12b..aa611f5 100644 --- a/tests/flip_test.c +++ b/tests/flip_test.c @@ -73,6 +73,8 @@ struct test_output { int flags; int count; unsigned int current_fb_id; + unsigned int fb_width; + unsigned int fb_height; unsigned int fb_ids[2]; struct kmstest_fb fb_info[2]; struct timeval last_flip_received; @@ -391,7 +393,6 @@ static void flip_mode(struct test_output *o, int crtc, int duration) int ret; int bpp = 32, depth = 24; drmEventContext evctx; - int width, height; struct timeval end; connector_find_preferred_mode(o, crtc); @@ -401,17 +402,17 @@ static void flip_mode(struct test_output *o, int crtc, int duration) fprintf(stdout, "Beginning page flipping on crtc %d, connector %d\n", crtc, o->id); - width = o->mode.hdisplay; - height = o->mode.vdisplay; + o->fb_width = o->mode.hdisplay; + o->fb_height = o->mode.vdisplay; if (o->flags & TEST_PAN) - width *= 2; + o->fb_width *= 2; - o->fb_ids[0] = kmstest_create_fb(drm_fd, width, height, bpp, depth, - false, &o->fb_info[0], + o->fb_ids[0] = kmstest_create_fb(drm_fd, o->fb_width, o->fb_height, bpp, + depth, false, &o->fb_info[0], paint_flip_mode, (void *)false); - o->fb_ids[1] = kmstest_create_fb(drm_fd, width, height, bpp, depth, - false, &o->fb_info[1], + o->fb_ids[1] = kmstest_create_fb(drm_fd, o->fb_width, o->fb_height, bpp, + depth, false, &o->fb_info[1], paint_flip_mode, (void *)true); if (!o->fb_ids[0] || !o->fb_ids[1]) { @@ -423,7 +424,7 @@ static void flip_mode(struct test_output *o, int crtc, int duration) if (drmModeSetCrtc(drm_fd, o->crtc, o->fb_ids[0], 0, 0, &o->id, 1, &o->mode)) { fprintf(stderr, "failed to set mode (%dx%d@%dHz): %s\n", - width, height, o->mode.vrefresh, + o->fb_width, o->fb_height, o->mode.vrefresh, strerror(errno)); exit(3); } @@ -488,8 +489,8 @@ static void flip_mode(struct test_output *o, int crtc, int duration) x_ofs, 0, &o->id, 1, &o->mode)) { fprintf(stderr, "failed to pan (%dx%d@%dHz): %s\n", - width, height, o->mode.vrefresh, - strerror(errno)); + o->fb_width, o->fb_height, + o->mode.vrefresh, strerror(errno)); exit(7); } }