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: Harry Wentland <harry.wentland@amd.com>
Subject: [PATCH v5 24/37] lib/igt_color: Add PQ variants for 0-1 and 0-125 range
Date: Mon, 19 Aug 2024 16:58:10 -0400	[thread overview]
Message-ID: <20240819205823.316656-25-harry.wentland@amd.com> (raw)
In-Reply-To: <20240819205823.316656-1-harry.wentland@amd.com>

Add PQ SW transforms. The most obvious to do the PQ EOTF
is to transform [0.0, 1.0] non-linear values to [0.0, 1.0]
linear values, and same in the inverse. So we add transforms
that do this.

Some HW (like AMD's) has scaling baked into the PQ EOTF
and will scale [0.0, 1.0] non-linear values to [0.0, 125.0]
linear values when applying the PQ EOTF. The inverse will
take [0.0, 125.0] linear values and output [0.0, 1.0]
linear values. We're adding a transform that can handle
this variant as well.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
---
 lib/igt_color.c | 81 +++++++++++++++++++++++++++++++++++++++++++------
 lib/igt_color.h | 13 ++++++++
 2 files changed, 84 insertions(+), 10 deletions(-)

diff --git a/lib/igt_color.c b/lib/igt_color.c
index 43179a17e41b..0926385f4d82 100644
--- a/lib/igt_color.c
+++ b/lib/igt_color.c
@@ -20,6 +20,13 @@ static float clamp(float val, float min, float max)
 	return ((val < min) ? min : ((val > max) ? max : val));
 }
 
+static void igt_color_multiply(igt_pixel_t *pixel, float multiplier)
+{
+	pixel->r *= multiplier;
+	pixel->g *= multiplier;
+	pixel->b *= multiplier;
+}
+
 static float igt_color_tf_eval_unclamped(const struct igt_color_tf *fn, float x)
 {
 	if (x < fn->d)
@@ -51,24 +58,78 @@ static void tf_inverse(const struct igt_color_tf *fn, struct igt_color_tf *inv)
 	}
 }
 
-void igt_color_srgb_inv_eotf(igt_pixel_t *pixel)
+static float pq_eval(const struct igt_color_tf_pq *pq, float x)
+{
+	return powf(fmaxf(pq->A + pq->B * powf(x, pq->C), 0)
+		       / (pq->D + pq->E * powf(x, pq->C)),
+			    pq->F);
+}
+
+static void pq_inv(struct igt_color_tf_pq *inv)
+{
+	inv->A = -pq_eotf.A;
+	inv->B = pq_eotf.D;
+	inv->C = 1.0f / pq_eotf.F;
+	inv->D = pq_eotf.B;
+	inv->E = -pq_eotf.E;
+	inv->F = 1.0f / pq_eotf.C;
+}
+
+static void igt_color_tf(igt_pixel_t *pixel, const struct igt_color_tf *tf)
+{
+	pixel->r = igt_color_tf_eval(tf, pixel->r);
+	pixel->g = igt_color_tf_eval(tf, pixel->g);
+	pixel->b = igt_color_tf_eval(tf, pixel->b);
+}
+
+static void igt_color_inv_tf(igt_pixel_t *pixel, const struct igt_color_tf *tf)
 {
 	struct igt_color_tf inv;
 
-	tf_inverse(&srgb_eotf, &inv);
-
-	pixel->r = igt_color_tf_eval(&inv, pixel->r);
-	pixel->g = igt_color_tf_eval(&inv, pixel->g);
-	pixel->b = igt_color_tf_eval(&inv, pixel->b);
+	tf_inverse(tf, &inv);
+	igt_color_tf(pixel, &inv);
 }
 
-
+static void tf_pq(igt_pixel_t *pixel, const struct igt_color_tf_pq *pq)
+{
+	pixel->r = pq_eval(pq, pixel->r);
+	pixel->g = pq_eval(pq, pixel->g);
+	pixel->b = pq_eval(pq, pixel->b);
+}
 
 void igt_color_srgb_eotf(igt_pixel_t *pixel)
 {
-	pixel->r = igt_color_tf_eval(&srgb_eotf, pixel->r);
-	pixel->g = igt_color_tf_eval(&srgb_eotf, pixel->g);
-	pixel->b = igt_color_tf_eval(&srgb_eotf, pixel->b);
+	igt_color_tf(pixel, &srgb_eotf);
+}
+
+void igt_color_srgb_inv_eotf(igt_pixel_t *pixel)
+{
+	igt_color_inv_tf(pixel, &srgb_eotf);
+}
+
+void igt_color_pq_eotf(igt_pixel_t *pixel)
+{
+	tf_pq(pixel, &pq_eotf);
+}
+
+void igt_color_pq_inv_eotf(igt_pixel_t *pixel)
+{
+	struct igt_color_tf_pq inv;
+
+	pq_inv(&inv);
+	tf_pq(pixel, &inv);
+}
+
+void igt_color_pq_125_eotf(igt_pixel_t *pixel)
+{
+	igt_color_pq_eotf(pixel);
+	igt_color_multiply(pixel, 125.0f);
+}
+
+void igt_color_pq_125_inv_eotf(igt_pixel_t *pixel)
+{
+	igt_color_multiply(pixel, 1/125.0f);
+	igt_color_pq_inv_eotf(pixel);
 }
 
 static void igt_color_apply_3x4_ctm(igt_pixel_t *pixel, const igt_matrix_3x4_t *matrix)
diff --git a/lib/igt_color.h b/lib/igt_color.h
index d218550f6dd0..a97383fabaf3 100644
--- a/lib/igt_color.h
+++ b/lib/igt_color.h
@@ -19,8 +19,15 @@ struct igt_color_tf {
     float g, a,b,c,d,e,f;
 };
 
+struct igt_color_tf_pq {
+	float A, B, C, D, E, F, G;
+};
+
+
 const struct igt_color_tf srgb_eotf = {2.4f, (float)(1/1.055), (float)(0.055/1.055), (float)(1/12.92), 0.04045f, 0, 0};
 
+const struct igt_color_tf_pq pq_eotf = {-107/128.0f, 1.0f, 32/2523.0f, 2413/128.0f, -2392/128.0f, 8192/1305.0f };
+
 typedef struct igt_pixel {
 	float r;
 	float g;
@@ -104,6 +111,12 @@ void igt_colorop_set_ctm_3x4(igt_display_t *display,
 void igt_color_srgb_inv_eotf(igt_pixel_t *pixel);
 void igt_color_srgb_eotf(igt_pixel_t *pixel);
 
+void igt_color_pq_inv_eotf(igt_pixel_t *pixel);
+void igt_color_pq_eotf(igt_pixel_t *pixel);
+
+void igt_color_pq_125_inv_eotf(igt_pixel_t *pixel);
+void igt_color_pq_125_eotf(igt_pixel_t *pixel);
+
 void igt_color_ctm_3x4_50_desat(igt_pixel_t *pixel);
 void igt_color_ctm_3x4_overdrive(igt_pixel_t *pixel);
 void igt_color_ctm_3x4_oversaturate(igt_pixel_t *pixel);
-- 
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 ` Harry Wentland [this message]
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 ` [PATCH v5 31/37] test/kms_colorop: Add tests that exercise the 1D LUT colorops Harry Wentland
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-25-harry.wentland@amd.com \
    --to=harry.wentland@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