diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2018-01-30 11:14:20 +0100 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2018-02-05 13:41:17 +0100 |
| commit | 51a1f428ac88c8fd685ba43334e9ac6f10f5b45f (patch) | |
| tree | bd204d1048a4b8ad070229498380e08b298e6e1e /tests/kms_atomic.c | |
| parent | 2646ae1d5c83c550995b3d10683eb57707f714d6 (diff) | |
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 <maarten.lankhorst@linux.intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
Diffstat (limited to 'tests/kms_atomic.c')
| -rw-r--r-- | tests/kms_atomic.c | 8 |
1 files changed, 8 insertions, 0 deletions
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); |