[Intel-gfx] [PATCH i-g-t v5 2/6] lib/igt_kms: Fix off-by-one bug on skip of missing pipe

Gabriel Krisman Bertazi krisman at collabora.co.uk
Wed Nov 15 19:36:57 UTC 2017


display->n_pipes is zero-indexed, so N returned in
igt_display_get_n_pipes is already not a valid pipe.  This patch
prevents kms_ccs from going nuts when testing the first unexisting pipe.

Signed-off-by: Gabriel Krisman Bertazi <krisman at collabora.co.uk>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
Reviewed-by: Ben Widawsky <ben at bwidawsk.net>
---
 lib/igt_kms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 1d26b8ddbf43..e161f4309439 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1817,7 +1817,7 @@ void igt_display_require_output_on_pipe(igt_display_t *display, enum pipe pipe)
 {
 	igt_output_t *output;
 
-	igt_skip_on_f(igt_display_get_n_pipes(display) < pipe,
+	igt_skip_on_f(pipe >= igt_display_get_n_pipes(display),
 		      "Pipe %s does not exist.\n", kmstest_pipe_name(pipe));
 
 	for_each_valid_output_on_pipe(display, pipe, output)
-- 
2.11.0



More information about the Intel-gfx mailing list