diff options
| -rw-r--r-- | tests/kms_chamelium.c | 110 |
1 files changed, 74 insertions, 36 deletions
diff --git a/tests/kms_chamelium.c b/tests/kms_chamelium.c index 8b20bbbc..421a9006 100644 --- a/tests/kms_chamelium.c +++ b/tests/kms_chamelium.c @@ -823,34 +823,53 @@ static void test_display_all_modes(data_t *data, struct chamelium_port *port, uint32_t fourcc, enum chamelium_check check, int count) { - igt_output_t *output; - igt_plane_t *primary; - drmModeConnector *connector; bool bridge; - int i; - - reset_state(data, port); - - output = prepare_output(data, port, TEST_EDID_BASE); - connector = chamelium_port_get_connector(data->chamelium, port, false); - primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); - igt_assert(primary); - igt_require(igt_plane_has_format_mod(primary, fourcc, LOCAL_DRM_FORMAT_MOD_NONE)); + int i, count_modes; if (check == CHAMELIUM_CHECK_ANALOG) bridge = check_analog_bridge(data, port); - for (i = 0; i < connector->count_modes; i++) { - drmModeModeInfo *mode = &connector->modes[i]; + i = 0; + do { + igt_output_t *output; + igt_plane_t *primary; + drmModeConnector *connector; + drmModeModeInfo *mode; + + /* + * let's reset state each mode so we will get the + * HPD pulses realibably + */ + reset_state(data, port); + + /* + * modes may change due to mode pruining and link issues, so we + * need to refresh the connector + */ + output = prepare_output(data, port, TEST_EDID_BASE); + connector = chamelium_port_get_connector(data->chamelium, port, + false); + primary = igt_output_get_plane_type(output, + DRM_PLANE_TYPE_PRIMARY); + igt_assert(primary); + igt_require(igt_plane_has_format_mod(primary, fourcc, + LOCAL_DRM_FORMAT_MOD_NONE)); + + /* we may skip some modes due to above but that's ok */ + count_modes = connector->count_modes; + if (i >= count_modes) + break; + + mode = &connector->modes[i]; if (check == CHAMELIUM_CHECK_ANALOG && bridge && prune_vga_mode(data, mode)) continue; - do_test_display(data, port, output, mode, fourcc, check, count); - } - - drmModeFreeConnector(connector); + do_test_display(data, port, output, mode, fourcc, check, + count); + drmModeFreeConnector(connector); + } while (++i < count_modes); } static const char test_display_frame_dump_desc[] = @@ -860,23 +879,43 @@ static const char test_display_frame_dump_desc[] = static void test_display_frame_dump(data_t *data, struct chamelium_port *port) { - igt_output_t *output; - igt_plane_t *primary; - struct igt_fb fb; - struct chamelium_frame_dump *frame; - drmModeModeInfo *mode; - drmModeConnector *connector; - int fb_id, i, j; - reset_state(data, port); + int i, count_modes; - output = prepare_output(data, port, TEST_EDID_BASE); - connector = chamelium_port_get_connector(data->chamelium, port, false); - primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); - igt_assert(primary); + i = 0; + do { + igt_output_t *output; + igt_plane_t *primary; + struct igt_fb fb; + struct chamelium_frame_dump *frame; + drmModeModeInfo *mode; + drmModeConnector *connector; + int fb_id, j; + + /* + * let's reset state each mode so we will get the + * HPD pulses realibably + */ + reset_state(data, port); + + /* + * modes may change due to mode pruining and link issues, so we + * need to refresh the connector + */ + output = prepare_output(data, port, TEST_EDID_BASE); + connector = chamelium_port_get_connector(data->chamelium, port, + false); + primary = igt_output_get_plane_type(output, + DRM_PLANE_TYPE_PRIMARY); + igt_assert(primary); + + /* we may skip some modes due to above but that's ok */ + count_modes = connector->count_modes; + if (i >= count_modes) + break; - for (i = 0; i < connector->count_modes; i++) { mode = &connector->modes[i]; + fb_id = igt_create_color_pattern_fb(data->drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, @@ -889,16 +928,15 @@ test_display_frame_dump(data_t *data, struct chamelium_port *port) igt_debug("Reading frame dumps from Chamelium...\n"); chamelium_capture(data->chamelium, port, 0, 0, 0, 0, 5); for (j = 0; j < 5; j++) { - frame = chamelium_read_captured_frame( - data->chamelium, j); + frame = chamelium_read_captured_frame(data->chamelium, + j); chamelium_assert_frame_eq(data->chamelium, frame, &fb); chamelium_destroy_frame_dump(frame); } igt_remove_fb(data->drm_fd, &fb); - } - - drmModeFreeConnector(connector); + drmModeFreeConnector(connector); + } while (++i < count_modes); } #define MODE_CLOCK_ACCURACY 0.05 /* 5% */ |