summaryrefslogtreecommitdiff
path: root/tests/kms_plane_scaling.c
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2016-07-05 12:53:05 +0200
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>2016-07-26 14:49:59 +0200
commit5af520a1a0aec04b020ad808fdb90de49bd0e27b (patch)
tree37c3309cc7e9304b5b44bcffc0f7191d70d1497e /tests/kms_plane_scaling.c
parent0794ebefe1b9a1590f218b4055a83685ad8cb7eb (diff)
tests/kms: Clean up more users of unassigned pipes.
Use for_each_pipe_with_valid_output instead. This may increase test time slightly on the affected tests, because now outputs will be tested on every pipe instead of the first pipe. This will increase test coverage to all usable pipes though, so it shouldn't be an issue. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Diffstat (limited to 'tests/kms_plane_scaling.c')
-rw-r--r--tests/kms_plane_scaling.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index ad5404d9..39bb5e11 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -96,7 +96,7 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
if (s == COMMIT_LEGACY) {
int ret;
ret = drmModeSetCrtc(data->drm_fd,
- output->config.crtc->crtc_id,
+ plane->pipe->crtc_id,
data->fb_id1,
plane->pan_x, plane->pan_y,
&output->id,
@@ -186,10 +186,9 @@ static void test_plane_scaling(data_t *d)
igt_require(d->display.has_universal_planes);
igt_require(d->num_scalers);
- for_each_connected_output(display, output) {
+ for_each_pipe_with_valid_output(display, pipe, output) {
drmModeModeInfo *mode;
- pipe = output->config.pipe;
igt_output_set_pipe(output, pipe);
mode = igt_output_get_mode(output);