summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris.p.wilson@intel.com>2021-08-19 18:25:06 +0300
committerPetri Latvala <petri.latvala@intel.com>2021-08-23 11:54:21 +0300
commit70ead7647011bc1f1c8719a9c64cbb11799c97d4 (patch)
tree69a50930a2470deb086db01b00eb664d132d1c90
parentf18b546afb609c22998dced0cec0042588b21b66 (diff)
kms_ccs: Require a connected output
Check that the output exists before dereferencing, as it may be NULL if there are no displays connected. Signed-off-by: Chris Wilson <chris.p.wilson@intel.com> Cc: Matthew Auld <matthew.auld@intel.com> Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> Fixes: https://gitlab.freedesktop.org/drm/intel/-/issues/3678 Reviewed-by: Matthew Auld <matthew.auld@intel.com>
-rw-r--r--tests/kms_ccs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/kms_ccs.c b/tests/kms_ccs.c
index e60a6a77..238c245c 100644
--- a/tests/kms_ccs.c
+++ b/tests/kms_ccs.c
@@ -513,6 +513,7 @@ static void test_output(data_t *data, const char* testformatstring)
igt_fixture {
data->output = igt_get_single_output_for_pipe(&data->display,
data->pipe);
+ igt_require(data->output);
igt_output_set_pipe(data->output, data->pipe);
}
@@ -611,6 +612,7 @@ igt_main_args("cs:", NULL, help_str, opt_handler, &data)
igt_require_pipe_crc(data.drm_fd);
igt_display_require(&data.display, data.drm_fd);
+ igt_display_require_output(&data.display);
if (!data.user_seed)
data.seed = time(NULL);