[PATCH i-g-t v2] Subject: [PATCH i-g-t] 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>
---
v2:
 - Cc Swati and Karthik.
 - split condition with additional branch
 lib/igt_kms.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index e20307923..ba8223dd2 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -3534,7 +3534,13 @@ igt_plane_t *igt_crtc_get_plane_type(igt_crtc_t *crtc, int plane_type)
 		}
 	}
 
-	igt_require_f(plane_idx >= 0 && plane_idx < crtc->n_planes,
+	if (plane_idx >= 0 && plane_idx < crtc->n_planes)
+		igt_require_f(crtc->planes[plane_idx].type == plane_type,
+			      "Valid pipe->planes idx not found. found plane_idx=%d, "
+			      "type=%d, requested plane_type=%d\n",
+			      plane_idx, crtc->planes[plane_idx].type, plane_type);
+
+	igt_require_f(plane_idx >= 0 && plane_idx < crtc->n_planes,
 		      "Valid pipe->planes idx not found. plane_idx=%d plane_type=%d n_planes=%d\n",
 		      plane_idx, plane_type, crtc->n_planes);
 
-- 
2.55.0.795.g602f6c329a-goog