[PATCH V10 25/30] tests/kms_colorop: Add multiplier tests
Alex Hung
alex.hung at amd.com
Fri Aug 15 04:06:54 UTC 2025
This includes multiply_125 (125.0f) and multiply_inv_125 (1/125.0f).
Signed-off-by: Alex Hung <alex.hung at amd.com>
---
include/drm-uapi/drm_mode.h | 1 +
lib/igt_color.c | 10 ++++++++++
lib/igt_color.h | 3 +++
lib/igt_kms.c | 1 +
lib/igt_kms.h | 1 +
tests/kms_colorop.c | 11 +++++++++++
tests/kms_colorop.h | 15 +++++++++++++++
7 files changed, 42 insertions(+)
diff --git a/include/drm-uapi/drm_mode.h b/include/drm-uapi/drm_mode.h
index 106fbb889..fe3e98e20 100644
--- a/include/drm-uapi/drm_mode.h
+++ b/include/drm-uapi/drm_mode.h
@@ -890,6 +890,7 @@ enum drm_colorop_type {
DRM_COLOROP_1D_CURVE,
DRM_COLOROP_1D_LUT,
DRM_COLOROP_CTM_3X4,
+ DRM_COLOROP_MULTIPLIER,
};
/**
diff --git a/lib/igt_color.c b/lib/igt_color.c
index a58ba0e57..aa65eac20 100644
--- a/lib/igt_color.c
+++ b/lib/igt_color.c
@@ -203,6 +203,16 @@ void igt_color_ctm_3x4_bt709_dec(igt_pixel_t *pixel)
igt_color_apply_3x4_ctm(pixel, &igt_matrix_3x4_bt709_dec);
}
+void igt_color_multiply_125(igt_pixel_t *pixel)
+{
+ igt_color_multiply(pixel, 125.0f);
+}
+
+void igt_color_multiply_inv_125(igt_pixel_t *pixel)
+{
+ igt_color_multiply(pixel, 1 / 125.0f);
+}
+
static void
igt_color_fourcc_to_pixel(uint32_t raw_pixel, uint32_t drm_format, igt_pixel_t *pixel)
{
diff --git a/lib/igt_color.h b/lib/igt_color.h
index 88de8166f..761dd2f95 100644
--- a/lib/igt_color.h
+++ b/lib/igt_color.h
@@ -133,4 +133,7 @@ void igt_color_ctm_3x4_overdrive(igt_pixel_t *pixel);
void igt_color_ctm_3x4_oversaturate(igt_pixel_t *pixel);
void igt_color_ctm_3x4_bt709_dec(igt_pixel_t *pixel);
void igt_color_ctm_3x4_bt709_enc(igt_pixel_t *pixel);
+
+void igt_color_multiply_125(igt_pixel_t *pixel);
+void igt_color_multiply_inv_125(igt_pixel_t *pixel);
#endif
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index bdde2fc72..2ff70808b 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -712,6 +712,7 @@ const char * const igt_colorop_prop_names[IGT_NUM_COLOROP_PROPS] = {
[IGT_COLOROP_CURVE_1D_TYPE] = "CURVE_1D_TYPE",
[IGT_COLOROP_SIZE] = "SIZE",
[IGT_COLOROP_DATA] = "DATA",
+ [IGT_COLOROP_MULTIPLIER] = "MULTIPLIER",
[IGT_COLOROP_NEXT] = "NEXT",
};
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index d0a7ed037..cd64fd38f 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -376,6 +376,7 @@ enum igt_atomic_colorop_properties {
IGT_COLOROP_CURVE_1D_TYPE,
IGT_COLOROP_SIZE,
IGT_COLOROP_DATA,
+ IGT_COLOROP_MULTIPLIER,
IGT_COLOROP_NEXT,
IGT_NUM_COLOROP_PROPS
};
diff --git a/tests/kms_colorop.c b/tests/kms_colorop.c
index bd7358a27..50cbc1a9d 100644
--- a/tests/kms_colorop.c
+++ b/tests/kms_colorop.c
@@ -69,6 +69,8 @@
* @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
+ * @multiply_125: Multiplier by 125
+ * @multiply_inv_125: Multiplier by inverse of 125
*
*/
@@ -236,6 +238,8 @@ static bool can_use_colorop(igt_display_t *display, igt_colorop_t *colorop, kms_
if (igt_colorop_get_prop(display, colorop, IGT_COLOROP_TYPE) == DRM_COLOROP_1D_LUT)
return true;
return false;
+ case KMS_COLOROP_MULTIPLIER:
+ return (igt_colorop_get_prop(display, colorop, IGT_COLOROP_TYPE) == DRM_COLOROP_MULTIPLIER);
case KMS_COLOROP_LUT3D:
default:
return false;
@@ -329,6 +333,7 @@ static void set_colorop(igt_display_t *display,
kms_colorop_t *colorop)
{
uint64_t lut_size = 0;
+ uint64_t mult = 1;
igt_assert(colorop->colorop);
igt_colorop_set_prop_value(colorop->colorop, IGT_COLOROP_BYPASS, 0);
@@ -346,6 +351,10 @@ static void set_colorop(igt_display_t *display,
lut_size = igt_colorop_get_prop(display, colorop->colorop, IGT_COLOROP_SIZE);
igt_colorop_set_custom_1dlut(display, colorop->colorop, colorop->lut1d, lut_size * sizeof(struct drm_color_lut32));
break;
+ case KMS_COLOROP_MULTIPLIER:
+ mult = colorop->multiplier * (mult << 32); /* convert double to fixed number */
+ igt_colorop_set_prop_value(colorop->colorop, IGT_COLOROP_MULTIPLIER, mult);
+ break;
case KMS_COLOROP_LUT3D:
default:
igt_fail(IGT_EXIT_FAILURE);
@@ -536,6 +545,8 @@ igt_main
{ { &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" },
+ { { &kms_colorop_multiply_125, NULL }, "multiply_125" },
+ { { &kms_colorop_multiply_inv_125, NULL }, "multiply_inv_125" },
};
struct {
diff --git a/tests/kms_colorop.h b/tests/kms_colorop.h
index dfc42b352..b0371aff7 100644
--- a/tests/kms_colorop.h
+++ b/tests/kms_colorop.h
@@ -37,6 +37,7 @@ typedef enum kms_colorop_type {
KMS_COLOROP_ENUMERATED_LUT1D,
KMS_COLOROP_CUSTOM_LUT1D,
KMS_COLOROP_CTM_3X4,
+ KMS_COLOROP_MULTIPLIER,
KMS_COLOROP_LUT3D
} kms_colorop_type_t;
@@ -74,6 +75,7 @@ typedef struct kms_colorop {
kms_colorop_enumerated_lut1d_info_t enumerated_lut1d_info;
igt_1dlut_t *lut1d;
const igt_matrix_3x4_t *matrix_3x4;
+ double multiplier;
};
const char *name;
@@ -224,5 +226,18 @@ kms_colorop_t kms_colorop_ctm_3x4_bt709_dec = {
.transform = &igt_color_ctm_3x4_bt709_dec
};
+kms_colorop_t kms_colorop_multiply_125 = {
+ .type = KMS_COLOROP_MULTIPLIER,
+ .multiplier = 125.0f,
+ .name = "multiply_125",
+ .transform = &igt_color_multiply_125
+};
+
+kms_colorop_t kms_colorop_multiply_inv_125 = {
+ .type = KMS_COLOROP_MULTIPLIER,
+ .multiplier = 1/125.0f,
+ .name = "multiply_inv_125",
+ .transform = &igt_color_multiply_inv_125
+};
#endif /* __KMS_COLOROP_H__ */
--
2.43.0
More information about the igt-dev
mailing list