From: Alex Hung <alex.hung@amd.com>
To: <dri-devel@lists.freedesktop.org>, <amd-gfx@lists.freedesktop.org>
Cc: <wayland-devel@lists.freedesktop.org>, <harry.wentland@amd.com>,
<alex.hung@amd.com>, <leo.liu@amd.com>,
<ville.syrjala@linux.intel.com>, <pekka.paalanen@collabora.com>,
<contact@emersion.fr>, <mwen@igalia.com>, <jadahl@redhat.com>,
<sebastian.wick@redhat.com>, <shashank.sharma@amd.com>,
<agoins@nvidia.com>, <joshua@froggi.es>, <mdaenzer@redhat.com>,
<aleixpol@kde.org>, <xaver.hugl@gmail.com>,
<victoria@system76.com>, <daniel@ffwll.ch>,
<uma.shankar@intel.com>, <quic_naseer@quicinc.com>,
<quic_cbraga@quicinc.com>, <quic_abhinavk@quicinc.com>,
<marcan@marcan.st>, <Liviu.Dudau@arm.com>,
<sashamcintosh@google.com>, <chaitanya.kumar.borah@intel.com>,
<louis.chauvet@bootlin.com>, <arthurgrillo@riseup.net>,
Daniel Stone <daniels@collabora.com>
Subject: [PATCH V10 02/46] drm/vkms: Add kunit tests for VKMS LUT handling
Date: Mon, 16 Jun 2025 22:16:44 -0600 [thread overview]
Message-ID: <20250617041746.2884343-3-alex.hung@amd.com> (raw)
In-Reply-To: <20250617041746.2884343-1-alex.hung@amd.com>
From: Harry Wentland <harry.wentland@amd.com>
Debugging LUT math is much easier when we can unit test
it. Add kunit functionality to VKMS and add tests for
- get_lut_index
- lerp_u16
Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Cc: Arthur Grillo <arthurgrillo@riseup.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
---
v8:
- Update config names (Louis Chauvet)
v7:
- Fix checkpatch warnings and errors (Louis Chauvet)
- Change SPDX-License-Identifier: GPL-2.0+ from /* */ to //
- Fix checkpatch errors and warnings (new line at EOF, redundant spaces, and long lines)
- Add static to const struct vkms_color_lut test_linear_lut
- Add "MODULE_DESCRIPTION" (Jeff Johnson)
v6:
- Eliminate need to include test as .c file (Louis Chauvet)
v5:
- Bring back static for lerp_u16 and get_lut_index (Arthur)
v4:
- Test the critical points of the lerp function (Pekka)
v3:
- Use include way of testing static functions (Arthur)
drivers/gpu/drm/vkms/tests/Makefile | 2 +-
drivers/gpu/drm/vkms/tests/vkms_color_test.c | 172 +++++++++++++++++++
drivers/gpu/drm/vkms/vkms_composer.c | 8 +-
drivers/gpu/drm/vkms/vkms_composer.h | 13 ++
4 files changed, 192 insertions(+), 3 deletions(-)
create mode 100644 drivers/gpu/drm/vkms/tests/vkms_color_test.c
create mode 100644 drivers/gpu/drm/vkms/vkms_composer.h
diff --git a/drivers/gpu/drm/vkms/tests/Makefile b/drivers/gpu/drm/vkms/tests/Makefile
index 9ded37b67a46..e92f7143e540 100644
--- a/drivers/gpu/drm/vkms/tests/Makefile
+++ b/drivers/gpu/drm/vkms/tests/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_DRM_VKMS_KUNIT_TEST) += vkms_config_test.o
+obj-$(CONFIG_DRM_VKMS_KUNIT_TEST) += vkms_config_test.o vkms_color_test.o
diff --git a/drivers/gpu/drm/vkms/tests/vkms_color_test.c b/drivers/gpu/drm/vkms/tests/vkms_color_test.c
new file mode 100644
index 000000000000..affca56cac7b
--- /dev/null
+++ b/drivers/gpu/drm/vkms/tests/vkms_color_test.c
@@ -0,0 +1,172 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+#include <kunit/test.h>
+
+#include <drm/drm_fixed.h>
+#include <drm/drm_mode.h>
+#include "../vkms_drv.h"
+#include "../vkms_composer.h"
+
+#define TEST_LUT_SIZE 16
+
+MODULE_IMPORT_NS("EXPORTED_FOR_KUNIT_TESTING");
+
+static struct drm_color_lut test_linear_array[TEST_LUT_SIZE] = {
+ { 0x0, 0x0, 0x0, 0 },
+ { 0x1111, 0x1111, 0x1111, 0 },
+ { 0x2222, 0x2222, 0x2222, 0 },
+ { 0x3333, 0x3333, 0x3333, 0 },
+ { 0x4444, 0x4444, 0x4444, 0 },
+ { 0x5555, 0x5555, 0x5555, 0 },
+ { 0x6666, 0x6666, 0x6666, 0 },
+ { 0x7777, 0x7777, 0x7777, 0 },
+ { 0x8888, 0x8888, 0x8888, 0 },
+ { 0x9999, 0x9999, 0x9999, 0 },
+ { 0xaaaa, 0xaaaa, 0xaaaa, 0 },
+ { 0xbbbb, 0xbbbb, 0xbbbb, 0 },
+ { 0xcccc, 0xcccc, 0xcccc, 0 },
+ { 0xdddd, 0xdddd, 0xdddd, 0 },
+ { 0xeeee, 0xeeee, 0xeeee, 0 },
+ { 0xffff, 0xffff, 0xffff, 0 },
+};
+
+static const struct vkms_color_lut test_linear_lut = {
+ .base = test_linear_array,
+ .lut_length = TEST_LUT_SIZE,
+ .channel_value2index_ratio = 0xf000fll
+};
+
+
+static void vkms_color_test_get_lut_index(struct kunit *test)
+{
+ s64 lut_index;
+ int i;
+
+ lut_index = get_lut_index(&test_linear_lut, test_linear_array[0].red);
+ KUNIT_EXPECT_EQ(test, drm_fixp2int(lut_index), 0);
+
+ for (i = 0; i < TEST_LUT_SIZE; i++) {
+ lut_index = get_lut_index(&test_linear_lut, test_linear_array[i].red);
+ KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(lut_index), i);
+ }
+}
+
+static void vkms_color_test_lerp(struct kunit *test)
+{
+ /*** half-way round down ***/
+ s64 t = 0x80000000 - 1;
+
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x0, 0x10, t), 0x8);
+
+ /* odd a */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x1, 0x10, t), 0x8);
+
+ /* odd b */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x1, 0xf, t), 0x8);
+
+ /* b = a */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x10, 0x10, t), 0x10);
+
+ /* b = a + 1 */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x10, 0x11, t), 0x10);
+
+ /*** half-way round up ***/
+ t = 0x80000000;
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x0, 0x10, t), 0x8);
+
+ /* odd a */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x1, 0x10, t), 0x9);
+
+ /* odd b */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x1, 0xf, t), 0x8);
+
+ /* b = a */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x10, 0x10, t), 0x10);
+
+ /* b = a + 1 */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x10, 0x11, t), 0x11);
+
+ /*** t = 0.0 ***/
+ t = 0x0;
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x0, 0x10, t), 0x0);
+
+ /* odd a */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x1, 0x10, t), 0x1);
+
+ /* odd b */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x1, 0xf, t), 0x1);
+
+ /* b = a */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x10, 0x10, t), 0x10);
+
+ /* b = a + 1 */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x10, 0x11, t), 0x10);
+
+ /*** t = 1.0 ***/
+ t = 0x100000000;
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x0, 0x10, t), 0x10);
+
+ /* odd a */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x1, 0x10, t), 0x10);
+
+ /* odd b */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x1, 0xf, t), 0xf);
+
+ /* b = a */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x10, 0x10, t), 0x10);
+
+ /* b = a + 1 */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x10, 0x11, t), 0x11);
+
+ /*** t = 0.0 + 1 ***/
+ t = 0x0 + 1;
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x0, 0x10, t), 0x0);
+
+ /* odd a */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x1, 0x10, t), 0x1);
+
+ /* odd b */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x1, 0xf, t), 0x1);
+
+ /* b = a */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x10, 0x10, t), 0x10);
+
+ /* b = a + 1 */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x10, 0x11, t), 0x10);
+
+ /*** t = 1.0 - 1 ***/
+ t = 0x100000000 - 1;
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x0, 0x10, t), 0x10);
+
+ /* odd a */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x1, 0x10, t), 0x10);
+
+ /* odd b */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x1, 0xf, t), 0xf);
+
+ /* b = a */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x10, 0x10, t), 0x10);
+
+ /* b = a + 1 */
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x10, 0x11, t), 0x11);
+
+ /*** t chosen to verify the flipping point of result a (or b) to a+1 (or b-1) ***/
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x0, 0x1, 0x80000000 - 1), 0x0);
+ KUNIT_EXPECT_EQ(test, lerp_u16(0x0, 0x1, 0x80000000), 0x1);
+}
+
+static struct kunit_case vkms_color_test_cases[] = {
+ KUNIT_CASE(vkms_color_test_get_lut_index),
+ KUNIT_CASE(vkms_color_test_lerp),
+ {}
+};
+
+static struct kunit_suite vkms_color_test_suite = {
+ .name = "vkms-color",
+ .test_cases = vkms_color_test_cases,
+};
+
+kunit_test_suite(vkms_color_test_suite);
+
+MODULE_DESCRIPTION("Kunit test for VKMS LUT handling");
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
index fa269d279e25..b0dc95f971d8 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -12,6 +12,8 @@
#include <linux/minmax.h>
#include "vkms_drv.h"
+#include <kunit/visibility.h>
+#include "vkms_composer.h"
static u16 pre_mul_blend_channel(u16 src, u16 dst, u16 alpha)
{
@@ -60,7 +62,7 @@ static void fill_background(const struct pixel_argb_u16 *background_color,
}
// lerp(a, b, t) = a + (b - a) * t
-static u16 lerp_u16(u16 a, u16 b, s64 t)
+VISIBLE_IF_KUNIT u16 lerp_u16(u16 a, u16 b, s64 t)
{
s64 a_fp = drm_int2fixp(a);
s64 b_fp = drm_int2fixp(b);
@@ -69,13 +71,15 @@ static u16 lerp_u16(u16 a, u16 b, s64 t)
return drm_fixp2int_round(a_fp + delta);
}
+EXPORT_SYMBOL_IF_KUNIT(lerp_u16);
-static s64 get_lut_index(const struct vkms_color_lut *lut, u16 channel_value)
+VISIBLE_IF_KUNIT s64 get_lut_index(const struct vkms_color_lut *lut, u16 channel_value)
{
s64 color_channel_fp = drm_int2fixp(channel_value);
return drm_fixp_mul(color_channel_fp, lut->channel_value2index_ratio);
}
+EXPORT_SYMBOL_IF_KUNIT(get_lut_index);
/*
* This enum is related to the positions of the variables inside
diff --git a/drivers/gpu/drm/vkms/vkms_composer.h b/drivers/gpu/drm/vkms/vkms_composer.h
new file mode 100644
index 000000000000..9316a053e7d7
--- /dev/null
+++ b/drivers/gpu/drm/vkms/vkms_composer.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#ifndef _VKMS_COMPOSER_H_
+#define _VKMS_COMPOSER_H_
+
+#include <kunit/visibility.h>
+
+#if IS_ENABLED(CONFIG_KUNIT)
+u16 lerp_u16(u16 a, u16 b, s64 t);
+s64 get_lut_index(const struct vkms_color_lut *lut, u16 channel_value);
+#endif
+
+#endif /* _VKMS_COMPOSER_H_ */
--
2.43.0
next prev parent reply other threads:[~2025-06-17 4:18 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-17 4:16 [PATCH V10 00/46] Color Pipeline API w/ VKMS Alex Hung
2025-06-17 4:16 ` [PATCH V10 01/46] drm: Add helper for conversion from signed-magnitude Alex Hung
2025-06-17 4:16 ` Alex Hung [this message]
2025-06-17 10:54 ` [PATCH V10 02/46] drm/vkms: Add kunit tests for VKMS LUT handling Maíra Canal
2025-06-17 4:16 ` [PATCH V10 03/46] drm/doc/rfc: Describe why prescriptive color pipeline is needed Alex Hung
2025-06-17 4:16 ` [PATCH V10 04/46] drm/colorop: Introduce new drm_colorop mode object Alex Hung
2025-06-17 4:16 ` [PATCH V10 05/46] drm/colorop: Add TYPE property Alex Hung
2025-06-17 4:16 ` [PATCH V10 06/46] drm/colorop: Add 1D Curve subtype Alex Hung
2025-06-17 4:16 ` [PATCH V10 07/46] drm/colorop: Add BYPASS property Alex Hung
2025-06-17 4:16 ` [PATCH V10 08/46] drm/colorop: Add NEXT property Alex Hung
2025-06-17 4:16 ` [PATCH V10 09/46] drm/colorop: Add atomic state print for drm_colorop Alex Hung
2025-06-17 4:16 ` [PATCH V10 10/46] drm/plane: Add COLOR PIPELINE property Alex Hung
2025-06-17 4:16 ` [PATCH V10 11/46] drm/colorop: Introduce DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE Alex Hung
2025-06-17 4:16 ` [PATCH V10 12/46] Documentation/gpu: document drm_colorop Alex Hung
2025-06-17 4:16 ` [PATCH V10 13/46] drm/colorop: Add destroy functions for color pipeline Alex Hung
2025-07-31 22:11 ` Nícolas F. R. A. Prado
2025-08-03 10:24 ` Simon Ser
2025-06-17 4:16 ` [PATCH V10 14/46] drm/vkms: Add enumerated 1D curve colorop Alex Hung
2025-06-17 4:16 ` [PATCH V10 15/46] drm/vkms: Add kunit tests for linear and sRGB LUTs Alex Hung
2025-06-18 17:59 ` kernel test robot
2025-06-17 4:16 ` [PATCH V10 16/46] drm/colorop: Add 3x4 CTM type Alex Hung
2025-06-17 4:16 ` [PATCH V10 17/46] drm/vkms: Use s32 for internal color pipeline precision Alex Hung
2025-06-17 4:17 ` [PATCH V10 18/46] drm/vkms: add 3x4 matrix in color pipeline Alex Hung
2025-07-30 21:42 ` Nícolas F. R. A. Prado
2025-06-17 4:17 ` [PATCH V10 19/46] drm/tests: Add a few tests around drm_fixed.h Alex Hung
2025-06-17 11:04 ` Maíra Canal
2025-06-17 14:17 ` Wentland, Harry
2025-06-17 4:17 ` [PATCH V10 20/46] drm/vkms: Add tests for CTM handling Alex Hung
2025-06-17 4:17 ` [PATCH V10 21/46] drm/colorop: pass plane_color_pipeline client cap to atomic check Alex Hung
2025-06-17 4:17 ` [PATCH V10 22/46] drm/colorop: define a new macro for_each_new_colorop_in_state Alex Hung
2025-06-17 4:17 ` [PATCH V10 23/46] drm/amd/display: Ignore deprecated props when plane_color_pipeline set Alex Hung
2025-06-17 4:17 ` [PATCH V10 24/46] drm/amd/display: Add bypass COLOR PIPELINE Alex Hung
2025-06-17 4:17 ` [PATCH V10 25/46] drm/amd/display: Skip color pipeline initialization for cursor plane Alex Hung
2025-06-17 4:17 ` [PATCH V10 26/46] drm/amd/display: Add support for sRGB EOTF in DEGAM block Alex Hung
2025-07-09 19:45 ` Melissa Wen
2025-06-17 4:17 ` [PATCH V10 27/46] drm/amd/display: Add support for sRGB Inverse EOTF in SHAPER block Alex Hung
2025-06-17 4:17 ` [PATCH V10 28/46] drm/amd/display: Add support for sRGB EOTF in BLND block Alex Hung
2025-06-17 4:17 ` [PATCH V10 29/46] drm/colorop: Add PQ 125 EOTF and its inverse Alex Hung
2025-06-17 4:17 ` [PATCH V10 30/46] drm/amd/display: Enable support for PQ 125 EOTF and Inverse Alex Hung
2025-06-17 4:17 ` [PATCH V10 31/46] drm/colorop: add BT2020/BT709 OETF and Inverse OETF Alex Hung
2025-06-17 4:17 ` [PATCH V10 32/46] drm/amd/display: Add support for BT.709 and BT.2020 TFs Alex Hung
2025-06-17 4:17 ` [PATCH V10 33/46] drm: Add Enhanced LUT precision structure Alex Hung
2025-07-08 15:10 ` Simon Ser
2025-07-11 16:28 ` Alex Hung
2025-07-15 4:37 ` Borah, Chaitanya Kumar
2025-07-15 7:44 ` Shankar, Uma
2025-07-15 22:08 ` Alex Hung
2025-07-09 18:49 ` Borah, Chaitanya Kumar
2025-07-11 16:25 ` Alex Hung
2025-06-17 4:17 ` [PATCH V10 34/46] drm/colorop: Add 1D Curve Custom LUT type Alex Hung
2025-06-17 4:17 ` [PATCH V10 35/46] drm/amd/display: add shaper and blend colorops for 1D Curve Custom LUT Alex Hung
2025-06-18 4:41 ` kernel test robot
2025-06-17 4:17 ` [PATCH V10 36/46] drm/amd/display: add 3x4 matrix colorop Alex Hung
2025-06-17 4:17 ` [PATCH V10 37/46] drm/colorop: Add multiplier type Alex Hung
2025-06-17 4:17 ` [PATCH V10 38/46] drm/amd/display: add multiplier colorop Alex Hung
2025-06-17 4:17 ` [PATCH V10 39/46] drm/amd/display: Swap matrix and multiplier Alex Hung
2025-06-17 4:17 ` [PATCH V10 40/46] drm/colorop: Define LUT_1D interpolation Alex Hung
2025-07-09 20:30 ` Simon Ser
2025-08-02 1:49 ` Alex Hung
2025-08-02 1:55 ` Simon Ser
2025-08-04 22:14 ` Xaver Hugl
2025-06-17 4:17 ` [PATCH V10 41/46] drm/colorop: allow non-bypass colorops Alex Hung
2025-07-23 14:00 ` Nícolas F. R. A. Prado
2025-06-17 4:17 ` [PATCH V10 42/46] drm/colorop: Add 3D LUT support to color pipeline Alex Hung
2025-06-17 4:17 ` [PATCH V10 43/46] drm/amd/display: add 3D LUT colorop Alex Hung
2025-08-04 19:51 ` Nícolas F. R. A. Prado
2025-08-12 23:05 ` Alex Hung
2025-06-17 4:17 ` [PATCH V10 44/46] drm/amd/display: Add AMD color pipeline doc Alex Hung
2025-06-17 4:17 ` [PATCH V10 45/46] drm/amd/display: Ensure 3D LUT for color pipeline Alex Hung
2025-07-09 19:56 ` Melissa Wen
2025-08-02 1:59 ` Alex Hung
2025-06-17 4:17 ` [PATCH V10 46/46] drm/amd/display: Disable CRTC degamma when color pipeline is enabled Alex Hung
2025-07-09 19:58 ` Melissa Wen
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=20250617041746.2884343-3-alex.hung@amd.com \
--to=alex.hung@amd.com \
--cc=Liviu.Dudau@arm.com \
--cc=agoins@nvidia.com \
--cc=aleixpol@kde.org \
--cc=amd-gfx@lists.freedesktop.org \
--cc=arthurgrillo@riseup.net \
--cc=chaitanya.kumar.borah@intel.com \
--cc=contact@emersion.fr \
--cc=daniel@ffwll.ch \
--cc=daniels@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=jadahl@redhat.com \
--cc=joshua@froggi.es \
--cc=leo.liu@amd.com \
--cc=louis.chauvet@bootlin.com \
--cc=marcan@marcan.st \
--cc=mdaenzer@redhat.com \
--cc=mwen@igalia.com \
--cc=pekka.paalanen@collabora.com \
--cc=quic_abhinavk@quicinc.com \
--cc=quic_cbraga@quicinc.com \
--cc=quic_naseer@quicinc.com \
--cc=sashamcintosh@google.com \
--cc=sebastian.wick@redhat.com \
--cc=shashank.sharma@amd.com \
--cc=uma.shankar@intel.com \
--cc=victoria@system76.com \
--cc=ville.syrjala@linux.intel.com \
--cc=wayland-devel@lists.freedesktop.org \
--cc=xaver.hugl@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).