From 51a1f428ac88c8fd685ba43334e9ac6f10f5b45f Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Tue, 30 Jan 2018 11:14:20 +0100 Subject: tests/kms_atomic: Add the test for CRTC_ID/FB_ID mismatch. This check was missing, and caused a WARN_ON that dates back to the original design of atomic. Signed-off-by: Maarten Lankhorst Acked-by: Daniel Vetter Reviewed-by: Mika Kahola --- tests/kms_atomic.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tests/kms_atomic.c') diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c index 9204d7e1..2e21b53b 100644 --- a/tests/kms_atomic.c +++ b/tests/kms_atomic.c @@ -485,6 +485,10 @@ static void plane_invalid_params(igt_pipe_t *pipe, igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, pipe->values[IGT_CRTC_MODE_ID]); plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL); + /* Valid, but invalid because CRTC_ID is set. */ + igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, 0); + plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL); + igt_plane_set_fb(plane, fb); plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE); @@ -501,6 +505,10 @@ static void plane_invalid_params(igt_pipe_t *pipe, igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, pipe->values[IGT_CRTC_MODE_ID]); plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL); + /* Valid, but invalid because FB_ID is set. */ + igt_plane_set_prop_value(plane, IGT_PLANE_CRTC_ID, 0); + plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, EINVAL); + igt_plane_set_fb(plane, fb); plane_commit(plane, COMMIT_ATOMIC, ATOMIC_RELAX_NONE); -- cgit v1.2.3