[i-g-t V6 25/41] tests/kms_colorop: Add tests for PQ variants
Bhanuprakash Modem
bhanuprakash.modem at intel.com
Wed Apr 24 10:26:33 UTC 2024
From: Harry Wentland <harry.wentland at amd.com>
Add tests exercising the PQ EOTF and its inverse, both
for the [0.0, 1.0] variant as well as the [0.0, 125.0]
scaled variant.
Signed-off-by: Harry Wentland <harry.wentland at amd.com>
---
tests/kms_colorop.c | 32 ++++++++++++++-----------
tests/kms_colorop.h | 57 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 76 insertions(+), 13 deletions(-)
diff --git a/tests/kms_colorop.c b/tests/kms_colorop.c
index b7247983a..dccc1772b 100644
--- a/tests/kms_colorop.c
+++ b/tests/kms_colorop.c
@@ -49,6 +49,13 @@
* @srgb_eotf: sRGB EOTF
* @srgb_inv_eotf: sRGB Inverse EOTF
* @srgb_eotf-srgb_inv_eotf: sRGB EOTF -> sRGB Inverse EOTF
+ * @pq_eotf: PQ EOTF
+ * @pq_inv_eotf: PQ Inverse EOTF
+ * @pq_eotf-pq_inv_eotf: PQ EOTF -> PQ Inverse EOTF
+ * @pq_125_eotf: PQ EOTF for [0.0, 125.0] optical range
+ * @pq_125_inv_eotf: PQ Inverse EOTF for [0.0, 125.0] optical range
+ * @pq_125_eotf-pq_125_inv_eotf: PQ EOTF -> PQ Inverse EOTF with [0.0, 125.0] optical range
+ * @pq_125_eotf-pq_125_inv_eotf-pq_125_eotf: PQ EOTF -> PQ Inverse EOTF -> PQ EOTF with [0.0, 125.0] optical range
* @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
@@ -213,7 +220,10 @@ static bool can_use_colorop(igt_display_t *display, igt_colorop_t *colorop, kms_
{
switch (desired->type) {
case KMS_COLOROP_ENUMERATED_LUT1D:
- return (igt_colorop_get_prop(display, colorop, IGT_COLOROP_TYPE) == DRM_COLOROP_1D_CURVE);
+ if (igt_colorop_get_prop(display, colorop, IGT_COLOROP_TYPE) == DRM_COLOROP_1D_CURVE &&
+ igt_colorop_try_prop_enum(colorop, IGT_COLOROP_CURVE_1D_TYPE, kms_colorop_lut1d_tf_names[desired->enumerated_lut1d_info.tf]))
+ return true;
+ return false;
case KMS_COLOROP_CTM_3X4:
return (igt_colorop_get_prop(display, colorop, IGT_COLOROP_TYPE) == DRM_COLOROP_CTM_3X4);
case KMS_COLOROP_CUSTOM_LUT1D:
@@ -293,18 +303,7 @@ static void set_colorop(igt_display_t *display,
/* TODO set to desired value from kms_colorop_t */
switch (colorop->type) {
case KMS_COLOROP_ENUMERATED_LUT1D:
- switch (colorop->enumerated_lut1d_info.tf) {
- case KMS_COLOROP_LUT1D_SRGB_EOTF:
- igt_colorop_set_prop_enum(colorop->colorop, IGT_COLOROP_CURVE_1D_TYPE, "sRGB EOTF");
- break;
- case KMS_COLOROP_LUT1D_SRGB_INV_EOTF:
- igt_colorop_set_prop_enum(colorop->colorop, IGT_COLOROP_CURVE_1D_TYPE, "sRGB Inverse EOTF");
- break;
- case KMS_COLOROP_LUT1D_PQ_EOTF:
- case KMS_COLOROP_LUT1D_PQ_INV_EOTF:
- default:
- igt_fail(IGT_EXIT_FAILURE);
- }
+ igt_colorop_set_prop_enum(colorop->colorop, IGT_COLOROP_CURVE_1D_TYPE, kms_colorop_lut1d_tf_names[colorop->enumerated_lut1d_info.tf]);
break;
case KMS_COLOROP_CTM_3X4:
igt_colorop_set_ctm_3x4(display, colorop->colorop, colorop->matrix_3x4);
@@ -490,6 +489,13 @@ igt_main
{ { &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_pq_eotf, NULL }, "pq_eotf" },
+ { { &kms_colorop_pq_inv_eotf, NULL }, "pq_inv_eotf" },
+ { { &kms_colorop_pq_eotf, &kms_colorop_pq_inv_eotf, NULL }, "pq_eotf-pq_inv_eotf" },
+ { { &kms_colorop_pq_125_eotf, NULL }, "pq_125_eotf" },
+ { { &kms_colorop_pq_125_inv_eotf, NULL }, "pq_125_inv_eotf" },
+ { { &kms_colorop_pq_125_eotf, &kms_colorop_pq_125_inv_eotf, NULL }, "pq_125_eotf-pq_125_inv_eotf" },
+ { { &kms_colorop_pq_125_eotf, &kms_colorop_pq_125_inv_eotf, &kms_colorop_pq_125_eotf_2, NULL }, "pq_125_eotf-pq_125_inv_eotf-pq_125_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" },
diff --git a/tests/kms_colorop.h b/tests/kms_colorop.h
index 30278ca4e..3188e6db4 100644
--- a/tests/kms_colorop.h
+++ b/tests/kms_colorop.h
@@ -44,8 +44,20 @@ typedef enum kms_colorop_lut1d_tf {
KMS_COLOROP_LUT1D_SRGB_INV_EOTF,
KMS_COLOROP_LUT1D_PQ_EOTF,
KMS_COLOROP_LUT1D_PQ_INV_EOTF,
+ KMS_COLOROP_LUT1D_PQ_125_EOTF,
+ KMS_COLOROP_LUT1D_PQ_125_INV_EOTF,
+ KMS_COLOROP_LUT1D_NUM_ENUMS
} kms_colorop_lut1d_tf_t;
+const char * const kms_colorop_lut1d_tf_names[KMS_COLOROP_LUT1D_NUM_ENUMS] = {
+ [KMS_COLOROP_LUT1D_SRGB_EOTF] = "sRGB EOTF",
+ [KMS_COLOROP_LUT1D_SRGB_INV_EOTF] = "sRGB Inverse EOTF",
+ [KMS_COLOROP_LUT1D_PQ_EOTF] = "PQ EOTF",
+ [KMS_COLOROP_LUT1D_PQ_INV_EOTF] = "PQ Inverse EOTF",
+ [KMS_COLOROP_LUT1D_PQ_125_EOTF] = "PQ 125 EOTF",
+ [KMS_COLOROP_LUT1D_PQ_125_INV_EOTF] = "PQ 125 Inverse EOTF",
+};
+
typedef struct kms_colorop_enumerated_lut1d_info {
kms_colorop_lut1d_tf_t tf;
} kms_colorop_enumerated_lut1d_info_t;
@@ -85,6 +97,51 @@ kms_colorop_t kms_colorop_srgb_inv_eotf = {
.transform = &igt_color_srgb_inv_eotf
};
+kms_colorop_t kms_colorop_pq_eotf = {
+ .type = KMS_COLOROP_ENUMERATED_LUT1D,
+ .enumerated_lut1d_info = {
+ .tf = KMS_COLOROP_LUT1D_PQ_EOTF
+ },
+ .name = "pq_eotf",
+ .transform = &igt_color_pq_eotf
+};
+
+kms_colorop_t kms_colorop_pq_inv_eotf = {
+ .type = KMS_COLOROP_ENUMERATED_LUT1D,
+ .enumerated_lut1d_info = {
+ .tf = KMS_COLOROP_LUT1D_PQ_INV_EOTF
+ },
+ .name = "pq_inv_eotf",
+ .transform = &igt_color_pq_inv_eotf
+};
+
+kms_colorop_t kms_colorop_pq_125_eotf = {
+ .type = KMS_COLOROP_ENUMERATED_LUT1D,
+ .enumerated_lut1d_info = {
+ .tf = KMS_COLOROP_LUT1D_PQ_125_EOTF
+ },
+ .name = "pq_125_eotf",
+ .transform = &igt_color_pq_125_eotf
+};
+
+kms_colorop_t kms_colorop_pq_125_eotf_2 = {
+ .type = KMS_COLOROP_ENUMERATED_LUT1D,
+ .enumerated_lut1d_info = {
+ .tf = KMS_COLOROP_LUT1D_PQ_125_EOTF
+ },
+ .name = "pq_125_eotf",
+ .transform = &igt_color_pq_125_eotf
+};
+
+kms_colorop_t kms_colorop_pq_125_inv_eotf = {
+ .type = KMS_COLOROP_ENUMERATED_LUT1D,
+ .enumerated_lut1d_info = {
+ .tf = KMS_COLOROP_LUT1D_PQ_125_INV_EOTF
+ },
+ .name = "pq_125_inv_eotf",
+ .transform = &igt_color_pq_125_inv_eotf
+};
+
kms_colorop_t kms_colorop_ctm_3x4_50_desat = {
.type = KMS_COLOROP_CTM_3X4,
.matrix_3x4 = &igt_matrix_3x4_50_desat,
--
2.43.2
More information about the Intel-gfx-trybot
mailing list