[PATCH i-g-t 3/3] tests/kms: Use for_each_plane_format()

[Ville Syrjala <ville.syrjala@linux.intel.com>]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Replace the open coded copies of for_each_plane_format()
with the real thing.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 tests/kms_plane_scaling.c | 8 ++++----
 tests/kms_rotation_crc.c  | 7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index fde8b8370c9f..90dc5593579f 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -800,16 +800,16 @@ test_scaler_with_pixel_format_crtc(data_t *d, double sf_plane,
 
 	for_each_plane_on_crtc(crtc, plane) {
 		struct igt_vec tested_formats;
+		int iteration = 0;
+		uint32_t format;
 
 		if (plane->type == DRM_PLANE_TYPE_CURSOR)
 			continue;
 
 		igt_vec_init(&tested_formats, sizeof(uint32_t));
 
-		for (int j = 0; j < plane->drm_plane->count_formats; j++) {
-			uint32_t format = plane->drm_plane->formats[j];
-
-			if (!test_crtc_iteration(d, crtc, j))
+		for_each_plane_format(plane, format) {
+			if (!test_crtc_iteration(d, crtc, iteration++))
 				continue;
 
 			if (test_format(d, &tested_formats, format) &&
diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
index 4420053f1c6d..4a249ed21801 100644
--- a/tests/kms_rotation_crc.c
+++ b/tests/kms_rotation_crc.c
@@ -606,7 +606,7 @@ static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_form
 
 	for_each_crtc_with_valid_output(display, crtc, output) {
 		igt_plane_t *plane;
-		int i, j, c;
+		int i, c;
 
 		igt_display_reset(display);
 
@@ -678,12 +678,11 @@ static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_form
 
 			if (!data->override_fmt) {
 				struct igt_vec tested_formats;
+				uint32_t format;
 
 				igt_vec_init(&tested_formats, sizeof(uint32_t));
 
-				for (j = 0; j < plane->drm_plane->count_formats; j++) {
-					uint32_t format = plane->drm_plane->formats[j];
-
+				for_each_plane_format(plane, format) {
 					if (!test_format(data, &tested_formats, format))
 						continue;
 
-- 
2.52.0