From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A16110E39B for ; Wed, 7 Sep 2022 07:03:32 +0000 (UTC) From: Bhanuprakash Modem To: igt-dev@lists.freedesktop.org, karthik.b.s@intel.com Date: Wed, 7 Sep 2022 12:31:08 +0530 Message-Id: <20220907070108.535793-1-bhanuprakash.modem@intel.com> In-Reply-To: <20220906141238.508502-1-bhanuprakash.modem@intel.com> References: <20220906141238.508502-1-bhanuprakash.modem@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [i-g-t 2/2] tests/kms_atomic_transition: Test Cleanup List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Sanitize the system state before starting the subtest. Signed-off-by: Bhanuprakash Modem --- tests/kms_atomic_transition.c | 77 +++++++++++++++++------------------ 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c index 3f0ceb3d..4c62e909 100644 --- a/tests/kms_atomic_transition.c +++ b/tests/kms_atomic_transition.c @@ -47,9 +47,10 @@ struct plane_parms { typedef struct { int drm_fd; - struct igt_fb fb, argb_fb, sprite_fb; + struct igt_fb fbs[2], argb_fb, sprite_fb; igt_display_t display; bool extended; + igt_pipe_crc_t *pipe_crcs[IGT_MAX_PIPES]; } data_t; /* globals for fence support */ @@ -62,10 +63,11 @@ run_primary_test(data_t *data, enum pipe pipe, igt_output_t *output) { drmModeModeInfo *mode; igt_plane_t *primary; - igt_fb_t fb; + igt_fb_t *fb = &data->fbs[0]; int i, ret; unsigned flags = DRM_MODE_ATOMIC_TEST_ONLY | DRM_MODE_ATOMIC_ALLOW_MODESET; + igt_display_reset(&data->display); igt_output_set_pipe(output, pipe); primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); @@ -76,9 +78,9 @@ run_primary_test(data_t *data, enum pipe pipe, igt_output_t *output) igt_skip_on_f(ret == -EINVAL, "Primary plane cannot be disabled separately from output\n"); igt_create_fb(data->drm_fd, mode->hdisplay, mode->vdisplay, - DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &fb); + DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, fb); - igt_plane_set_fb(primary, &fb); + igt_plane_set_fb(primary, fb); for (i = 0; i < 4; i++) { igt_display_commit2(&data->display, COMMIT_ATOMIC); @@ -87,20 +89,15 @@ run_primary_test(data_t *data, enum pipe pipe, igt_output_t *output) igt_wait_for_vblank(data->drm_fd, data->display.pipes[pipe].crtc_offset); - igt_plane_set_fb(primary, (i & 1) ? &fb : NULL); + igt_plane_set_fb(primary, (i & 1) ? fb : NULL); igt_display_commit2(&data->display, COMMIT_ATOMIC); if (i & 1) igt_wait_for_vblank(data->drm_fd, data->display.pipes[pipe].crtc_offset); - igt_plane_set_fb(primary, (i & 1) ? NULL : &fb); + igt_plane_set_fb(primary, (i & 1) ? NULL : fb); } - - igt_plane_set_fb(primary, NULL); - igt_output_set_pipe(output, PIPE_NONE); - igt_remove_fb(data->drm_fd, &fb); - igt_display_commit2(&data->display, COMMIT_ATOMIC); } static void *fence_inc_thread(void *arg) @@ -507,7 +504,7 @@ run_transition_test(data_t *data, enum pipe pipe, igt_output_t *output, override_mode.flags ^= DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_NHSYNC; igt_create_fb(data->drm_fd, mode->hdisplay, mode->vdisplay, - DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &data->fb); + DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &data->fbs[0]); igt_output_set_pipe(output, pipe); @@ -521,7 +518,7 @@ run_transition_test(data_t *data, enum pipe pipe, igt_output_t *output, igt_output_set_pipe(output, pipe); } - setup_parms(data, pipe, mode, &data->fb, &data->argb_fb, &data->sprite_fb, parms, &iter_max); + setup_parms(data, pipe, mode, &data->fbs[0], &data->argb_fb, &data->sprite_fb, parms, &iter_max); igt_display_commit2(&data->display, COMMIT_ATOMIC); @@ -663,7 +660,8 @@ static void test_cleanup(data_t *data, enum pipe pipe, igt_output_t *output, boo igt_display_commit2(&data->display, COMMIT_ATOMIC); - igt_remove_fb(data->drm_fd, &data->fb); + igt_remove_fb(data->drm_fd, &data->fbs[0]); + igt_remove_fb(data->drm_fd, &data->fbs[1]); igt_remove_fb(data->drm_fd, &data->argb_fb); igt_remove_fb(data->drm_fd, &data->sprite_fb); } @@ -803,10 +801,8 @@ static void collect_crcs_mask(igt_pipe_crc_t **pipe_crcs, unsigned mask, igt_crc static void run_modeset_tests(data_t *data, int howmany, bool nonblocking, bool fencing) { - struct igt_fb fbs[2]; int i, j; unsigned iter_max; - igt_pipe_crc_t *pipe_crcs[IGT_MAX_PIPES] = { 0 }; igt_output_t *output; uint16_t width = 0, height = 0; @@ -823,9 +819,9 @@ retry: } igt_create_pattern_fb(data->drm_fd, width, height, - DRM_FORMAT_XRGB8888, 0, &fbs[0]); + DRM_FORMAT_XRGB8888, 0, &data->fbs[0]); igt_create_color_pattern_fb(data->drm_fd, width, height, - DRM_FORMAT_XRGB8888, 0, .5, .5, .5, &fbs[1]); + DRM_FORMAT_XRGB8888, 0, .5, .5, .5, &data->fbs[1]); for_each_pipe(&data->display, i) { igt_pipe_t *pipe = &data->display.pipes[i]; @@ -836,7 +832,7 @@ retry: j += 1; if (is_i915_device(data->drm_fd)) - pipe_crcs[i] = igt_pipe_crc_new(data->drm_fd, i, INTEL_PIPE_CRC_SOURCE_AUTO); + data->pipe_crcs[i] = igt_pipe_crc_new(data->drm_fd, i, INTEL_PIPE_CRC_SOURCE_AUTO); for_each_valid_output_on_pipe(&data->display, i, output) { if (output->pending_pipe != PIPE_NONE) @@ -848,8 +844,8 @@ retry: } if (mode) { - igt_plane_set_fb(plane, &fbs[1]); - igt_fb_set_size(&fbs[1], plane, mode->hdisplay, mode->vdisplay); + igt_plane_set_fb(plane, &data->fbs[1]); + igt_fb_set_size(&data->fbs[1], plane, mode->hdisplay, mode->vdisplay); igt_plane_set_size(plane, mode->hdisplay, mode->vdisplay); if (fencing) @@ -883,13 +879,13 @@ retry: if (igt_hweight(i) > howmany) continue; - event_mask = set_combinations(data, i, &fbs[0]); + event_mask = set_combinations(data, i, &data->fbs[0]); if (!event_mask && i) continue; commit_display(data, event_mask, nonblocking); - collect_crcs_mask(pipe_crcs, i, crcs[0]); + collect_crcs_mask(data->pipe_crcs, i, crcs[0]); for (j = iter_max - 1; j > i + 1; j--) { if (igt_hweight(j) > howmany) @@ -898,28 +894,28 @@ retry: if (igt_hweight(i) < howmany && igt_hweight(j) < howmany) continue; - event_mask = set_combinations(data, j, &fbs[1]); + event_mask = set_combinations(data, j, &data->fbs[1]); if (!event_mask) continue; commit_display(data, event_mask, nonblocking); - collect_crcs_mask(pipe_crcs, j, crcs[1]); + collect_crcs_mask(data->pipe_crcs, j, crcs[1]); refresh_primaries(data, j); commit_display(data, j, nonblocking); - collect_crcs_mask(pipe_crcs, j, crcs[2]); + collect_crcs_mask(data->pipe_crcs, j, crcs[2]); - event_mask = set_combinations(data, i, &fbs[0]); + event_mask = set_combinations(data, i, &data->fbs[0]); if (!event_mask) continue; commit_display(data, event_mask, nonblocking); - collect_crcs_mask(pipe_crcs, i, crcs[3]); + collect_crcs_mask(data->pipe_crcs, i, crcs[3]); refresh_primaries(data, i); commit_display(data, i, nonblocking); - collect_crcs_mask(pipe_crcs, i, crcs[4]); + collect_crcs_mask(data->pipe_crcs, i, crcs[4]); if (!is_i915_device(data->drm_fd)) continue; @@ -935,17 +931,6 @@ retry: } } } - - set_combinations(data, 0, NULL); - igt_display_commit2(&data->display, COMMIT_ATOMIC); - - if (is_i915_device(data->drm_fd)) { - for_each_pipe(&data->display, i) - igt_pipe_crc_free(pipe_crcs[i]); - } - - igt_remove_fb(data->drm_fd, &fbs[1]); - igt_remove_fb(data->drm_fd, &fbs[0]); } static void run_modeset_transition(data_t *data, int requested_outputs, bool nonblocking, bool fencing) @@ -980,6 +965,18 @@ static void run_modeset_transition(data_t *data, int requested_outputs, bool non igt_dynamic_f("%ix-outputs", requested_outputs) run_modeset_tests(data, requested_outputs, nonblocking, fencing); + + /* Cleanup */ + set_combinations(data, 0, NULL); + igt_display_commit2(&data->display, COMMIT_ATOMIC); + + if (is_i915_device(data->drm_fd)) { + for_each_pipe(&data->display, pipe) + igt_pipe_crc_free(data->pipe_crcs[pipe]); + } + + igt_remove_fb(data->drm_fd, &data->fbs[0]); + igt_remove_fb(data->drm_fd, &data->fbs[1]); } static int opt_handler(int opt, int opt_index, void *_data) -- 2.35.1