[PATCH i-g-t v4] lib/igt_kms: Fix plane type check in igt_crtc_get_plane_type

[Jing-Ping Jan <jingpingjan@google.com>]

Verify plane type matches requested type to avoid returning invalid
planes.

Fixes: 5426dc0a889a ("lib/kms: Skip rather than fail when a suitable plane can't be found")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Swati Sharma <swati2.sharma@intel.com>
Cc: Karthik B S <karthik.b.s@intel.com>
Signed-off-by: Jing-Ping Jan <jingpingjan@google.com>
---
v4:
 - Remove unintended changes
v3:
 - Moving condition after old one
 - print type string instead of enum value
v2:
 - Cc Swati and Karthik.
 - split condition with additional branch

 lib/igt_kms.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index e20307923..65bb556bf 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -3538,6 +3538,13 @@ igt_plane_t *igt_crtc_get_plane_type(igt_crtc_t *crtc, int plane_type)
 		      "Valid pipe->planes idx not found. plane_idx=%d plane_type=%d n_planes=%d\n",
 		      plane_idx, plane_type, crtc->n_planes);
 
+	igt_require_f(crtc->planes[plane_idx].type == plane_type,
+		      "Valid pipe->planes idx not found. found plane_idx=%d, "
+		      "type=%s, requested plane_type=%s\n", plane_idx,
+		      crtc->planes[plane_idx].type == DRM_PLANE_TYPE_PRIMARY ? "PRIMARY"
+									     : "CURSOR",
+		      plane_type == DRM_PLANE_TYPE_PRIMARY ? "PRIMARY" : "CURSOR");
+
 	return &crtc->planes[plane_idx];
 }
 
-- 
2.55.0.141.g00534a21ce-goog