From d7fcd3382e4ca141171db1c2c415150e2cac082f Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Mon, 5 Mar 2018 19:11:15 +0100 Subject: tests/kms_chamelium: Make tests run without pipe color management support. Only try to set those values if the properties are supported. This fixes the kms_chameium tests to run on vc4 again. Reported-by: Maxime Ripard Cc: Paul Kocialkowski Cc: Eric Anholt Cc: Boris Brezillon Signed-off-by: Maarten Lankhorst Reviewed-by: Maxime Ripard --- tests/kms_chamelium.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/kms_chamelium.c') diff --git a/tests/kms_chamelium.c b/tests/kms_chamelium.c index 8855a830..2bc34d07 100644 --- a/tests/kms_chamelium.c +++ b/tests/kms_chamelium.c @@ -471,9 +471,12 @@ enable_output(data_t *data, igt_output_override_mode(output, mode); /* Clear any color correction values that might be enabled */ - igt_pipe_obj_replace_prop_blob(primary->pipe, IGT_CRTC_DEGAMMA_LUT, NULL, 0); - igt_pipe_obj_replace_prop_blob(primary->pipe, IGT_CRTC_GAMMA_LUT, NULL, 0); - igt_pipe_obj_replace_prop_blob(primary->pipe, IGT_CRTC_CTM, NULL, 0); + if (igt_pipe_obj_has_prop(primary->pipe, IGT_CRTC_DEGAMMA_LUT)) + igt_pipe_obj_replace_prop_blob(primary->pipe, IGT_CRTC_DEGAMMA_LUT, NULL, 0); + if (igt_pipe_obj_has_prop(primary->pipe, IGT_CRTC_GAMMA_LUT)) + igt_pipe_obj_replace_prop_blob(primary->pipe, IGT_CRTC_GAMMA_LUT, NULL, 0); + if (igt_pipe_obj_has_prop(primary->pipe, IGT_CRTC_CTM)) + igt_pipe_obj_replace_prop_blob(primary->pipe, IGT_CRTC_CTM, NULL, 0); igt_display_commit2(display, COMMIT_ATOMIC); -- cgit v1.2.3