public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] tests/kms_color: check degamma and gamma props in CTM subtests
@ 2022-11-03 18:40 Melissa Wen
  2022-11-03 19:21 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Melissa Wen @ 2022-11-03 18:40 UTC (permalink / raw)
  To: igt-dev; +Cc: Petri Latvala, kernel-dev

Some CTM subtests generate and set degamma/gamma LUTs without checking
if these properties are supported by the driver. Therefore, if degamma
and gamma are used in the subtest, check the color properties before
generate and set LUTs. If these properties are not supported, these
subtests will skip instead of failing.

Signed-off-by: Melissa Wen <mwen@igalia.com>
---
 tests/kms_color.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/kms_color.c b/tests/kms_color.c
index e4dc2465..e0222c42 100644
--- a/tests/kms_color.c
+++ b/tests/kms_color.c
@@ -463,7 +463,7 @@ static bool test_pipe_ctm(data_t *data,
 	};
 	gamma_lut_t *degamma_linear, *gamma_linear;
 	igt_output_t *output = data->output;
-	bool ret = true;
+	bool set_luts, ret = true;
 	igt_display_t *display = &data->display;
 	drmModeModeInfo *mode = data->mode;
 	struct igt_fb fb_modeset, fb;
@@ -472,9 +472,6 @@ static bool test_pipe_ctm(data_t *data,
 
 	igt_require(igt_pipe_obj_has_prop(primary->pipe, IGT_CRTC_CTM));
 
-	degamma_linear = generate_table(data->degamma_lut_size, 1.0);
-	gamma_linear = generate_table(data->gamma_lut_size, 1.0);
-
 	igt_output_set_pipe(output, primary->pipe->pipe);
 	igt_output_override_mode(output, mode);
 
@@ -501,7 +498,14 @@ static bool test_pipe_ctm(data_t *data,
 	 * representing intermediate values between 0 and 1.0 causes
 	 * rounding issues and inaccuracies leading to crc mismatch.
 	 */
-	if (memcmp(before, after, sizeof(color_t))) {
+	set_luts = memcmp(before, after, sizeof(color_t));
+	if (set_luts) {
+		igt_require(igt_pipe_obj_has_prop(primary->pipe, IGT_CRTC_DEGAMMA_LUT));
+		igt_require(igt_pipe_obj_has_prop(primary->pipe, IGT_CRTC_GAMMA_LUT));
+
+		degamma_linear = generate_table(data->degamma_lut_size, 1.0);
+		gamma_linear = generate_table(data->gamma_lut_size, 1.0);
+
 		set_degamma(data, primary->pipe, degamma_linear);
 		set_gamma(data, primary->pipe, gamma_linear);
 	} else {
@@ -542,8 +546,10 @@ static bool test_pipe_ctm(data_t *data,
 	igt_remove_fb(data->drm_fd, &fb);
 	igt_remove_fb(data->drm_fd, &fb_modeset);
 
-	free_lut(degamma_linear);
-	free_lut(gamma_linear);
+	if (set_luts) {
+		free_lut(degamma_linear);
+		free_lut(gamma_linear);
+	}
 
 	return ret;
 }
-- 
2.35.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-04 21:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-03 18:40 [igt-dev] [PATCH i-g-t] tests/kms_color: check degamma and gamma props in CTM subtests Melissa Wen
2022-11-03 19:21 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2022-11-04 15:44 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2022-11-04 21:01 ` [igt-dev] [PATCH i-g-t] " Alex Hung

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox