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 30/37] lib/igt_color: Add 1D LUT color transformation support
Date: Mon, 19 Aug 2024 16:58:16 -0400 [thread overview]
Message-ID: <20240819205823.316656-31-harry.wentland@amd.com> (raw)
In-Reply-To: <20240819205823.316656-1-harry.wentland@amd.com>
From: Alex Hung <alex.hung@amd.com>
Add definitions and functions for setting 1D LUT on a
drm_colorop.
Add support for the SIZE prop of a colorop, as that's
required for understanding the size of the LUT to
construct.
Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Co-developed-by: Harry Wentland <harry.wentland@amd.com>
---
lib/igt_color.c | 8 ++++++++
lib/igt_color.h | 20 ++++++++++++++++++++
lib/igt_kms.c | 1 +
lib/igt_kms.h | 1 +
4 files changed, 30 insertions(+)
diff --git a/lib/igt_color.c b/lib/igt_color.c
index ec8b27d1ef6f..cc5ee3b0ba50 100644
--- a/lib/igt_color.c
+++ b/lib/igt_color.c
@@ -440,3 +440,11 @@ void igt_colorop_set_ctm_3x4(igt_display_t *display,
/* set blob property */
igt_colorop_replace_prop_blob(colorop, IGT_COLOROP_DATA, &ctm, sizeof(ctm));
}
+
+void igt_colorop_set_custom_1dlut(igt_display_t *display,
+ igt_colorop_t *colorop,
+ const igt_1dlut_t *lut1d,
+ const size_t lut_size)
+{
+ igt_colorop_replace_prop_blob(colorop, IGT_COLOROP_DATA, lut1d, lut_size);
+}
\ No newline at end of file
diff --git a/lib/igt_color.h b/lib/igt_color.h
index 813bd19ba439..4a9f9b7a3958 100644
--- a/lib/igt_color.h
+++ b/lib/igt_color.h
@@ -15,6 +15,8 @@
#include "igt_fb.h"
#include "igt_kms.h"
+#define MAX_COLOR_LUT_ENTRIES 4096
+
struct igt_color_tf {
float g, a,b,c,d,e,f;
};
@@ -35,6 +37,17 @@ typedef struct igt_pixel {
float b;
} igt_pixel_t;
+typedef struct igt_1dlut {
+ struct drm_color_lut lut[MAX_COLOR_LUT_ENTRIES];
+} igt_1dlut_t;
+
+igt_1dlut_t igt_1dlut_srgb_inv_eotf = { {
+} };
+
+
+igt_1dlut_t igt_1dlut_srgb_eotf = { {
+} };
+
typedef struct igt_matrix_3x4 {
/*
* out matrix in
@@ -107,11 +120,18 @@ void igt_colorop_set_ctm_3x4(igt_display_t *display,
igt_colorop_t *colorop,
const igt_matrix_3x4_t *matrix);
+void igt_colorop_set_custom_1dlut(igt_display_t *display,
+ igt_colorop_t *colorop,
+ const igt_1dlut_t *lut1d,
+ const size_t lut_size);
+
/* transformations */
void igt_color_srgb_inv_eotf(igt_pixel_t *pixel);
void igt_color_srgb_eotf(igt_pixel_t *pixel);
+void igt_color_srgb_inv_eotf_custom_lut(igt_pixel_t *pixel);
+
void igt_color_pq_inv_eotf(igt_pixel_t *pixel);
void igt_color_pq_eotf(igt_pixel_t *pixel);
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index fc3a76250925..efbcddec12d7 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -695,6 +695,7 @@ const char * const igt_colorop_prop_names[IGT_NUM_COLOROP_PROPS] = {
[IGT_COLOROP_TYPE] = "TYPE",
[IGT_COLOROP_BYPASS] = "BYPASS",
[IGT_COLOROP_CURVE_1D_TYPE] = "CURVE_1D_TYPE",
+ [IGT_COLOROP_SIZE] = "SIZE",
[IGT_COLOROP_DATA] = "DATA",
[IGT_COLOROP_NEXT] = "NEXT",
};
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 72880609ddaf..3e789050c860 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -353,6 +353,7 @@ enum igt_atomic_colorop_properties {
IGT_COLOROP_TYPE,
IGT_COLOROP_BYPASS,
IGT_COLOROP_CURVE_1D_TYPE,
+ IGT_COLOROP_SIZE,
IGT_COLOROP_DATA,
IGT_COLOROP_NEXT,
IGT_NUM_COLOROP_PROPS
--
2.46.0
next prev 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 ` Harry Wentland [this message]
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-31-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