Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Harry Wentland <harry.wentland@amd.com>
To: <igt-dev@lists.freedesktop.org>
Cc: Alex Hung <alex.hung@amd.com>, Harry Wentland <harry.wentland@amd.com>
Subject: [PATCH v5 31/37] test/kms_colorop: Add tests that exercise the 1D LUT colorops
Date: Mon, 19 Aug 2024 16:58:17 -0400	[thread overview]
Message-ID: <20240819205823.316656-32-harry.wentland@amd.com> (raw)
In-Reply-To: <20240819205823.316656-1-harry.wentland@amd.com>

From: Alex Hung <alex.hung@amd.com>

We'll use the sRGB EOTF and its inverse for convenience.

Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
---
 tests/kms_colorop.c | 35 +++++++++++++++++++++++++++++++++++
 tests/kms_colorop.h | 15 +++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/tests/kms_colorop.c b/tests/kms_colorop.c
index f6738cdcfdf2..436bd085f9a7 100644
--- a/tests/kms_colorop.c
+++ b/tests/kms_colorop.c
@@ -50,6 +50,8 @@
  * @srgb_inv_eotf:              	sRGB Inverse EOTF
  * @srgb_eotf-srgb_inv_eotf:    	sRGB EOTF -> sRGB Inverse EOTF
  * @srgb_eotf-srgb_inv_eotf-srgb_eotf:  sRGB EOTF -> sRGB Inverse EOTF -> sRGB EOTF
+ * @srgb_inv_eotf_lut:              	sRGB Inverse EOTF Custom LUT
+ * @srgb_inv_eotf_lut-srgb_eotf_lut:	sRGB Inverse EOTF Custom LUT -> sRGB EOTF Custom LUT
  * @bt2020_inv_oetf:			BT.2020 Inverse OETF
  * @bt2020_oetf:			BT.2020 OETF
  * @bt2020_inv_oetf-bt2020_oetf:	BT.2020 Inverse OETF > BT.2020 OETF
@@ -231,6 +233,9 @@ static bool can_use_colorop(igt_display_t *display, igt_colorop_t *colorop, kms_
 	case KMS_COLOROP_CTM_3X4:
 		return (igt_colorop_get_prop(display, colorop, IGT_COLOROP_TYPE) == DRM_COLOROP_CTM_3X4);
 	case KMS_COLOROP_CUSTOM_LUT1D:
+		if (igt_colorop_get_prop(display, colorop, IGT_COLOROP_TYPE) == DRM_COLOROP_1D_LUT)
+			return true;
+		return false;
 	case KMS_COLOROP_LUT3D:
 	default:
 		return false;
@@ -298,9 +303,33 @@ static igt_colorop_t *get_color_pipeline(igt_display_t *display,
 	return colorop;
 }
 
+static void fill_custom_1dlut(igt_display_t *display, kms_colorop_t *colorop)
+{
+	uint64_t lut_size = igt_colorop_get_prop(display, colorop->colorop, IGT_COLOROP_SIZE);
+	igt_pixel_t pixel;
+	float index;
+	int i;
+
+	for (i = 0; i < lut_size; i++) {
+		index = i / (float) lut_size;
+
+		pixel.r = index;
+		pixel.g = index;
+		pixel.b = index;
+
+		colorop->transform(&pixel);
+
+		colorop->lut1d->lut[i].red = pixel.r * 0xffff;
+		colorop->lut1d->lut[i].green = pixel.g * 0xffff;
+		colorop->lut1d->lut[i].blue = pixel.b * 0xffff;
+	}
+}
+
 static void set_colorop(igt_display_t *display,
 			kms_colorop_t *colorop)
 {
+	uint64_t lut_size = 0;
+
 	igt_assert(colorop->colorop);
 	igt_colorop_set_prop_value(colorop->colorop, IGT_COLOROP_BYPASS, 0);
 
@@ -313,6 +342,10 @@ static void set_colorop(igt_display_t *display,
 		igt_colorop_set_ctm_3x4(display, colorop->colorop, colorop->matrix_3x4);
 		break;
 	case KMS_COLOROP_CUSTOM_LUT1D:
+		fill_custom_1dlut(display, colorop);
+		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_lut));
+		break;
 	case KMS_COLOROP_LUT3D:
 	default:
 		igt_fail(IGT_EXIT_FAILURE);
@@ -494,6 +527,8 @@ igt_main
 		{ { &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, &kms_colorop_srgb_eotf_2, NULL }, "srgb_eotf-srgb_inv_eotf-srgb_eotf" },
+		{ { &kms_colorop_srgb_inv_eotf_lut, NULL }, "srgb_inv_eotf_lut" },
+		{ { &kms_colorop_srgb_inv_eotf_lut, &kms_colorop_srgb_eotf_lut, NULL }, "srgb_inv_eotf_lut-srgb_eotf_lut" },
 		{ { &kms_colorop_bt2020_inv_oetf, NULL }, "bt2020_inv_oetf" },
 		{ { &kms_colorop_bt2020_oetf, NULL }, "bt2020_oetf" },
 		{ { &kms_colorop_bt2020_inv_oetf, &kms_colorop_bt2020_oetf, NULL }, "bt2020_inv_oetf-bt2020_oetf" },
diff --git a/tests/kms_colorop.h b/tests/kms_colorop.h
index 7b98198f6430..13d15ea6637d 100644
--- a/tests/kms_colorop.h
+++ b/tests/kms_colorop.h
@@ -71,6 +71,7 @@ typedef struct kms_colorop {
 
 	union {
 		kms_colorop_enumerated_lut1d_info_t enumerated_lut1d_info;
+		igt_1dlut_t *lut1d;
 		const igt_matrix_3x4_t *matrix_3x4;
 	};
 
@@ -110,6 +111,20 @@ kms_colorop_t kms_colorop_srgb_inv_eotf = {
 	.transform = &igt_color_srgb_inv_eotf
 };
 
+kms_colorop_t kms_colorop_srgb_inv_eotf_lut = {
+	.type = KMS_COLOROP_CUSTOM_LUT1D,
+	.lut1d = &igt_1dlut_srgb_inv_eotf,
+	.name = "srgb_inv_eotf_lut",
+	.transform = &igt_color_srgb_inv_eotf
+};
+
+kms_colorop_t kms_colorop_srgb_eotf_lut = {
+	.type = KMS_COLOROP_CUSTOM_LUT1D,
+	.lut1d = &igt_1dlut_srgb_eotf,
+	.name = "srgb_eotf_lut",
+	.transform = &igt_color_srgb_eotf
+};
+
 kms_colorop_t kms_colorop_bt2020_inv_oetf = {
 	.type = KMS_COLOROP_ENUMERATED_LUT1D,
 	.enumerated_lut1d_info = {
-- 
2.46.0


  parent reply	other threads:[~2024-08-19 20:59 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-19 20:57 [PATCH v5 00/37] IGT tests for the KMS Color Pipeline API Harry Wentland
2024-08-19 20:57 ` [PATCH v5 01/37] lib/drmtest: Add is_vkms_device() Harry Wentland
2024-08-19 20:57 ` [PATCH v5 02/37] tests/kms_writeback: Fix kms_writeback for VKMS Harry Wentland
2024-08-19 20:57 ` [PATCH v5 03/37] lib/igt_kms: Move get_writeback_formats_blob to lib Harry Wentland
2024-08-19 20:57 ` [PATCH v5 04/37] lib/igt_kms: Introduce DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE Harry Wentland
2024-08-19 20:57 ` [PATCH v5 05/37] include/drm-uapi: Add COLOROP object Harry Wentland
2024-08-19 20:57 ` [PATCH v5 06/37] drm-uapi: Add 3x4 CTM Harry Wentland
2024-08-19 20:57 ` [PATCH v5 07/37] drm-uapi: Add 1D LUT drm_colorop_type Harry Wentland
2024-08-19 20:57 ` [PATCH v5 08/37] lib/igt_kms: Introduce drm_colorop and COLOR_PIPELINE Harry Wentland
2024-08-19 20:57 ` [PATCH v5 09/37] tests/kms_properties: Add colorop properties test Harry Wentland
2024-08-19 20:57 ` [PATCH v5 10/37] igt/color: Add SW color transform functionality Harry Wentland
2024-08-19 20:57 ` [PATCH v5 11/37] lib/igt_fb: Add copy_fb function Harry Wentland
2024-08-19 20:57 ` [PATCH v5 12/37] tests/kms_colorop: Add kms_colorop tests Harry Wentland
2024-08-19 20:57 ` [PATCH v5 13/37] lib/igt_kms: Add support for DATA colorop property Harry Wentland
2024-08-19 20:58 ` [PATCH v5 14/37] lib/igt_color: Add support for 3x4 matrices Harry Wentland
2024-08-19 20:58 ` [PATCH v5 15/37] tests/kms_colorop: Add 3x4 CTM tests Harry Wentland
2024-08-19 20:58 ` [PATCH v5 16/37] tests/kms_colorop: Add bypass test Harry Wentland
2024-08-19 20:58 ` [PATCH v5 17/37] tests/kms_colorop: Parametrize the buffer format Harry Wentland
2024-08-19 20:58 ` [PATCH v5 18/37] tests/kms_colorop: Add 10bpc test and skip if format not supported Harry Wentland
2024-08-19 20:58 ` [PATCH v5 19/37] tests/kms_colorop: Skip if writeback does not support fourcc Harry Wentland
2024-08-19 20:58 ` [PATCH v5 20/37] lib/igt_fb: Allow any non-planar format for igt_copy_fb Harry Wentland
2024-08-19 20:58 ` [PATCH v5 21/37] kms/colorop: Do proper setup and cleanup Harry Wentland
2024-08-19 20:58 ` [PATCH v5 22/37] lib/igt_color: Support color transform for XRGB2101010 Harry Wentland
2024-08-19 20:58 ` [PATCH v5 23/37] tests/kms_colorop: Set wide [13, 13] bracket for comparison on amdgpu Harry Wentland
2024-08-19 20:58 ` [PATCH v5 24/37] lib/igt_color: Add PQ variants for 0-1 and 0-125 range Harry Wentland
2024-08-19 20:58 ` [PATCH v5 25/37] tests/kms_colorop: Add tests for PQ variants Harry Wentland
2024-08-19 20:58 ` [PATCH v5 26/37] lib/igt_kms: increase MAX_NUM_COLOROPS to 128 Harry Wentland
2024-08-19 20:58 ` [PATCH v5 27/37] tests/kms_colorop: Add a sRGB test for EOTF -> Inverse EOTF -> EOTF Harry Wentland
2024-08-19 20:58 ` [PATCH v5 28/37] lib/igt_color: add BT2020/BT709 transfer functions Harry Wentland
2024-08-19 20:58 ` [PATCH v5 29/37] tests/kms_colorop: Add tests for BT2020/BT709 TFs Harry Wentland
2024-08-19 20:58 ` [PATCH v5 30/37] lib/igt_color: Add 1D LUT color transformation support Harry Wentland
2024-08-19 20:58 ` Harry Wentland [this message]
2024-08-19 20:58 ` [PATCH v5 32/37] tests/kms_colorop: Add multiplier tests Harry Wentland
2024-08-19 20:58 ` [PATCH v5 33/37] lib/igt_color: Point license header at skia license Harry Wentland
2024-08-19 20:58 ` [PATCH v5 34/37] scripts/convert_3dlut.py Convert a 3D LUT to igt_3dlut_t array for 3D LUT API Harry Wentland
2024-08-19 20:58 ` [PATCH v5 35/37] tests/kms_colorop: Add 3D LUT subtests Harry Wentland
2024-08-19 20:58 ` [PATCH v5 36/37] drm-uapi: Update kernel doc for drm_colorop_type Harry Wentland
2024-08-19 20:58 ` [PATCH v5 37/37] drm-uapi: Sync up definition with kernel colorop implementation Harry Wentland
2024-08-19 23:30 ` ✓ CI.xeBAT: success for IGT tests for the KMS Color Pipeline API (rev6) Patchwork
2024-08-19 23:46 ` ✗ Fi.CI.BAT: failure " Patchwork
2024-08-20  7:49 ` ✗ CI.xeFULL: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240819205823.316656-32-harry.wentland@amd.com \
    --to=harry.wentland@amd.com \
    --cc=alex.hung@amd.com \
    --cc=igt-dev@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox