From df7f206e45fe9affd7ed69045cb7f418e85d67ef Mon Sep 17 00:00:00 2001 From: Jessica Zhang Date: Fri, 3 Jun 2022 11:32:57 -0700 Subject: lib/igt_kms: Call get_assigned_primary only if display is initialized Move code for getting the driver-assigned primary plane to before the `out` tag. This will avoid any crashes in cases where the display resources haven't been initialized. Signed-off-by: Jessica Zhang Reviewed-by: Ashutosh Dixit --- lib/igt_kms.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index af4fb85b..36dfcfcb 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -2528,9 +2528,6 @@ void igt_display_require(igt_display_t *display, int drm_fd) /* Set reasonable default values for every object in the display. */ igt_display_reset(display); -out: - LOG_UNINDENT(display); - for_each_pipe(display, i) { igt_pipe_t *pipe = &display->pipes[i]; igt_output_t *output; @@ -2565,6 +2562,9 @@ out: } } +out: + LOG_UNINDENT(display); + if (display->n_pipes && display->n_outputs) igt_enable_connectors(drm_fd); else -- cgit v1.2.3