[i-g-t 13/16] tests/kms_colorop: Add 3x4 CTM tests
Bhanuprakash Modem
bhanuprakash.modem at intel.com
Wed Jan 3 20:22:49 UTC 2024
From: Harry Wentland <harry.wentland at amd.com>
v2: (Bhanu)
- Move few helpers to common place to reuse
Signed-off-by: Harry Wentland <harry.wentland at amd.com>
---
tests/kms_color_helper.c | 52 ++++++++++++++++++++++++++++++++++------
tests/kms_color_helper.h | 8 ++++++-
tests/kms_colorop.c | 26 +++++++++++++++-----
3 files changed, 72 insertions(+), 14 deletions(-)
diff --git a/tests/kms_color_helper.c b/tests/kms_color_helper.c
index 60f61575f..895d3fa0a 100644
--- a/tests/kms_color_helper.c
+++ b/tests/kms_color_helper.c
@@ -393,11 +393,10 @@ static bool can_use_colorop(igt_display_t *display, igt_colorop_t *colorop, kms_
{
switch (desired->type) {
case KMS_COLOROP_ENUMERATED_LUT1D:
- if (igt_colorop_get_prop(display, colorop, IGT_COLOROP_TYPE) == DRM_COLOROP_1D_CURVE) {
- return true;
- }
+ return (igt_colorop_get_prop(display, colorop, IGT_COLOROP_TYPE) == DRM_COLOROP_1D_CURVE);
+ case KMS_COLOROP_CTM_3X4:
+ return (igt_colorop_get_prop(display, colorop, IGT_COLOROP_TYPE) == DRM_COLOROP_CTM_3X4);
case KMS_COLOROP_CUSTOM_LUT1D:
- case KMS_COLOROP_CTM:
case KMS_COLOROP_LUT3D:
default:
return false;
@@ -417,13 +416,15 @@ static bool map_to_pipeline(igt_display_t *display,
int i = 0;
int prop_val = 0;
- current_op = colorops[i++];
+ current_op = colorops[i];
+ i++;
igt_require(current_op);
while (next) {
if (can_use_colorop(display, next, current_op)) {
current_op->colorop = next;
- current_op = colorops[i++];
+ current_op = colorops[i];
+ i++;
if (!current_op)
break;
}
@@ -484,8 +485,10 @@ void set_colorop(igt_display_t *display, kms_colorop_t *colorop)
igt_fail(IGT_EXIT_FAILURE);
}
break;
+ case KMS_COLOROP_CTM_3X4:
+ igt_colorop_set_ctm_3x4(display, colorop->colorop, colorop->matrix_3x4);
+ break;
case KMS_COLOROP_CUSTOM_LUT1D:
- case KMS_COLOROP_CTM:
case KMS_COLOROP_LUT3D:
default:
igt_fail(IGT_EXIT_FAILURE);
@@ -562,3 +565,38 @@ kms_colorop_t kms_colorop_srgb_inv_eotf = {
.name = "srgb_inv_eotf",
.transform = &igt_color_srgb_inv_eotf
};
+
+kms_colorop_t kms_colorop_ctm_3x4_50_desat = {
+ .type = KMS_COLOROP_CTM_3X4,
+ .matrix_3x4 = &igt_matrix_3x4_50_desat,
+ .name = "ctm_3x4_50_desat",
+ .transform = &igt_color_ctm_3x4_50_desat
+};
+
+kms_colorop_t kms_colorop_ctm_3x4_overdrive = {
+ .type = KMS_COLOROP_CTM_3X4,
+ .matrix_3x4 = &igt_matrix_3x4_overdrive,
+ .name = "ctm_3x4_overdrive",
+ .transform = &igt_color_ctm_3x4_overdrive
+};
+
+kms_colorop_t kms_colorop_ctm_3x4_oversaturate = {
+ .type = KMS_COLOROP_CTM_3X4,
+ .matrix_3x4 = &igt_matrix_3x4_oversaturate,
+ .name = "ctm_3x4_oversaturate",
+ .transform = &igt_color_ctm_3x4_oversaturate
+};
+
+kms_colorop_t kms_colorop_ctm_3x4_bt709_enc = {
+ .type = KMS_COLOROP_CTM_3X4,
+ .matrix_3x4 = &igt_matrix_3x4_bt709_enc,
+ .name = "ctm_3x4_bt709_enc",
+ .transform = &igt_color_ctm_3x4_bt709_enc
+};
+
+kms_colorop_t kms_colorop_ctm_3x4_bt709_dec = {
+ .type = KMS_COLOROP_CTM_3X4,
+ .matrix_3x4 = &igt_matrix_3x4_bt709_dec,
+ .name = "ctm_3x4_bt709_dec",
+ .transform = &igt_color_ctm_3x4_bt709_dec
+};
diff --git a/tests/kms_color_helper.h b/tests/kms_color_helper.h
index 24cc74a52..7d25e5724 100644
--- a/tests/kms_color_helper.h
+++ b/tests/kms_color_helper.h
@@ -126,7 +126,7 @@ void invalid_ctm_matrix_sizes(data_t *data, enum pipe p);
typedef enum kms_colorop_type {
KMS_COLOROP_ENUMERATED_LUT1D,
KMS_COLOROP_CUSTOM_LUT1D,
- KMS_COLOROP_CTM,
+ KMS_COLOROP_CTM_3X4,
KMS_COLOROP_LUT3D
} kms_colorop_type_t;
@@ -146,6 +146,7 @@ typedef struct kms_colorop {
union {
kms_colorop_enumerated_lut1d_info_t enumerated_lut1d_info;
+ const igt_matrix_3x4_t *matrix_3x4;
};
const char *name;
@@ -163,6 +164,11 @@ typedef int (*transform_pixel)(igt_pixel_t *pixel);
extern kms_colorop_t kms_colorop_srgb_eotf;
extern kms_colorop_t kms_colorop_srgb_inv_eotf;
+extern kms_colorop_t kms_colorop_ctm_3x4_50_desat;
+extern kms_colorop_t kms_colorop_ctm_3x4_overdrive;
+extern kms_colorop_t kms_colorop_ctm_3x4_oversaturate;
+extern kms_colorop_t kms_colorop_ctm_3x4_bt709_enc;
+extern kms_colorop_t kms_colorop_ctm_3x4_bt709_dec;
/* colorop helpers */
diff --git a/tests/kms_colorop.c b/tests/kms_colorop.c
index 4e31439a5..b5f370d87 100644
--- a/tests/kms_colorop.c
+++ b/tests/kms_colorop.c
@@ -37,9 +37,16 @@
*
* arg[1]:
*
- * @srgb_eotf: sRGB EOTF
- * @srgb_inv_eotf: sRGB Inverse EOTF
- * @srgb_eotf-srgb_inv_eotf: sRGB EOTF -> sRGB Inverse EOTF
+ * @srgb_eotf: sRGB EOTF
+ * @srgb_inv_eotf: sRGB Inverse EOTF
+ * @srgb_eotf-srgb_inv_eotf: sRGB EOTF -> sRGB Inverse EOTF
+ * @ctm_3x4_50_desat: 3x4 matrix doing a 50% desaturation
+ * @ctm_3x4_overdrive: 3x4 matrix overdring all values by 50%
+ * @ctm_3x4_oversaturate: 3x4 matrix oversaturating values
+ * @ctm_3x4_bt709_enc: BT709 encoding matrix
+ * @ctm_3x4_bt709_dec: BT709 decoding matrix
+ * @ctm_3x4_bt709_enc_dec: BT709 encoding matrix, followed by decoding matrix
+ * @ctm_3x4_bt709_dec_enc: BT709 decoding matrix, followed by encoding matrix
*
*/
@@ -180,8 +187,8 @@ static bool compare_with_bracket(igt_fb_t *in, igt_fb_t *out)
#define DUMP_FBS 1
-#define MAX_COLOROPS 3
-#define NUM_COLOROP_TESTS 3
+#define MAX_COLOROPS 5
+#define NUM_COLOROP_TESTS 12
#define MAX_NAME_SIZE 256
static void apply_transforms(kms_colorop_t *colorops[], igt_fb_t *sw_transform_fb)
@@ -330,7 +337,14 @@ igt_main
} tests[] = {
{ { &kms_colorop_srgb_eotf, NULL }, "srgb_eotf" },
{ { &kms_colorop_srgb_inv_eotf, NULL }, "srgb_inv_eotf" },
- { { &kms_colorop_srgb_eotf, &kms_colorop_srgb_inv_eotf, NULL }, "srgb_eotf-srgb_inv_eotf" }
+ { { &kms_colorop_srgb_eotf, &kms_colorop_srgb_inv_eotf, NULL }, "srgb_eotf-srgb_inv_eotf" },
+ { { &kms_colorop_ctm_3x4_50_desat, NULL }, "ctm_3x4_50_desat" },
+ { { &kms_colorop_ctm_3x4_overdrive, NULL }, "ctm_3x4_overdrive" },
+ { { &kms_colorop_ctm_3x4_oversaturate, NULL }, "ctm_3x4_oversaturate" },
+ { { &kms_colorop_ctm_3x4_bt709_enc, NULL }, "ctm_3x4_bt709_enc" },
+ { { &kms_colorop_ctm_3x4_bt709_dec, NULL }, "ctm_3x4_bt709_dec" },
+ { { &kms_colorop_ctm_3x4_bt709_enc, &kms_colorop_ctm_3x4_bt709_dec, NULL }, "ctm_3x4_bt709_enc_dec" },
+ { { &kms_colorop_ctm_3x4_bt709_dec, &kms_colorop_ctm_3x4_bt709_enc, NULL }, "ctm_3x4_bt709_dec_enc" },
};
igt_display_t display;
--
2.40.0
More information about the Intel-gfx-trybot
mailing list