All of lore.kernel.org
 help / color / mirror / Atom feed
From: Harry Wentland <harry.wentland@amd.com>
To: <dri-devel@lists.freedesktop.org>, <amd-gfx@lists.freedesktop.org>
Cc: <wayland-devel@lists.freedesktop.org>,
	Harry Wentland <harry.wentland@amd.com>,
	Arthur Grillo <arthurgrillo@riseup.net>
Subject: [RFC PATCH v4 06/42] drm/vkms: Add kunit tests for VKMS LUT handling
Date: Mon, 26 Feb 2024 16:10:20 -0500	[thread overview]
Message-ID: <20240226211100.100108-7-harry.wentland@amd.com> (raw)
In-Reply-To: <20240226211100.100108-1-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

v4:
 - Test the critical points of the lerp function (Pekka)

v3:
 - Use include way of testing static functions (Arthur)

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Cc: Arthur Grillo <arthurgrillo@riseup.net>
---
 drivers/gpu/drm/vkms/Kconfig                  |   5 +
 drivers/gpu/drm/vkms/tests/.kunitconfig       |   4 +
 drivers/gpu/drm/vkms/tests/vkms_color_tests.c | 163 ++++++++++++++++++
 drivers/gpu/drm/vkms/vkms_composer.c          |   8 +-
 4 files changed, 178 insertions(+), 2 deletions(-)
 create mode 100644 drivers/gpu/drm/vkms/tests/.kunitconfig
 create mode 100644 drivers/gpu/drm/vkms/tests/vkms_color_tests.c

diff --git a/drivers/gpu/drm/vkms/Kconfig b/drivers/gpu/drm/vkms/Kconfig
index b9ecdebecb0b..c1f8b343ff0e 100644
--- a/drivers/gpu/drm/vkms/Kconfig
+++ b/drivers/gpu/drm/vkms/Kconfig
@@ -13,3 +13,8 @@ config DRM_VKMS
 	  a VKMS.
 
 	  If M is selected the module will be called vkms.
+
+config DRM_VKMS_KUNIT_TESTS
+	tristate "Tests for VKMS" if !KUNIT_ALL_TESTS
+	depends on DRM_VKMS && KUNIT
+	default KUNIT_ALL_TESTS
diff --git a/drivers/gpu/drm/vkms/tests/.kunitconfig b/drivers/gpu/drm/vkms/tests/.kunitconfig
new file mode 100644
index 000000000000..70e378228cbd
--- /dev/null
+++ b/drivers/gpu/drm/vkms/tests/.kunitconfig
@@ -0,0 +1,4 @@
+CONFIG_KUNIT=y
+CONFIG_DRM=y
+CONFIG_DRM_VKMS=y
+CONFIG_DRM_VKMS_KUNIT_TESTS=y
diff --git a/drivers/gpu/drm/vkms/tests/vkms_color_tests.c b/drivers/gpu/drm/vkms/tests/vkms_color_tests.c
new file mode 100644
index 000000000000..fc73e48aa57c
--- /dev/null
+++ b/drivers/gpu/drm/vkms/tests/vkms_color_tests.c
@@ -0,0 +1,163 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+#include <kunit/test.h>
+
+#include <drm/drm_fixed.h>
+
+#define TEST_LUT_SIZE 16
+
+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 },
+};
+
+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)
+{
+	int i;
+
+	KUNIT_EXPECT_EQ(test, drm_fixp2int(get_lut_index(&test_linear_lut, test_linear_array[0].red)), 0);
+
+	for (i = 0; i < TEST_LUT_SIZE; i++)
+		KUNIT_EXPECT_EQ(test, drm_fixp2int_ceil(get_lut_index(&test_linear_lut, test_linear_array[i].red)), 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_LICENSE("GPL");
\ No newline at end of file
diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c
index e70cd473e3be..d178f2a400f6 100644
--- a/drivers/gpu/drm/vkms/vkms_composer.c
+++ b/drivers/gpu/drm/vkms/vkms_composer.c
@@ -91,7 +91,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)
+u16 lerp_u16(u16 a, u16 b, s64 t)
 {
 	s64 a_fp = drm_int2fixp(a);
 	s64 b_fp = drm_int2fixp(b);
@@ -101,7 +101,7 @@ static u16 lerp_u16(u16 a, u16 b, s64 t)
 	return drm_fixp2int_round(a_fp + delta);
 }
 
-static s64 get_lut_index(const struct vkms_color_lut *lut, u16 channel_value)
+s64 get_lut_index(const struct vkms_color_lut *lut, u16 channel_value)
 {
 	s64 color_channel_fp = drm_int2fixp(channel_value);
 
@@ -429,3 +429,7 @@ int vkms_set_crc_source(struct drm_crtc *crtc, const char *src_name)
 
 	return ret;
 }
+
+#ifdef CONFIG_DRM_VKMS_KUNIT_TESTS
+#include "tests/vkms_color_tests.c"
+#endif
-- 
2.44.0


  parent reply	other threads:[~2024-02-26 21:11 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-26 21:10 [RFC PATCH v4 00/42] Color Pipeline API w/ VKMS Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 01/42] drm: Don't treat 0 as -1 in drm_fixp2int_ceil Harry Wentland
2024-03-14 13:41   ` Melissa Wen
2024-02-26 21:10 ` [RFC PATCH v4 02/42] drm: Add helper for conversion from signed-magnitude Harry Wentland
2024-03-14 13:16   ` Melissa Wen
2024-02-26 21:10 ` [RFC PATCH v4 03/42] drm: Correctly round for fixp2int_round Harry Wentland
2024-03-11 13:11   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 04/42] drm/vkms: Round fixp2int conversion in lerp_u16 Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 05/42] drm/vkms: Create separate Kconfig file for VKMS Harry Wentland
2024-03-12 18:49   ` Melissa Wen
2024-02-26 21:10 ` Harry Wentland [this message]
2024-02-27 12:14   ` [RFC PATCH v4 06/42] drm/vkms: Add kunit tests for VKMS LUT handling Arthur Grillo
2024-02-27 14:09     ` Harry Wentland
2024-03-11 13:45   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 07/42] drm/vkms: Avoid reading beyond LUT array Harry Wentland
2024-03-12 18:54   ` Melissa Wen
2024-02-26 21:10 ` [RFC PATCH v4 08/42] drm/doc/rfc: Describe why prescriptive color pipeline is needed Harry Wentland
2024-03-11 15:11   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 09/42] drm/colorop: Introduce new drm_colorop mode object Harry Wentland
2024-05-21 15:28   ` Melissa Wen
2024-02-26 21:10 ` [RFC PATCH v4 10/42] drm/colorop: Add TYPE property Harry Wentland
2024-03-12 15:02   ` Pekka Paalanen
2024-03-12 15:15     ` Simon Ser
2024-03-12 15:55       ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 11/42] drm/colorop: Add 1D Curve subtype Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 12/42] drm/colorop: Add BYPASS property Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 13/42] drm/colorop: Add NEXT property Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 14/42] drm/colorop: Add atomic state print for drm_colorop Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 15/42] drm/plane: Add COLOR PIPELINE property Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 16/42] drm/colorop: Add NEXT to colorop state print Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 17/42] drm/vkms: Add enumerated 1D curve colorop Harry Wentland
2024-03-12 15:27   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 18/42] drm/vkms: Add kunit tests for linear and sRGB LUTs Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 19/42] drm/colorop: Introduce DRM_CLIENT_CAP_PLANE_COLOR_PIPELINE Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 20/42] drm/colorop: Add 3x4 CTM type Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 21/42] drm/vkms: Pull apply_colorop out of pre_blend_color_transform Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 22/42] drm/vkms: Use s32 for internal color pipeline precision Harry Wentland
2024-03-12 15:50   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 23/42] drm/vkms: add 3x4 matrix in color pipeline Harry Wentland
2024-03-14 15:23   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 24/42] drm/tests: Add a few tests around drm_fixed.h Harry Wentland
2024-03-14 15:36   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 25/42] drm/vkms: Add tests for CTM handling Harry Wentland
2024-03-14 16:02   ` Pekka Paalanen
2024-02-26 21:10 ` [RFC PATCH v4 26/42] drm/colorop: pass plane_color_pipeline client cap to atomic check Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 27/42] drm/colorop: define a new macro for_each_new_colorop_in_state Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 28/42] drm/amd/display: Ignore deprecated props when plane_color_pipeline set Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 29/42] drm/amd/display: Add bypass COLOR PIPELINE Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 30/42] drm/amd/display: Skip color pipeline initialization for cursor plane Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 31/42] drm/amd/display: Add support for sRGB EOTF in DEGAM block Harry Wentland
2024-05-21 15:45   ` Melissa Wen
2024-05-21 15:55     ` Melissa Wen
2024-02-26 21:10 ` [RFC PATCH v4 32/42] drm/amd/display: Add support for sRGB Inverse EOTF in SHAPER block Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 33/42] drm/amd/display: Add support for sRGB EOTF in BLND block Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 34/42] drm/colorop: Add PQ 125 EOTF and its inverse Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 35/42] drm/amd/display: Enable support for PQ 125 EOTF and Inverse Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 36/42] drm/colorop: add BT2020/BT709 OETF and Inverse OETF Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 37/42] drm/amd/display: Add support for BT.709 and BT.2020 TFs Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 38/42] drm/colorop: Add 1D Curve Custom LUT type Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 39/42] drm/amd/display: add shaper and blend colorops for 1D Curve Custom LUT Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 40/42] drm/amd/display: add 3x4 matrix colorop Harry Wentland
2024-02-26 21:10 ` [RFC PATCH v4 41/42] drm/colorop: Add mutliplier type Harry Wentland
2024-05-21 15:38   ` Melissa Wen
2024-02-26 21:10 ` [RFC PATCH v4 42/42] drm/amd/display: add multiplier colorop Harry Wentland
2024-02-27 10:26 ` [RFC PATCH v4 00/42] Color Pipeline API w/ VKMS Joshua Ashton
2024-02-27 14:00   ` Harry Wentland
2024-02-29 10:43 ` Daniel Vetter
2024-02-29 15:31   ` Joshua Ashton
2024-05-21 15:50 ` Melissa Wen
2024-06-05 10:04 ` Melissa Wen
2024-06-11 17:35   ` Harry Wentland
2024-08-04 21:25     ` 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=20240226211100.100108-7-harry.wentland@amd.com \
    --to=harry.wentland@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=arthurgrillo@riseup.net \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=wayland-devel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.