summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2017-09-27 12:25:37 +0200
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2017-10-03 09:39:40 +0200
commit76c7a71a13fd21fbf58ec2903c25acc980b7ddaf (patch)
tree6061d06f73320d2a4a9ad4d5ac1a63c7ea76315a /tests
parentb5404f8435f828ca039a2e46be629b3d4c92465b (diff)
lib/igt_kms: Change output->pending_crtc_idx_mask to output->pending_pipe
igt_output_set_pipe with PIPE_ANY used to mean that we bind the output to any pipe, but this is now a deprecated alias for PIPE_NONE, and means the output will be unbound. Because of this it's better to change output->pending_crtc_idx_mask to an enum pipe, because only a single choice may be given for a pipe. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Mika Kahola <mika.kahola@intel.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/kms_atomic_transition.c4
-rw-r--r--tests/kms_busy.c2
-rw-r--r--tests/kms_cursor_legacy.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
index 48823a09..2ae75f2d 100644
--- a/tests/kms_atomic_transition.c
+++ b/tests/kms_atomic_transition.c
@@ -644,7 +644,7 @@ static unsigned set_combinations(igt_display_t *display, unsigned mask, struct i
event_mask |= 1 << pipe;
for_each_valid_output_on_pipe(display, pipe, output) {
- if (output->pending_crtc_idx_mask)
+ if (output->pending_pipe != PIPE_NONE)
continue;
mode = igt_output_get_mode(output);
@@ -726,7 +726,7 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock
pipe_crcs[i] = igt_pipe_crc_new(display->drm_fd, i, INTEL_PIPE_CRC_SOURCE_AUTO);
for_each_valid_output_on_pipe(display, i, output) {
- if (output->pending_crtc_idx_mask)
+ if (output->pending_pipe != PIPE_NONE)
continue;
igt_output_set_pipe(output, i);
diff --git a/tests/kms_busy.c b/tests/kms_busy.c
index f430beaf..0828a8b3 100644
--- a/tests/kms_busy.c
+++ b/tests/kms_busy.c
@@ -41,7 +41,7 @@ set_fb_on_crtc(igt_display_t *dpy, int pipe, struct igt_fb *fb)
drmModeModeInfoPtr mode;
igt_plane_t *primary;
- if (output->pending_crtc_idx_mask)
+ if (output->pending_pipe != PIPE_NONE)
continue;
igt_output_set_pipe(output, pipe);
diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
index 65a001a9..fc752683 100644
--- a/tests/kms_cursor_legacy.c
+++ b/tests/kms_cursor_legacy.c
@@ -155,7 +155,7 @@ static igt_output_t *set_fb_on_crtc(igt_display_t *display, enum pipe pipe, stru
drmModeModeInfoPtr mode;
igt_plane_t *primary;
- if (output->pending_crtc_idx_mask)
+ if (output->pending_pipe != PIPE_NONE)
continue;
igt_output_set_pipe(output, pipe);