From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id A298210E03A for ; Thu, 17 Mar 2022 16:46:29 +0000 (UTC) Date: Thu, 17 Mar 2022 17:46:25 +0100 From: Zbigniew =?utf-8?Q?Kempczy=C5=84ski?= To: igt-dev@lists.freedesktop.org Message-ID: References: <20220317102002.35243-1-zbigniew.kempczynski@intel.com> <20220317102002.35243-3-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220317102002.35243-3-zbigniew.kempczynski@intel.com> Subject: Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915/gem_ccs: Add suspend-resume subtest List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On Thu, Mar 17, 2022 at 11:20:02AM +0100, Zbigniew Kempczyński wrote: > From: Apoorva Singh > > Verify flatccs data won't be corrupted when device will be put > to S0 (s2idle) state. > > Signed-off-by: Apoorva Singh > Cc: Zbigniew Kempczyński Looks good for me: Reviewed-by: Zbigniew Kempczyński -- Zbigniew > --- > tests/i915/gem_ccs.c | 45 +++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 40 insertions(+), 5 deletions(-) > > diff --git a/tests/i915/gem_ccs.c b/tests/i915/gem_ccs.c > index 1a21e24597..5bf11c9a8e 100644 > --- a/tests/i915/gem_ccs.c > +++ b/tests/i915/gem_ccs.c > @@ -4,6 +4,7 @@ > */ > > #include > +#include > #include > #include > #include > @@ -40,6 +41,7 @@ struct test_config { > bool inplace; > bool surfcopy; > bool new_ctx; > + bool suspend_resume; > }; > > static void set_object(struct blt_copy_object *obj, > @@ -162,22 +164,24 @@ static void surf_copy(int i915, > const struct blt_copy_object *src, > const struct blt_copy_object *mid, > const struct blt_copy_object *dst, > - int run_id) > + int run_id, bool suspend_resume) > { > struct blt_copy_data blt = {}; > struct blt_block_copy_data_ext ext = {}; > struct blt_ctrl_surf_copy_data surf = {}; > - uint32_t bb, ccs, *ccsmap; > - uint64_t bb_size = 4096; > - uint64_t ccssize = mid->size / CCS_RATIO; > + uint32_t bb, ccs, ccs2, *ccsmap, *ccsmap2; > + uint64_t bb_size, ccssize = mid->size / CCS_RATIO; > uint32_t *ccscopy; > uint8_t uc_mocs = intel_get_uc_mocs(i915); > int result; > + char *orig, *orig2, *new, *new2; > > igt_assert(mid->compression); > ccscopy = (uint32_t *) malloc(ccssize); > + bb_size = 4096; > bb = gem_create_from_pool(i915, &bb_size, REGION_SMEM); > ccs = gem_create(i915, ccssize); > + ccs2 = gem_create(i915, ccssize); > > surf.i915 = i915; > surf.print_bb = param.print_bb; > @@ -193,6 +197,27 @@ static void surf_copy(int i915, > PROT_READ | PROT_WRITE); > memcpy(ccscopy, ccsmap, ccssize); > > + if (suspend_resume) { > + orig = g_compute_checksum_for_data(G_CHECKSUM_SHA1, (void *)ccsmap, surf.dst.size); > + orig2 = g_compute_checksum_for_data(G_CHECKSUM_SHA1, (void *)mid->ptr, mid->size); > + > + igt_system_suspend_autoresume(SUSPEND_STATE_FREEZE, SUSPEND_TEST_NONE); > + > + set_surf_object(&surf.dst, ccs2, REGION_SMEM, ccssize, > + 0, DIRECT_ACCESS); > + blt_ctrl_surf_copy(i915, ctx, e, ahnd, &surf); > + gem_sync(i915, surf.dst.handle); > + > + ccsmap2 = gem_mmap__device_coherent(i915, ccs2, 0, surf.dst.size, > + PROT_READ | PROT_WRITE); > + new = g_compute_checksum_for_data(G_CHECKSUM_SHA1, (void *)ccsmap2, surf.dst.size); > + new2 = g_compute_checksum_for_data(G_CHECKSUM_SHA1, (void *)mid->ptr, mid->size); > + > + igt_assert(!strcmp(orig, new)); > + igt_assert(!strcmp(orig2, new2)); > + munmap(ccsmap2, ccssize); > + } > + > /* corrupt ccs */ > for (int i = 0; i < surf.dst.size / sizeof(uint32_t); i++) > ccsmap[i] = i; > @@ -209,6 +234,7 @@ static void surf_copy(int i915, > set_blt_object(&blt.dst, dst); > set_object_ext(&ext.src, mid->compression_type, mid->x2, mid->y2, SURFACE_TYPE_2D); > set_object_ext(&ext.dst, 0, dst->x2, dst->y2, SURFACE_TYPE_2D); > + bb_size = 4096; > bb = gem_create_from_pool(i915, &bb_size, REGION_SMEM); > set_batch(&blt.bb, bb, bb_size, REGION_SMEM); > blt_block_copy(i915, ctx, e, ahnd, &blt, &ext); > @@ -299,7 +325,8 @@ static void block_copy(int i915, > if (config->new_ctx) > surf_ctx = intel_ctx_create(i915, &ctx->cfg); > > - surf_copy(i915, surf_ctx, e, ahnd, src, mid, dst, run_id); > + surf_copy(i915, surf_ctx, e, ahnd, src, mid, dst, run_id, > + config->suspend_resume); > > if (surf_ctx != ctx) > intel_ctx_destroy(i915, surf_ctx); > @@ -494,6 +521,14 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL) > block_copy_test(i915, &config, ctx, set); > } > > + igt_subtest_with_dynamic("suspend-resume") { > + struct test_config config = { .compression = true, > + .surfcopy = true, > + .suspend_resume = true }; > + > + block_copy_test(i915, &config, ctx, set); > + } > + > igt_fixture { > igt_disallow_hang(i915, hang); > close(i915); > -- > 2.32.0 >