diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2014-07-09 11:05:06 +0100 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2014-07-09 11:10:01 +0100 |
| commit | c5b9615b83910f5a5c19fc84d938ea643f4e3009 (patch) | |
| tree | e623c276352ec763ae4d95905265cd9ec2740bae /tests/kms_plane.c | |
| parent | 8d60b8267e97f9b04e42912262c170c473d4f061 (diff) | |
kms_plane: Specify the pipe when grabbing reference CRCs
When changing the pipe we were using, test_grab_crc() wasn't correctly
setting the pipe constraint before waiting for the CRC on the pipe, and
so we ended up waiting for a CRC on a pipe that wasn't lit up.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Diffstat (limited to 'tests/kms_plane.c')
| -rw-r--r-- | tests/kms_plane.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/kms_plane.c b/tests/kms_plane.c index 5f7bfc05..c3c0e5ef 100644 --- a/tests/kms_plane.c +++ b/tests/kms_plane.c @@ -63,14 +63,16 @@ static void test_fini(data_t *data) } static void -test_grab_crc(data_t *data, igt_output_t *output, color_t *fb_color, - igt_crc_t *crc /* out */) +test_grab_crc(data_t *data, igt_output_t *output, enum pipe pipe, + color_t *fb_color, igt_crc_t *crc /* out */) { struct igt_fb fb; drmModeModeInfo *mode; igt_plane_t *primary; char *crc_str; + igt_output_set_pipe(output, pipe); + primary = igt_output_get_plane(output, 0); mode = igt_output_get_mode(output); @@ -162,7 +164,7 @@ test_plane_position_with_output(data_t *data, test_init(data, pipe); - test_grab_crc(data, output, &green, &test.reference_crc); + test_grab_crc(data, output, pipe, &green, &test.reference_crc); igt_output_set_pipe(output, pipe); @@ -287,8 +289,8 @@ test_plane_panning_with_output(data_t *data, test_init(data, pipe); - test_grab_crc(data, output, &red, &test.red_crc); - test_grab_crc(data, output, &blue, &test.blue_crc); + test_grab_crc(data, output, pipe, &red, &test.red_crc); + test_grab_crc(data, output, pipe, &blue, &test.blue_crc); igt_output_set_pipe(output, pipe); |