From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Looks like I fumbled things when I made kms_chv_cursor_fail iterate
over all pipes. It fails to check that the pipe actually exists, and
so fails on < 3 pipe platforms. Add the necessary checks to skip
on non-existing pipes.
Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
---
tests/kms_chv_cursor_fail.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/kms_chv_cursor_fail.c b/tests/kms_chv_cursor_fail.c
index 2ccdd4106597..83af07f9b968 100644
--- a/tests/kms_chv_cursor_fail.c
+++ b/tests/kms_chv_cursor_fail.c
@@ -394,24 +394,28 @@ int main(int argc, char **argv)
igt_subtest_f("pipe-%s-%dx%d-left-edge",
kmstest_pipe_name(data.pipe),
data.curw, data.curh) {
+ igt_require(data.pipe < data.display.n_pipes);
igt_require(data.curw <= max_curw && data.curh <= max_curh);
test_crtc(&data, EDGE_LEFT);
}
igt_subtest_f("pipe-%s-%dx%d-right-edge",
kmstest_pipe_name(data.pipe),
data.curw, data.curh) {
+ igt_require(data.pipe < data.display.n_pipes);
igt_require(data.curw <= max_curw && data.curh <= max_curh);
test_crtc(&data, EDGE_RIGHT);
}
igt_subtest_f("pipe-%s-%dx%d-top-edge",
kmstest_pipe_name(data.pipe),
data.curw, data.curh) {
+ igt_require(data.pipe < data.display.n_pipes);
igt_require(data.curw <= max_curw && data.curh <= max_curh);
test_crtc(&data, EDGE_TOP);
}
igt_subtest_f("pipe-%s-%dx%d-bottom-edge",
kmstest_pipe_name(data.pipe),
data.curw, data.curh) {
+ igt_require(data.pipe < data.display.n_pipes);
igt_require(data.curw <= max_curw && data.curh <= max_curh);
test_crtc(&data, EDGE_BOTTOM);
}
--
2.4.10
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
