[PATCH i-g-t 11/22] tests/kms_ccs: Adopt to use allocator

[Bhanuprakash Modem]

Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
---
 tests/kms_ccs.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tests/kms_ccs.c b/tests/kms_ccs.c
index 62850c1b26..7584a66107 100644
--- a/tests/kms_ccs.c
+++ b/tests/kms_ccs.c
@@ -352,6 +352,8 @@ static void generate_fb(data_t *data, struct igt_fb *fb,
 	if (check_ccs_planes)
 		check_all_ccs_planes(data->drm_fd, fb, cc_color, !(data->flags & TEST_RANDOM));
 
+	put_offset(fb->ahnd, fb->gem_handle);
+
 	fb->fb_id = f.fb_id;
 }
 
@@ -380,7 +382,7 @@ static igt_plane_t *compatible_main_plane(data_t *data)
 }
 
 static bool try_config(data_t *data, enum test_fb_flags fb_flags,
-		       igt_crc_t *crc)
+		       igt_crc_t *crc, uint64_t ahnd)
 {
 	igt_display_t *display = &data->display;
 	igt_plane_t *primary = compatible_main_plane(data);
@@ -412,6 +414,7 @@ static bool try_config(data_t *data, enum test_fb_flags fb_flags,
 
 	fb_width = min(MAX_SPRITE_PLANE_WIDTH, fb_width);
 
+	fb.ahnd = fb_sprite.ahnd = ahnd;
 	if (data->plane && fb_flags & FB_COMPRESSED) {
 		if (!igt_plane_has_format_mod(data->plane, data->format,
 					      data->ccs_modifier))
@@ -475,12 +478,13 @@ static int test_ccs(data_t *data)
 {	int valid_tests = 0;
 	igt_crc_t crc, ref_crc;
 	enum test_fb_flags fb_flags = 0;
+	uint64_t ahnd = get_reloc_ahnd(data->drm_fd, 0);
 
 	if (data->flags & TEST_CRC) {
 		data->pipe_crc = igt_pipe_crc_new(data->drm_fd, data->pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
 
-		if (try_config(data, fb_flags | FB_COMPRESSED, &ref_crc) &&
-		    try_config(data, fb_flags, &crc)) {
+		if (try_config(data, fb_flags | FB_COMPRESSED, &ref_crc, ahnd) &&
+		    try_config(data, fb_flags, &crc, ahnd)) {
 			igt_assert_crc_equal(&crc, &ref_crc);
 			valid_tests++;
 		}
@@ -490,19 +494,19 @@ static int test_ccs(data_t *data)
 	}
 
 	if (data->flags & TEST_RANDOM)
-		valid_tests += try_config(data, fb_flags | FB_COMPRESSED | FB_RANDOM, NULL);
+		valid_tests += try_config(data, fb_flags | FB_COMPRESSED | FB_RANDOM, NULL, ahnd);
 
 	if (data->flags & TEST_BAD_PIXEL_FORMAT ||
 	    data->flags & TEST_BAD_ROTATION_90 ||
 	    data->flags & TEST_NO_AUX_BUFFER ||
 	    data->flags & TEST_BAD_CCS_HANDLE) {
-		valid_tests += try_config(data, fb_flags | FB_COMPRESSED, NULL);
+		valid_tests += try_config(data, fb_flags | FB_COMPRESSED, NULL, ahnd);
 	}
 
 	if (data->flags & TEST_BAD_AUX_STRIDE) {
-		valid_tests += try_config(data, fb_flags | FB_COMPRESSED | FB_MISALIGN_AUX_STRIDE , NULL);
-		valid_tests += try_config(data, fb_flags | FB_COMPRESSED | FB_SMALL_AUX_STRIDE , NULL);
-		valid_tests += try_config(data, fb_flags | FB_COMPRESSED | FB_ZERO_AUX_STRIDE , NULL);
+		valid_tests += try_config(data, fb_flags | FB_COMPRESSED | FB_MISALIGN_AUX_STRIDE , NULL, ahnd);
+		valid_tests += try_config(data, fb_flags | FB_COMPRESSED | FB_SMALL_AUX_STRIDE , NULL, ahnd);
+		valid_tests += try_config(data, fb_flags | FB_COMPRESSED | FB_ZERO_AUX_STRIDE , NULL, ahnd);
 	}
 
 	return valid_tests;
-- 
2.20.1