diff options
author | Kunal Joshi <kunal1.joshi@intel.com> | 2024-04-22 11:04:49 +0530 |
---|---|---|
committer | Bhanuprakash Modem <bhanuprakash.modem@intel.com> | 2024-04-23 14:19:54 +0530 |
commit | b988e57ffa53d305921ff506ba1eb8441bc88811 (patch) | |
tree | db7392226211ae5de0946bdf5ab77bcdc3c6fcf2 | |
parent | 0d2ec80722e2656770f1c547cb713a0e082b2bf8 (diff) |
tests/intel/kms_big_joiner: fix crash in multi joiner test
Fix test from crashing on out of bound.
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Cc: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Signed-off-by: Kunal Joshi <kunal1.joshi@intel.com>
Reviewed-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
-rw-r--r-- | tests/intel/kms_big_joiner.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/intel/kms_big_joiner.c b/tests/intel/kms_big_joiner.c index 078f76ac1..88923be6b 100644 --- a/tests/intel/kms_big_joiner.c +++ b/tests/intel/kms_big_joiner.c @@ -162,7 +162,7 @@ static void test_single_joiner(data_t *data, int output_count, bool force_joiner static void test_multi_joiner(data_t *data, int output_count, bool force_joiner) { - int i; + int i, cleanup; uint32_t available_pipe_mask; enum pipe pipe, master_pipe; igt_output_t **outputs; @@ -173,6 +173,7 @@ static void test_multi_joiner(data_t *data, int output_count, bool force_joiner) available_pipe_mask = BIT(data->n_pipes) - 1; outputs = force_joiner ? data->non_big_joiner_output : data->big_joiner_output; + cleanup = 0; igt_display_reset(&data->display); igt_display_commit2(&data->display, COMMIT_ATOMIC); @@ -183,6 +184,7 @@ static void test_multi_joiner(data_t *data, int output_count, bool force_joiner) master_pipe = setup_pipe(data, output, pipe, available_pipe_mask); if (master_pipe == PIPE_NONE) continue; + cleanup++; mode = igt_output_get_mode(output); primary[i] = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); igt_create_pattern_fb(data->drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, @@ -195,7 +197,7 @@ static void test_multi_joiner(data_t *data, int output_count, bool force_joiner) } } igt_display_commit2(&data->display, COMMIT_ATOMIC); - for (i = 0; i < output_count; i++) { + for (i = 0; i < cleanup; i++) { igt_plane_set_fb(primary[i], NULL); igt_remove_fb(data->drm_fd, &fb[i]); } |