From 8facccfae4c05275ae2fb31bb1948b1fea9a7687 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Tue, 8 Jul 2014 18:28:53 +0100 Subject: kms_rotation_crc: Don't store 'pipe' in the state This variable is only needed for prepare_crtc(), need need to put it in the test state. Signed-off-by: Damien Lespiau --- tests/kms_rotation_crc.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c index 81d001b2..308e8846 100644 --- a/tests/kms_rotation_crc.c +++ b/tests/kms_rotation_crc.c @@ -58,7 +58,6 @@ typedef struct { igt_display_t display; igt_output_t *output; igt_plane_t *plane; - int pipe; struct igt_fb fb; igt_crc_t ref_crc; igt_pipe_crc_t *pipe_crc; @@ -90,14 +89,14 @@ paint_squares(data_t *data, struct igt_fb *fb, drmModeModeInfo *mode, cairo_destroy(cr); } -static bool prepare_crtc(data_t *data) +static bool prepare_crtc(data_t *data, enum pipe pipe) { drmModeModeInfo *mode; igt_display_t *display = &data->display; igt_output_t *output = data->output; int fb_id; - igt_output_set_pipe(output, data->pipe); + igt_output_set_pipe(output, pipe); igt_display_commit(display); if (!data->output->valid) @@ -107,11 +106,10 @@ static bool prepare_crtc(data_t *data) if (data->pipe_crc) igt_pipe_crc_free(data->pipe_crc); - data->pipe_crc = igt_pipe_crc_new(data->pipe, - INTEL_PIPE_CRC_SOURCE_AUTO); + data->pipe_crc = igt_pipe_crc_new(pipe, INTEL_PIPE_CRC_SOURCE_AUTO); if (!data->pipe_crc) { igt_info("auto crc not supported on this connector with pipe %i\n", - data->pipe); + pipe); return false; } @@ -206,9 +204,7 @@ static void test_plane_rotation(data_t *data, enum igt_plane plane) for_each_connected_output(display, output) { data->output = output; for (p = 0; p < igt_display_get_n_pipes(display); p++) { - data->pipe = p; - - if (!prepare_crtc(data)) + if (!prepare_crtc(data, p)) continue; sleep(2); -- cgit v1.2.3