[PATCH i-g-t 18/22] tests/kms_plane_multiple: Adopt to use allocator

Bhanuprakash Modem bhanuprakash.modem at intel.com
Fri Jun 25 12:54:12 UTC 2021


Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem at intel.com>
---
 tests/kms_plane_multiple.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c
index 93c6ea7d26..61e9004869 100644
--- a/tests/kms_plane_multiple.c
+++ b/tests/kms_plane_multiple.c
@@ -158,6 +158,10 @@ create_fb_for_mode_position(data_t *data, igt_output_t *output, drmModeModeInfo
 		}
 
 	igt_put_cairo_ctx(cr);
+
+	if (is_i915_device(data->drm_fd))
+		put_offset(data->fb[primary->index].ahnd,
+			   data->fb[primary->index].gem_handle);
 }
 
 
@@ -291,6 +295,7 @@ test_plane_position_with_output(data_t *data, enum pipe pipe,
 	int iterations = opt.iterations < 1 ? 1 : opt.iterations;
 	bool loop_forever;
 	char info[256];
+	uint64_t ahnd = 0;
 
 	if (opt.iterations == LOOP_FOREVER) {
 		loop_forever = true;
@@ -305,9 +310,15 @@ test_plane_position_with_output(data_t *data, enum pipe pipe,
 
 	get_reference_crc(data, output, pipe, &blue, tiling);
 
+	if (is_i915_device(data->drm_fd))
+		ahnd = get_reloc_ahnd(data->drm_fd, 0);
+
 	/* Find out how many planes are allowed simultaneously */
 	do {
 		c++;
+		for (int x = 0; x < c; x++)
+			data->fb[x].ahnd = ahnd;
+
 		prepare_planes(data, pipe, &blue, tiling, c, output);
 		err = igt_display_try_commit2(&data->display, COMMIT_ATOMIC);
 
@@ -331,6 +342,9 @@ test_plane_position_with_output(data_t *data, enum pipe pipe,
 
 	i = 0;
 	while (i < iterations || loop_forever) {
+		for (int x = 0; x < c; x++)
+			data->fb[x].ahnd = ahnd;
+
 		/* randomize planes and set up the holes */
 		prepare_planes(data, pipe, &blue, tiling, c, output);
 
@@ -351,6 +365,8 @@ test_plane_position_with_output(data_t *data, enum pipe pipe,
 		i++;
 	}
 
+	if (is_i915_device(data->drm_fd))
+		put_ahnd(ahnd);
 	test_fini(data, output, n_planes);
 }
 
-- 
2.20.1



More information about the Intel-gfx-trybot mailing list