[PATCH i-g-t v7 1/3] lib/igt_kms: Add helper to get encoder index

[Jessica Zhang]

From: Esha Bharadwaj <quic_ebharadw at quicinc.com>

Move the get_encoder_idx() helper within the kms_setmode test to
lib/igt_kms

Signed-off-by: Esha Bharadwaj <quic_ebharadw at quicinc.com>
Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
Reviewed-by: Swati Sharma <swati2.sharma at intel.com>
Signed-off-by: Jessica Zhang <quic_jesszhan at quicinc.com>
---
Changes in v7:
- Added newline before igt_assert (Kamil)
- Added error message for igt_assert (Kamil)
- Fixed alignment issue in kms_setmode (Swati)
---
 lib/igt_kms.c       | 17 +++++++++++++++++
 lib/igt_kms.h       |  1 +
 tests/kms_setmode.c | 16 +++-------------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 0ba1afb08..ab35a11f8 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -3324,6 +3324,23 @@ void igt_display_fini(igt_display_t *display)
 	display->planes = NULL;
 }
 
+/**
+ * kmstest_get_encoder_idx:
+ * @resources: libdrm resources pointer
+ * @encoder: libdrm encoder pointer
+ *
+ * Get encoder index from encoder_id
+ */
+int kmstest_get_encoder_idx(drmModeRes *resources, drmModeEncoder *encoder)
+{
+	for (int i = 0; i < resources->count_encoders; i++)
+		if (resources->encoders[i] == encoder->encoder_id)
+			return i;
+
+	igt_assert_f(0, "Error: cannot find encoder id %d in range of 0...%d\n",
+		     encoder->encoder_id, resources->count_encoders - 1);
+}
+
 static void igt_display_refresh(igt_display_t *display)
 {
 	igt_output_t *output;
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 7227f0b0e..55c24149a 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -314,6 +314,7 @@ void kmstest_dumb_destroy(int fd, uint32_t handle);
 void kmstest_wait_for_pageflip(int fd);
 void kmstest_wait_for_pageflip_timeout(int fd, uint64_t timeout_us);
 unsigned int kmstest_get_vblank(int fd, int pipe, unsigned int flags);
+int kmstest_get_encoder_idx(drmModeRes *resources, drmModeEncoder *encoder);
 
 bool kms_has_vblank(int fd);
 
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index d61cfeb9a..b4c7c052b 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -268,16 +268,6 @@ found:
 	*mode_ret = *mode;
 }
 
-static int get_encoder_idx(drmModeRes *resources, drmModeEncoder *encoder)
-{
-	int i;
-
-	for (i = 0; i < resources->count_encoders; i++)
-		if (resources->encoders[i] == encoder->encoder_id)
-			return i;
-	igt_assert(0);
-}
-
 static void get_crtc_config_str(struct crtc_config *crtc, char *buf,
 				size_t buf_size)
 {
@@ -370,8 +360,8 @@ static void setup_crtcs(const struct test_config *tconf,
 			config_valid &= !!(encoder->possible_crtcs &
 					  (1 << crtc->crtc_idx));
 
-			encoder_mask |= 1 << get_encoder_idx(resources,
-							     encoder);
+			encoder_mask |= 1 << kmstest_get_encoder_idx(resources,
+								     encoder);
 			config_valid &= !(encoder_mask &
 					  ~encoder->possible_clones);
 
@@ -396,7 +386,7 @@ static void setup_crtcs(const struct test_config *tconf,
 			idx = cconf[i].crtc_idx;
 
 		encoder = drmModeGetEncoder(drm_fd, connector->encoders[idx]);
-		encoder_usage_count[get_encoder_idx(resources, encoder)]++;
+		encoder_usage_count[kmstest_get_encoder_idx(resources, encoder)]++;
 		drmModeFreeEncoder(encoder);
 	}
 	for (i = 0; i < resources->count_encoders; i++)

-- 
2.48.1