From: Daniel Vetter Subject: Re: [PATCH 08/22] flip_test: move output panning inside the flip_handler Date: Tue, 16 Oct 2012 16:59:54 +0200 Message-ID: <20121016145954.GK5753@phenom.ffwll.local> References: <1350398096-3649-1-git-send-email-imre.deak@intel.com> <1350398096-3649-9-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 6839E9EBA3 for ; Tue, 16 Oct 2012 07:58:53 -0700 (PDT) Received: by mail-wg0-f43.google.com with SMTP id dq11so4417455wgb.12 for ; Tue, 16 Oct 2012 07:58:52 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1350398096-3649-9-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Imre Deak Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, Oct 16, 2012 at 05:34:42PM +0300, Imre Deak wrote: > Move the panning to a more logical place where the rest of the test > steps are performed. This won't change things in practice, since the > first thing drmHandleEvent does is call the flip_handler. > > Signed-off-by: Imre Deak Looking at this again I think the test is actually broken. It tries to check whether fb_set_base correclty waits for any outstanding flips (well, it can't really check that, but it should exercise the code at least). So the right place to call this is actually right _after_ issueing the flip, where the TEST_DPMS and TEST_MODESET cases are. -Daniel > --- > tests/flip_test.c | 29 ++++++++++++++--------------- > 1 file changed, 14 insertions(+), 15 deletions(-) > > diff --git a/tests/flip_test.c b/tests/flip_test.c > index 06768a4..0825cda 100644 > --- a/tests/flip_test.c > +++ b/tests/flip_test.c > @@ -218,6 +218,20 @@ static void page_flip_handler(int fd, unsigned int frame, unsigned int sec, > } > } > > + /* pan before the flip completes */ > + if (o->flags & TEST_PAN) { > + int x_ofs = o->count * 10 > o->mode.hdisplay ? > + o->mode.hdisplay : o->count * 10; > + > + if (drmModeSetCrtc(drm_fd, o->crtc, o->fb_ids[o->current_fb_id], > + x_ofs, 0, &o->id, 1, &o->mode)) { > + fprintf(stderr, "failed to pan (%dx%d@%dHz): %s\n", > + o->fb_width, o->fb_height, > + o->mode.vrefresh, strerror(errno)); > + exit(7); > + } > + } > + > if (o->flags & TEST_WITH_DUMMY_LOAD) > emit_dummy_load(o); > > @@ -481,21 +495,6 @@ static void flip_mode(struct test_output *o, int crtc, int duration) > break; > } > > - /* pan before the flip completes */ > - if (o->flags & TEST_PAN) { > - int x_ofs = o->count * 10 > o->mode.hdisplay ? o->mode.hdisplay : > - o->count * 10; > - > - if (drmModeSetCrtc(drm_fd, o->crtc, o->fb_ids[o->current_fb_id], > - x_ofs, 0, > - &o->id, 1, &o->mode)) { > - fprintf(stderr, "failed to pan (%dx%d@%dHz): %s\n", > - o->fb_width, o->fb_height, > - o->mode.vrefresh, strerror(errno)); > - exit(7); > - } > - } > - > ret = drmHandleEvent(drm_fd, &evctx); > assert(ret == 0); > } > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch