[PATCH i-g-t 3/6] tests/kms_pipe_crc_basic: Use cleanup framework for framebuffers

[Kunal Joshi <kunal1.joshi@intel.com>]

Register framebuffers with igt_cleanup_register_fb() after creation.
The exit handler will automatically clean up registered framebuffers
on test exit, including early exits from failures, skips, or assertions.

Remove manual igt_remove_fb() calls at end of test functions since
the cleanup framework handles this automatically.

Signed-off-by: Kunal Joshi <kunal1.joshi@intel.com>
---
 tests/kms_pipe_crc_basic.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index fb2f5f8eb..455b44d38 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -32,6 +32,7 @@
 
 #include "igt.h"
 #include "igt_sysfs.h"
+#include "igt_cleanup.h"
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -158,6 +159,7 @@ static void test_read_crc(data_t *data, enum pipe pipe,
 					colors[c].g,
 					colors[c].b,
 					&data->fb);
+		igt_cleanup_register_fb(data->drm_fd, &data->fb);
 
 		igt_plane_set_fb(primary, &data->fb);
 
@@ -258,11 +260,14 @@ static void test_compare_crc(data_t *data, enum pipe pipe, igt_output_t *output,
 			DRM_FORMAT_MOD_LINEAR,
 			1.0, 1.0, 1.0,
 			&fb0);
+	igt_cleanup_register_fb(data->drm_fd, &fb0);
+
 	igt_create_color_fb(data->drm_fd,
 			mode->hdisplay, mode->vdisplay, plane_format,
 			DRM_FORMAT_MOD_LINEAR,
 			1.0, 1.0, 1.0,
 			&fb1);
+	igt_cleanup_register_fb(data->drm_fd, &fb1);
 
 	/* Flip FB0 with the primary plane & collect the CRC as ref CRC. */
 	igt_plane_set_fb(primary, &fb0);
@@ -284,9 +289,6 @@ static void test_compare_crc(data_t *data, enum pipe pipe, igt_output_t *output,
 	igt_plane_set_fb(primary, NULL);
 	igt_output_set_crtc(output, NULL);
 	igt_display_commit(display);
-
-	igt_remove_fb(data->drm_fd, &fb0);
-	igt_remove_fb(data->drm_fd, &fb1);
 }
 
 static void test_disable_crc_after_crtc(data_t *data, enum pipe pipe,
@@ -310,6 +312,7 @@ static void test_disable_crc_after_crtc(data_t *data, enum pipe pipe,
 			    DRM_FORMAT_XRGB8888,
 			    DRM_FORMAT_MOD_LINEAR,
 			    0.0, 1.0, 0.0, &data->fb);
+	igt_cleanup_register_fb(data->drm_fd, &data->fb);
 
 	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
 	igt_plane_set_fb(primary, &data->fb);
@@ -332,7 +335,6 @@ static void test_disable_crc_after_crtc(data_t *data, enum pipe pipe,
 	igt_plane_set_fb(primary, NULL);
 	igt_output_set_crtc(output, NULL);
 	igt_display_commit(display);
-	igt_remove_fb(data->drm_fd, &data->fb);
 }
 
 static bool pipe_output_combo_valid(igt_display_t *display,
-- 
2.43.0