From c6f7941491ff8c4fa0a236c200eec5290e3adfa4 Mon Sep 17 00:00:00 2001 From: Karthik B S Date: Mon, 13 Jun 2022 11:54:47 +0530 Subject: tests/i915/kms_big_fb: Move intel_ibb_destroy out of test_cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All the clean up functions were moved to fixture in patch "2aff4179". But this causes an assert in intel_bb_destory() after the test passes, on configurations having eDP connected. So moving the intel_bb_destroy() call back to the original function. Fixes: 2aff41793e5f ("tests/i915/kms_big_fb: Move cleanup code to fixture") Signed-off-by: Karthik B S Acked-by: Zbigniew Kempczyński Reviewed-by: Swati Sharma --- tests/i915/kms_big_fb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/i915/kms_big_fb.c b/tests/i915/kms_big_fb.c index abf974bb..d50fde45 100644 --- a/tests/i915/kms_big_fb.c +++ b/tests/i915/kms_big_fb.c @@ -457,6 +457,8 @@ static bool test_pipe(data_t *data) if (data->format == DRM_FORMAT_C8) unset_lut(data); + intel_bb_destroy(data->ibb); + return ret; } @@ -549,6 +551,8 @@ max_hw_stride_async_flip_test(data_t *data) } igt_reset_timeout(); + intel_bb_destroy(data->ibb); + return true; } @@ -763,7 +767,6 @@ static void test_cleanup(data_t *data) igt_remove_fb(data->drm_fd, &data->big_fb_flip[1]); igt_remove_fb(data->drm_fd, &data->small_fb); - intel_bb_destroy(data->ibb); data->output = NULL; } -- cgit v1.2.3