From 4383f7f7e0932ff652823db0ab8b80acf43a20e5 Mon Sep 17 00:00:00 2001 From: José Roberto de Souza Date: Fri, 29 Mar 2019 13:13:22 -0700 Subject: lib: Share the 1024x768 mode among tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Three test were duplicating this 1024x768 mode so lets move it to lib and share it. Reviewed-by: Mika Kahola Signed-off-by: José Roberto de Souza --- lib/igt_kms.c | 25 ++++++++++++++++++++++++- lib/igt_kms.h | 3 ++- 2 files changed, 26 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 43f45997..ce9fe152 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -2155,6 +2155,29 @@ igt_output_t *igt_output_from_connector(igt_display_t *display, return found; } +const drmModeModeInfo *igt_std_1024_mode_get(void) +{ + static const drmModeModeInfo std_1024_mode = { + .clock = 65000, + .hdisplay = 1024, + .hsync_start = 1048, + .hsync_end = 1184, + .htotal = 1344, + .hskew = 0, + .vdisplay = 768, + .vsync_start = 771, + .vsync_end = 777, + .vtotal = 806, + .vscan = 0, + .vrefresh = 60, + .flags = 0xA, + .type = 0x40, + .name = "Custom 1024x768", + }; + + return &std_1024_mode; +} + static void igt_pipe_fini(igt_pipe_t *pipe) { free(pipe->planes); @@ -3627,7 +3650,7 @@ drmModeModeInfo *igt_output_get_mode(igt_output_t *output) * mode obtained with get connectors. Note that the mode is used without * checking if the output supports it, so this might lead to unexpected results. */ -void igt_output_override_mode(igt_output_t *output, drmModeModeInfo *mode) +void igt_output_override_mode(igt_output_t *output, const drmModeModeInfo *mode) { igt_pipe_t *pipe = igt_output_get_driving_pipe(output); diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 407f3d64..e392e0ef 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -403,7 +403,7 @@ void igt_display_require_output_on_pipe(igt_display_t *display, enum pipe pipe); const char *igt_output_name(igt_output_t *output); drmModeModeInfo *igt_output_get_mode(igt_output_t *output); -void igt_output_override_mode(igt_output_t *output, drmModeModeInfo *mode); +void igt_output_override_mode(igt_output_t *output, const drmModeModeInfo *mode); void igt_output_set_pipe(igt_output_t *output, enum pipe pipe); igt_plane_t *igt_output_get_plane(igt_output_t *output, int plane_idx); igt_plane_t *igt_output_get_plane_type(igt_output_t *output, int plane_type); @@ -412,6 +412,7 @@ igt_plane_t *igt_output_get_plane_type_index(igt_output_t *output, int plane_type, int index); igt_output_t *igt_output_from_connector(igt_display_t *display, drmModeConnector *connector); +const drmModeModeInfo *igt_std_1024_mode_get(void); igt_plane_t *igt_pipe_get_plane_type(igt_pipe_t *pipe, int plane_type); int igt_pipe_count_plane_type(igt_pipe_t *pipe, int plane_type); -- cgit v1.2.3