From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02B446EE9D for ; Tue, 11 Feb 2020 15:54:12 +0000 (UTC) Date: Tue, 11 Feb 2020 17:53:48 +0200 From: Imre Deak Message-ID: <20200211155348.GB29904@ideak-desk.fi.intel.com> References: <20200211023108.25369-1-imre.deak@intel.com> <20200211023108.25369-6-imre.deak@intel.com> <20200211154529.GC1588865@mdroper-desk1.amr.corp.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200211154529.GC1588865@mdroper-desk1.amr.corp.intel.com> Subject: Re: [igt-dev] [PATCH v2 6/8] tests/kms_frontbuffer_tracking: Skip GTT subtests on platforms w/o aperture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: imre.deak@intel.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: Matt Roper Cc: igt-dev@lists.freedesktop.org List-ID: On Tue, Feb 11, 2020 at 07:45:29AM -0800, Matt Roper wrote: > On Tue, Feb 11, 2020 at 04:31:06AM +0200, Imre Deak wrote: > > Subtests that draw through a GTT mapping are not relevent on a platform w/o > > GTT aperture, so skip them. > > Do slow_draw_subtest and scaledprimary_subtest need to skip if t->method is GTT? Those are blt only subtests, so we won't skip those due to missing aperture. > > Aside from that, > > Reviewed-by: Matt Roper > > > > > v2: > > - Remove the check for aperture where it's not relevant, or where it > > would skip the test incorrectly (badformat_subtest()). > > > > Cc: Matt Roper > > Signed-off-by: Imre Deak > > --- > > tests/kms_frontbuffer_tracking.c | 20 ++++++++++++++++++++ > > 1 file changed, 20 insertions(+) > > > > diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c > > index 724f5d16..881cb9ff 100644 > > --- a/tests/kms_frontbuffer_tracking.c > > +++ b/tests/kms_frontbuffer_tracking.c > > @@ -1934,6 +1934,9 @@ static void draw_subtest(const struct test_mode *t) > > struct modeset_params *params = pick_params(t); > > struct fb_region *target; > > > > + igt_skip_on(t->method == IGT_DRAW_MMAP_GTT && > > + !gem_has_mappable_ggtt(drm.fd)); > > + > > switch (t->screen) { > > case SCREEN_PRIM: > > if (t->method != IGT_DRAW_MMAP_GTT && t->plane == PLANE_PRI) > > @@ -2032,6 +2035,11 @@ static void multidraw_subtest(const struct test_mode *t) > > igt_debug("Methods %s and %s\n", > > igt_draw_get_method_name(m1), > > igt_draw_get_method_name(m2)); > > + > > + igt_skip_on((m1 == IGT_DRAW_MMAP_GTT || > > + m2 == IGT_DRAW_MMAP_GTT) && > > + !gem_has_mappable_ggtt(drm.fd)); > > + > > for (r = 0; r < pattern->n_rects; r++) { > > used_method = (r % 2 == 0) ? m1 : m2; > > > > @@ -2276,6 +2284,9 @@ static void flip_subtest(const struct test_mode *t) > > struct draw_pattern_info *pattern = &pattern1; > > enum color bg_color; > > > > + igt_skip_on(t->method == IGT_DRAW_MMAP_GTT && > > + !gem_has_mappable_ggtt(drm.fd)); > > + > > switch (t->screen) { > > case SCREEN_PRIM: > > assertions |= ASSERT_LAST_ACTION_CHANGED; > > @@ -2335,6 +2346,9 @@ static void fliptrack_subtest(const struct test_mode *t, enum flip_type type) > > struct modeset_params *params = pick_params(t); > > struct draw_pattern_info *pattern = &pattern1; > > > > + igt_skip_on(t->method == IGT_DRAW_MMAP_GTT && > > + !gem_has_mappable_ggtt(drm.fd)); > > + > > prepare_subtest(t, pattern); > > > > create_fb(t->format, params->primary.fb->width, params->primary.fb->height, > > @@ -2744,6 +2758,9 @@ static void farfromfence_subtest(const struct test_mode *t) > > int max_height, assertions = 0; > > int gen = intel_gen(intel_get_drm_devid(drm.fd)); > > > > + igt_skip_on(t->method == IGT_DRAW_MMAP_GTT && > > + !gem_has_mappable_ggtt(drm.fd)); > > + > > switch (gen) { > > case 2: > > max_height = 2048; > > @@ -3025,6 +3042,9 @@ static void basic_subtest(const struct test_mode *t) > > fb1 = params->primary.fb; > > > > for (r = 0, method = 0; method < IGT_DRAW_METHOD_COUNT; method++, r++) { > > + igt_skip_on(method == IGT_DRAW_MMAP_GTT && > > + !gem_has_mappable_ggtt(drm.fd)); > > + > > if (r == pattern->n_rects) { > > params->primary.fb = (params->primary.fb == fb1) ? &fb2 : fb1; > > > > -- > > 2.23.1 > > > > -- > Matt Roper > Graphics Software Engineer > VTT-OSGC Platform Enablement > Intel Corporation > (916) 356-2795 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev