[igt-dev] [PATCH i-g-t 2/2] tests/i915/gem_ccs: Add suspend-resume subtest
Kamil Konieczny
kamil.konieczny at linux.intel.com
Mon Mar 21 16:04:21 UTC 2022
Hi,
only two comments, see below.
Dnia 2022-03-21 at 12:11:30 +0100, Zbigniew Kempczyński napisał(a):
> From: Apoorva Singh <apoorva1.singh at intel.com>
>
> Verify flatccs data won't be corrupted when device will be put
> to S0 (s2idle) state.
>
> v2: addressing review comments (Kamil)
> v3: fix memory leak (Kamil)
>
> Signed-off-by: Apoorva Singh <apoorva1.singh at intel.com>
> Cc: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
> ---
> tests/i915/gem_ccs.c | 50 +++++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 45 insertions(+), 5 deletions(-)
>
> diff --git a/tests/i915/gem_ccs.c b/tests/i915/gem_ccs.c
> index 7e104f6ad8..1f8f98ce62 100644
> --- a/tests/i915/gem_ccs.c
> +++ b/tests/i915/gem_ccs.c
> @@ -4,6 +4,7 @@
> */
>
> #include <errno.h>
> +#include <glib.h>
> #include <sys/ioctl.h>
> #include <sys/time.h>
> #include <malloc.h>
> @@ -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,23 @@ 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;
>
> 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 +196,33 @@ static void surf_copy(int i915,
> PROT_READ | PROT_WRITE);
> memcpy(ccscopy, ccsmap, ccssize);
>
> + if (suspend_resume) {
> + char *orig, *orig2, *newsum, *newsum2;
> +
> + 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);
> + newsum = g_compute_checksum_for_data(G_CHECKSUM_SHA1, (void *)ccsmap2, surf.dst.size);
> + newsum2 = g_compute_checksum_for_data(G_CHECKSUM_SHA1, (void *)mid->ptr, mid->size);
> +
> + munmap(ccsmap2, ccssize);
> + igt_assert(!strcmp(orig, newsum));
> + igt_assert(!strcmp(orig2, newsum2));
> + g_free(orig);
> + g_free(orig2);
> + g_free(newsum);
> + g_free(newsum2);
> + }
> +
> /* corrupt ccs */
> for (int i = 0; i < surf.dst.size / sizeof(uint32_t); i++)
> ccsmap[i] = i;
> @@ -209,6 +239,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);
> @@ -311,7 +342,8 @@ static void block_copy(int i915,
> ALLOC_STRATEGY_LOW_TO_HIGH, 0);
> }
>
> - surf_copy(i915, surf_ctx, &surf_e, surf_ahnd, src, mid, dst, run_id);
> + surf_copy(i915, surf_ctx, &surf_e, ahnd, src, mid, dst, run_id,
-------------------------------------------------- ^
imho this change to ahand should be in 1/2,
> + config->suspend_resume);
so the only change will be adding suspend_resume option.
>
> if (surf_ctx != ctx) {
> intel_ctx_destroy(i915, surf_ctx);
> @@ -508,6 +540,14 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
> block_copy_test(i915, &config, ctx, set);
> }
>
Add description to new test.
> + 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
>
Regards,
Kamil
More information about the igt-dev
mailing list