| Message ID | 20241007-yuv-v12-13-01c1ada6fec8@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/vkms: Reimplement line-per-line pixel conversion for plane reading | expand |
Hi, On Mon, Oct 07, 2024 at 06:10:47PM GMT, Louis Chauvet wrote: > From: Arthur Grillo <arthurgrillo@riseup.net> > > Create KUnit tests to test the conversion between YUV and RGB. Test each > conversion and range combination with some common colors. > > The code used to compute the expected result can be found in comment. > > [Louis Chauvet: > - fix minor formating issues (whitespace, double line) > - change expected alpha from 0x0000 to 0xffff > - adapt to the new get_conversion_matrix usage > - apply the changes from Arthur > - move struct pixel_yuv_u8 to the test itself] > > Signed-off-by: Arthur Grillo <arthurgrillo@riseup.net> > Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com> > Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com> > --- > drivers/gpu/drm/vkms/Kconfig | 15 ++ > drivers/gpu/drm/vkms/Makefile | 1 + > drivers/gpu/drm/vkms/tests/.kunitconfig | 4 + > drivers/gpu/drm/vkms/tests/Makefile | 3 + > drivers/gpu/drm/vkms/tests/vkms_format_test.c | 232 ++++++++++++++++++++++++++ > drivers/gpu/drm/vkms/vkms_formats.c | 7 +- > drivers/gpu/drm/vkms/vkms_formats.h | 5 + > 7 files changed, 265 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/vkms/Kconfig b/drivers/gpu/drm/vkms/Kconfig > index 9def079f685b..98ecfce929f3 100644 > --- a/drivers/gpu/drm/vkms/Kconfig > +++ b/drivers/gpu/drm/vkms/Kconfig > @@ -14,3 +14,18 @@ config DRM_VKMS > a VKMS. > > If M is selected the module will be called vkms. > + > +config DRM_VKMS_KUNIT_TESTS > + tristate "KUnit tests for VKMS." if !KUNIT_ALL_TESTS > + depends on DRM_VKMS=y && KUNIT > + default KUNIT_ALL_TESTS > + help > + This builds unit tests for VKMS. This option is not useful for > + distributions or general kernels, but only for kernel > + developers working on VKMS. > + > + For more information on KUnit and unit tests in general, > + please refer to the KUnit documentation in > + Documentation/dev-tools/kunit/. > + > + If in doubt, say "N". > diff --git a/drivers/gpu/drm/vkms/Makefile b/drivers/gpu/drm/vkms/Makefile > index 1b28a6a32948..8d3e46dde635 100644 > --- a/drivers/gpu/drm/vkms/Makefile > +++ b/drivers/gpu/drm/vkms/Makefile > @@ -9,3 +9,4 @@ vkms-y := \ > vkms_writeback.o > > obj-$(CONFIG_DRM_VKMS) += vkms.o > +obj-$(CONFIG_DRM_VKMS_KUNIT_TESTS) += 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/Makefile b/drivers/gpu/drm/vkms/tests/Makefile > new file mode 100644 > index 000000000000..2d1df668569e > --- /dev/null > +++ b/drivers/gpu/drm/vkms/tests/Makefile > @@ -0,0 +1,3 @@ > +# SPDX-License-Identifier: GPL-2.0-only > + > +obj-$(CONFIG_DRM_VKMS_KUNIT_TESTS) += vkms_format_test.o > diff --git a/drivers/gpu/drm/vkms/tests/vkms_format_test.c b/drivers/gpu/drm/vkms/tests/vkms_format_test.c > new file mode 100644 > index 000000000000..351409897ca3 > --- /dev/null > +++ b/drivers/gpu/drm/vkms/tests/vkms_format_test.c > @@ -0,0 +1,232 @@ > +// SPDX-License-Identifier: GPL-2.0+ > + > +#include <kunit/test.h> > + > +#include <drm/drm_fixed.h> > +#include <drm/drm_fourcc.h> > + > +#include "../../drm_crtc_internal.h" > + > +#include "../vkms_formats.h" > + > +#define TEST_BUFF_SIZE 50 > + > +MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING); > + > +struct pixel_yuv_u8 { > + u8 y, u, v; > +}; > + > +struct yuv_u8_to_argb_u16_case { > + enum drm_color_encoding encoding; > + enum drm_color_range range; > + size_t n_colors; > + struct format_pair { > + char *name; > + struct pixel_yuv_u8 yuv; > + struct pixel_argb_u16 argb; > + } colors[TEST_BUFF_SIZE]; > +}; > + > +/* > + * The YUV color representation were acquired via the colour python framework. > + * Below are the function calls used for generating each case. > + * > + * For more information got to the docs: > + * https://colour.readthedocs.io/en/master/generated/colour.RGB_to_YCbCr.html > + */ > +static struct yuv_u8_to_argb_u16_case yuv_u8_to_argb_u16_cases[] = { > + /* > + * colour.RGB_to_YCbCr(<rgb color in 16 bit form>, > + * K=colour.WEIGHTS_YCBCR["ITU-R BT.601"], > + * in_bits = 16, > + * in_legal = False, > + * in_int = True, > + * out_bits = 8, > + * out_legal = False, > + * out_int = True) > + */ We should really detail what the intent and expected outcome is supposed to be here. Relying on a third-party python library call for documentation isn't great. Maxime
Hi, > > + * The YUV color representation were acquired via the colour python framework. > > + * Below are the function calls used for generating each case. > > + * > > + * For more information got to the docs: > > + * https://colour.readthedocs.io/en/master/generated/colour.RGB_to_YCbCr.html > > + */ > > +static struct yuv_u8_to_argb_u16_case yuv_u8_to_argb_u16_cases[] = { > > + /* > > + * colour.RGB_to_YCbCr(<rgb color in 16 bit form>, > > + * K=colour.WEIGHTS_YCBCR["ITU-R BT.601"], > > + * in_bits = 16, > > + * in_legal = False, > > + * in_int = True, > > + * out_bits = 8, > > + * out_legal = False, > > + * out_int = True) > > + */ > > We should really detail what the intent and expected outcome is supposed > to be here. Relying on a third-party python library call for > documentation isn't great. > > Maxime This was requested by Pekka in the [v2] of this series. I can add something like this before each tests, but I think having the exact python code used may help people to understand what should be the behavior, and refering to the python code to understand the conversion. I can add something like this before each tests to clarify the tested case: Test cases for conversion between YUV BT601 limited range and RGB using the ITU-R BT.601 weights. Or maybe just documenting the structure yuv_u8_to_argb_u16_case: @encoding: Encoding used to convert RGB to YUV @range: Range used to convert RGB to YUV @n_colors: Count of test colors in this case @format_pair.name: Name used for this color conversion, used to clarify the test results @format_pair.rgb: RGB color tested @format_pair.yuv: Same color as @format_pair.rgb, but converted to YUV using @encoding and @range. What do you think? Thanks, Louis Chauvet [v2]:https://lore.kernel.org/all/20240229141238.51891cad.pekka.paalanen@collabora.com/ [v5]:https://lore.kernel.org/all/20240328152631.63af0e8c.pekka.paalanen@collabora.com/
Hi Louis, kernel test robot noticed the following build errors: [auto build test ERROR on 82fe69e63d2b5a5e86ea94c7361c833d3848ab69] url: https://github.com/intel-lab-lkp/linux/commits/Louis-Chauvet/drm-vkms-Code-formatting/20241008-001316 base: 82fe69e63d2b5a5e86ea94c7361c833d3848ab69 patch link: https://lore.kernel.org/r/20241007-yuv-v12-13-01c1ada6fec8%40bootlin.com patch subject: [PATCH v12 13/15] drm/vkms: Create KUnit tests for YUV conversions config: i386-randconfig-013-20241010 (https://download.01.org/0day-ci/archive/20241011/202410110407.EHvadSaF-lkp@intel.com/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241011/202410110407.EHvadSaF-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202410110407.EHvadSaF-lkp@intel.com/ All errors (new ones prefixed by >>, old ones prefixed by <<): WARNING: modpost: missing MODULE_DESCRIPTION() in lib/slub_kunit.o >> ERROR: modpost: "drm_get_color_range_name" [drivers/gpu/drm/vkms/tests/vkms_format_test.ko] undefined! >> ERROR: modpost: "drm_get_color_encoding_name" [drivers/gpu/drm/vkms/tests/vkms_format_test.ko] undefined! >> ERROR: modpost: "get_conversion_matrix_to_argb_u16" [drivers/gpu/drm/vkms/tests/vkms_format_test.ko] undefined! Kconfig warnings: (for reference only) WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=y]
On Tue, Oct 08, 2024 at 11:23:22AM GMT, Louis Chauvet wrote: > > Hi, > > > > + * The YUV color representation were acquired via the colour python framework. > > > + * Below are the function calls used for generating each case. > > > + * > > > + * For more information got to the docs: > > > + * https://colour.readthedocs.io/en/master/generated/colour.RGB_to_YCbCr.html > > > + */ > > > +static struct yuv_u8_to_argb_u16_case yuv_u8_to_argb_u16_cases[] = { > > > + /* > > > + * colour.RGB_to_YCbCr(<rgb color in 16 bit form>, > > > + * K=colour.WEIGHTS_YCBCR["ITU-R BT.601"], > > > + * in_bits = 16, > > > + * in_legal = False, > > > + * in_int = True, > > > + * out_bits = 8, > > > + * out_legal = False, > > > + * out_int = True) > > > + */ > > > > We should really detail what the intent and expected outcome is supposed > > to be here. Relying on a third-party python library call for > > documentation isn't great. > > This was requested by Pekka in the [v2] of this series. Ok. > I can add something like this before each tests, but I think having the > exact python code used may help people to understand what should be the > behavior, and refering to the python code to understand the conversion. Help, sure. Be the *only* documentation, absolutely not. Let's turn this around. You run kunit, one of these tests fail: - It adds cognitive load to try to identify and make sense of an unknown lib. - How can we check that the arguments you provided there are the one you actually wanted to provide, and you didn't make a typo? > I can add something like this before each tests to clarify the tested > case: > > Test cases for conversion between YUV BT601 limited range and > RGB using the ITU-R BT.601 weights. > > Or maybe just documenting the structure yuv_u8_to_argb_u16_case: > > @encoding: Encoding used to convert RGB to YUV > @range: Range used to convert RGB to YUV > @n_colors: Count of test colors in this case > @format_pair.name: Name used for this color conversion, used to > clarify the test results > @format_pair.rgb: RGB color tested > @format_pair.yuv: Same color as @format_pair.rgb, but converted to > YUV using @encoding and @range. > > What do you think? That it's welcome, but it still doesn't allow to figure out what your intent was with this test 2 years from now. Maxime
On 11/10/24 - 12:49, Maxime Ripard wrote: > On Tue, Oct 08, 2024 at 11:23:22AM GMT, Louis Chauvet wrote: > > > > Hi, > > > > > > + * The YUV color representation were acquired via the colour python framework. > > > > + * Below are the function calls used for generating each case. > > > > + * > > > > + * For more information got to the docs: > > > > + * https://colour.readthedocs.io/en/master/generated/colour.RGB_to_YCbCr.html > > > > + */ > > > > +static struct yuv_u8_to_argb_u16_case yuv_u8_to_argb_u16_cases[] = { > > > > + /* > > > > + * colour.RGB_to_YCbCr(<rgb color in 16 bit form>, > > > > + * K=colour.WEIGHTS_YCBCR["ITU-R BT.601"], > > > > + * in_bits = 16, > > > > + * in_legal = False, > > > > + * in_int = True, > > > > + * out_bits = 8, > > > > + * out_legal = False, > > > > + * out_int = True) > > > > + */ > > > > > > We should really detail what the intent and expected outcome is supposed > > > to be here. Relying on a third-party python library call for > > > documentation isn't great. > > > > This was requested by Pekka in the [v2] of this series. > > Ok. > > > I can add something like this before each tests, but I think having the > > exact python code used may help people to understand what should be the > > behavior, and refering to the python code to understand the conversion. > > Help, sure. Be the *only* documentation, absolutely not. > > Let's turn this around. You run kunit, one of these tests fail: > > - It adds cognitive load to try to identify and make sense of an > unknown lib. > > - How can we check that the arguments you provided there are the one > you actually wanted to provide, and you didn't make a typo? > > > I can add something like this before each tests to clarify the tested > > case: > > > > Test cases for conversion between YUV BT601 limited range and > > RGB using the ITU-R BT.601 weights. > > > > Or maybe just documenting the structure yuv_u8_to_argb_u16_case: > > > > @encoding: Encoding used to convert RGB to YUV > > @range: Range used to convert RGB to YUV > > @n_colors: Count of test colors in this case > > @format_pair.name: Name used for this color conversion, used to > > clarify the test results > > @format_pair.rgb: RGB color tested > > @format_pair.yuv: Same color as @format_pair.rgb, but converted to > > YUV using @encoding and @range. > > > > What do you think? > > That it's welcome, but it still doesn't allow to figure out what your > intent was with this test 2 years from now. I don't really understand what you want to add. Can you explain what you expect here? Did you mean you want a description like this above the test function? /* * vkms_format_test_yuv_u8_to_argb_u16 - Testing the conversion between YUV * colors to ARGB colors in VKMS * * This test will use the functions get_conversion_matrix_to_argb_u16 and * argb_u16_from_yuv888 to convert YUV colors (stored in * yuv_u8_to_argb_u16_cases) into ARGB colors. * * As there is a different range between YUV input (8 bits) and RGB output (16 * bits), the values are not checked exactly but ensured that they are within * the uncertainty range. */ Thanks, Louis Chauvet > Maxime
On Fri, Oct 11, 2024 at 04:29:25PM +0200, Louis Chauvet wrote: > On 11/10/24 - 12:49, Maxime Ripard wrote: > > On Tue, Oct 08, 2024 at 11:23:22AM GMT, Louis Chauvet wrote: > > > > > > Hi, > > > > > > > > + * The YUV color representation were acquired via the colour python framework. > > > > > + * Below are the function calls used for generating each case. > > > > > + * > > > > > + * For more information got to the docs: > > > > > + * https://colour.readthedocs.io/en/master/generated/colour.RGB_to_YCbCr.html > > > > > + */ > > > > > +static struct yuv_u8_to_argb_u16_case yuv_u8_to_argb_u16_cases[] = { > > > > > + /* > > > > > + * colour.RGB_to_YCbCr(<rgb color in 16 bit form>, > > > > > + * K=colour.WEIGHTS_YCBCR["ITU-R BT.601"], > > > > > + * in_bits = 16, > > > > > + * in_legal = False, > > > > > + * in_int = True, > > > > > + * out_bits = 8, > > > > > + * out_legal = False, > > > > > + * out_int = True) > > > > > + */ > > > > > > > > We should really detail what the intent and expected outcome is supposed > > > > to be here. Relying on a third-party python library call for > > > > documentation isn't great. > > > > > > This was requested by Pekka in the [v2] of this series. > > > > Ok. > > > > > I can add something like this before each tests, but I think having the > > > exact python code used may help people to understand what should be the > > > behavior, and refering to the python code to understand the conversion. > > > > Help, sure. Be the *only* documentation, absolutely not. > > > > Let's turn this around. You run kunit, one of these tests fail: > > > > - It adds cognitive load to try to identify and make sense of an > > unknown lib. > > > > - How can we check that the arguments you provided there are the one > > you actually wanted to provide, and you didn't make a typo? > > > > > I can add something like this before each tests to clarify the tested > > > case: > > > > > > Test cases for conversion between YUV BT601 limited range and > > > RGB using the ITU-R BT.601 weights. > > > > > > Or maybe just documenting the structure yuv_u8_to_argb_u16_case: > > > > > > @encoding: Encoding used to convert RGB to YUV > > > @range: Range used to convert RGB to YUV > > > @n_colors: Count of test colors in this case > > > @format_pair.name: Name used for this color conversion, used to > > > clarify the test results > > > @format_pair.rgb: RGB color tested > > > @format_pair.yuv: Same color as @format_pair.rgb, but converted to > > > YUV using @encoding and @range. > > > > > > What do you think? > > > > That it's welcome, but it still doesn't allow to figure out what your > > intent was with this test 2 years from now. > > I don't really understand what you want to add. Can you explain what you > expect here? Did you mean you want a description like this above the test > function? I want, for each test case, to have a documentation of what case it's testing and what the test should expect. So, for the first one, something like: /* * Test the conversion of full range, BT601-encoded, YUVXXX pixel to * ARGBXXXX, for various colors. This has been generated using: * * colour.RGB_to_YCbCR(...) */ And there's other things you need to document. Like, it seems that you sometimes pass different values for in_legal and out_legal, and that's not clear to me. It also that you uses a matrix for NV12 but are converting a different format. This needs to be documented. Finally, You should be documented why you are checking that the colors difference is less than 257, and not exactly equal. Maxime
Hi Louis, On 07/10/24 13:10, Louis Chauvet wrote: > From: Arthur Grillo <arthurgrillo@riseup.net> > > Create KUnit tests to test the conversion between YUV and RGB. Test each > conversion and range combination with some common colors. > > The code used to compute the expected result can be found in comment. > > [Louis Chauvet: > - fix minor formating issues (whitespace, double line) > - change expected alpha from 0x0000 to 0xffff > - adapt to the new get_conversion_matrix usage > - apply the changes from Arthur > - move struct pixel_yuv_u8 to the test itself] > > Signed-off-by: Arthur Grillo <arthurgrillo@riseup.net> > Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com> > Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com> > --- > drivers/gpu/drm/vkms/Kconfig | 15 ++ > drivers/gpu/drm/vkms/Makefile | 1 + > drivers/gpu/drm/vkms/tests/.kunitconfig | 4 + > drivers/gpu/drm/vkms/tests/Makefile | 3 + > drivers/gpu/drm/vkms/tests/vkms_format_test.c | 232 ++++++++++++++++++++++++++ > drivers/gpu/drm/vkms/vkms_formats.c | 7 +- > drivers/gpu/drm/vkms/vkms_formats.h | 5 + > 7 files changed, 265 insertions(+), 2 deletions(-) > [...] > + > +static void vkms_format_test_yuv_u8_to_argb_u16(struct kunit *test) > +{ > + const struct yuv_u8_to_argb_u16_case *param = test->param_value; > + struct pixel_argb_u16 argb; > + > + for (size_t i = 0; i < param->n_colors; i++) { > + const struct format_pair *color = ¶m->colors[i]; > + struct conversion_matrix matrix; > + > + get_conversion_matrix_to_argb_u16 > + (DRM_FORMAT_NV12, param->encoding, param->range, &matrix); > + > + argb = argb_u16_from_yuv888(color->yuv.y, color->yuv.u, color->yuv.v, &matrix); This should be `argb_u16_from_yuv161616` as you fixed in [1]. [1] https://lore.kernel.org/all/20241007-b4-new-color-formats-v2-5-d47da50d4674@bootlin.com/ Best Regards, - Maíra > + > + KUNIT_EXPECT_LE_MSG(test, abs_diff(argb.a, color->argb.a), 257, > + "On the A channel of the color %s expected 0x%04x, got 0x%04x", > + color->name, color->argb.a, argb.a); > + KUNIT_EXPECT_LE_MSG(test, abs_diff(argb.r, color->argb.r), 257, > + "On the R channel of the color %s expected 0x%04x, got 0x%04x", > + color->name, color->argb.r, argb.r); > + KUNIT_EXPECT_LE_MSG(test, abs_diff(argb.g, color->argb.g), 257, > + "On the G channel of the color %s expected 0x%04x, got 0x%04x", > + color->name, color->argb.g, argb.g); > + KUNIT_EXPECT_LE_MSG(test, abs_diff(argb.b, color->argb.b), 257, > + "On the B channel of the color %s expected 0x%04x, got 0x%04x", > + color->name, color->argb.b, argb.b); > + } > +} > + > +static void vkms_format_test_yuv_u8_to_argb_u16_case_desc(struct yuv_u8_to_argb_u16_case *t, > + char *desc) > +{ > + snprintf(desc, KUNIT_PARAM_DESC_SIZE, "%s - %s", > + drm_get_color_encoding_name(t->encoding), drm_get_color_range_name(t->range)); > +} > + > +KUNIT_ARRAY_PARAM(yuv_u8_to_argb_u16, yuv_u8_to_argb_u16_cases, > + vkms_format_test_yuv_u8_to_argb_u16_case_desc > +); > + > +static struct kunit_case vkms_format_test_cases[] = { > + KUNIT_CASE_PARAM(vkms_format_test_yuv_u8_to_argb_u16, yuv_u8_to_argb_u16_gen_params), > + {} > +}; > + > +static struct kunit_suite vkms_format_test_suite = { > + .name = "vkms-format", > + .test_cases = vkms_format_test_cases, > +}; > + > +kunit_test_suite(vkms_format_test_suite); > + > +MODULE_LICENSE("GPL"); > +MODULE_DESCRIPTION("Kunit test for vkms format conversion"); > diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c > index adb1228e5201..0b201185eae7 100644 > --- a/drivers/gpu/drm/vkms/vkms_formats.c > +++ b/drivers/gpu/drm/vkms/vkms_formats.c > @@ -7,6 +7,8 @@ > #include <drm/drm_rect.h> > #include <drm/drm_fixed.h> > > +#include <kunit/visibility.h> > + > #include "vkms_formats.h" > > /** > @@ -247,8 +249,8 @@ static struct pixel_argb_u16 argb_u16_from_RGB565(const __le16 *pixel) > return out_pixel; > } > > -static struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel_2, > - const struct conversion_matrix *matrix) > +VISIBLE_IF_KUNIT struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel_2, > + const struct conversion_matrix *matrix) > { > u16 r, g, b; > s64 fp_y, fp_channel_1, fp_channel_2; > @@ -278,6 +280,7 @@ static struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel > > return argb_u16_from_u16161616(0xffff, r, g, b); > } > +EXPORT_SYMBOL_IF_KUNIT(argb_u16_from_yuv888); > > /* > * The following functions are read_line function for each pixel format supported by VKMS. > diff --git a/drivers/gpu/drm/vkms/vkms_formats.h b/drivers/gpu/drm/vkms/vkms_formats.h > index d583855cb320..b4fe62ab9c65 100644 > --- a/drivers/gpu/drm/vkms/vkms_formats.h > +++ b/drivers/gpu/drm/vkms/vkms_formats.h > @@ -13,4 +13,9 @@ void get_conversion_matrix_to_argb_u16(u32 format, enum drm_color_encoding encod > enum drm_color_range range, > struct conversion_matrix *matrix); > > +#if IS_ENABLED(CONFIG_KUNIT) > +struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel_2, > + const struct conversion_matrix *matrix); > +#endif > + > #endif /* _VKMS_FORMATS_H_ */ >
On 26/10/24 - 11:49, Maíra Canal wrote: > Hi Louis, > > On 07/10/24 13:10, Louis Chauvet wrote: > > From: Arthur Grillo <arthurgrillo@riseup.net> > > > > Create KUnit tests to test the conversion between YUV and RGB. Test each > > conversion and range combination with some common colors. > > > > The code used to compute the expected result can be found in comment. > > > > [Louis Chauvet: > > - fix minor formating issues (whitespace, double line) > > - change expected alpha from 0x0000 to 0xffff > > - adapt to the new get_conversion_matrix usage > > - apply the changes from Arthur > > - move struct pixel_yuv_u8 to the test itself] > > > > Signed-off-by: Arthur Grillo <arthurgrillo@riseup.net> > > Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com> > > Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com> > > --- > > drivers/gpu/drm/vkms/Kconfig | 15 ++ > > drivers/gpu/drm/vkms/Makefile | 1 + > > drivers/gpu/drm/vkms/tests/.kunitconfig | 4 + > > drivers/gpu/drm/vkms/tests/Makefile | 3 + > > drivers/gpu/drm/vkms/tests/vkms_format_test.c | 232 ++++++++++++++++++++++++++ > > drivers/gpu/drm/vkms/vkms_formats.c | 7 +- > > drivers/gpu/drm/vkms/vkms_formats.h | 5 + > > 7 files changed, 265 insertions(+), 2 deletions(-) > > > > [...] > > > + > > +static void vkms_format_test_yuv_u8_to_argb_u16(struct kunit *test) > > +{ > > + const struct yuv_u8_to_argb_u16_case *param = test->param_value; > > + struct pixel_argb_u16 argb; > > + > > + for (size_t i = 0; i < param->n_colors; i++) { > > + const struct format_pair *color = ¶m->colors[i]; > > + struct conversion_matrix matrix; > > + > > + get_conversion_matrix_to_argb_u16 > > + (DRM_FORMAT_NV12, param->encoding, param->range, &matrix); > > + > > + argb = argb_u16_from_yuv888(color->yuv.y, color->yuv.u, color->yuv.v, &matrix); > > This should be `argb_u16_from_yuv161616` as you fixed in [1]. (I suppose you talk about [2]?) I understand that I change this function in a future series, but [2] is not Acked-By yet. I prefer to have the opportunity to merge this first series (with yuv888) quickly and to work on [2] later (I have less conflicts between [2] and the rest of my work on configFS). If I get a Acked-by on [2], I can merge the two commits and directly use yuv161616 conversion functions. Thanks, Louis Chauvet [2]:https://lore.kernel.org/all/20241007-b4-new-color-formats-v2-6-d47da50d4674@bootlin.com/ > [1] https://lore.kernel.org/all/20241007-b4-new-color-formats-v2-5-d47da50d4674@bootlin.com/ > > Best Regards, > - Maíra > > > + > > + KUNIT_EXPECT_LE_MSG(test, abs_diff(argb.a, color->argb.a), 257, > > + "On the A channel of the color %s expected 0x%04x, got 0x%04x", > > + color->name, color->argb.a, argb.a); > > + KUNIT_EXPECT_LE_MSG(test, abs_diff(argb.r, color->argb.r), 257, > > + "On the R channel of the color %s expected 0x%04x, got 0x%04x", > > + color->name, color->argb.r, argb.r); > > + KUNIT_EXPECT_LE_MSG(test, abs_diff(argb.g, color->argb.g), 257, > > + "On the G channel of the color %s expected 0x%04x, got 0x%04x", > > + color->name, color->argb.g, argb.g); > > + KUNIT_EXPECT_LE_MSG(test, abs_diff(argb.b, color->argb.b), 257, > > + "On the B channel of the color %s expected 0x%04x, got 0x%04x", > > + color->name, color->argb.b, argb.b); > > + } > > +} > > + > > +static void vkms_format_test_yuv_u8_to_argb_u16_case_desc(struct yuv_u8_to_argb_u16_case *t, > > + char *desc) > > +{ > > + snprintf(desc, KUNIT_PARAM_DESC_SIZE, "%s - %s", > > + drm_get_color_encoding_name(t->encoding), drm_get_color_range_name(t->range)); > > +} > > + > > +KUNIT_ARRAY_PARAM(yuv_u8_to_argb_u16, yuv_u8_to_argb_u16_cases, > > + vkms_format_test_yuv_u8_to_argb_u16_case_desc > > +); > > + > > +static struct kunit_case vkms_format_test_cases[] = { > > + KUNIT_CASE_PARAM(vkms_format_test_yuv_u8_to_argb_u16, yuv_u8_to_argb_u16_gen_params), > > + {} > > +}; > > + > > +static struct kunit_suite vkms_format_test_suite = { > > + .name = "vkms-format", > > + .test_cases = vkms_format_test_cases, > > +}; > > + > > +kunit_test_suite(vkms_format_test_suite); > > + > > +MODULE_LICENSE("GPL"); > > +MODULE_DESCRIPTION("Kunit test for vkms format conversion"); > > diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c > > index adb1228e5201..0b201185eae7 100644 > > --- a/drivers/gpu/drm/vkms/vkms_formats.c > > +++ b/drivers/gpu/drm/vkms/vkms_formats.c > > @@ -7,6 +7,8 @@ > > #include <drm/drm_rect.h> > > #include <drm/drm_fixed.h> > > +#include <kunit/visibility.h> > > + > > #include "vkms_formats.h" > > /** > > @@ -247,8 +249,8 @@ static struct pixel_argb_u16 argb_u16_from_RGB565(const __le16 *pixel) > > return out_pixel; > > } > > -static struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel_2, > > - const struct conversion_matrix *matrix) > > +VISIBLE_IF_KUNIT struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel_2, > > + const struct conversion_matrix *matrix) > > { > > u16 r, g, b; > > s64 fp_y, fp_channel_1, fp_channel_2; > > @@ -278,6 +280,7 @@ static struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel > > return argb_u16_from_u16161616(0xffff, r, g, b); > > } > > +EXPORT_SYMBOL_IF_KUNIT(argb_u16_from_yuv888); > > /* > > * The following functions are read_line function for each pixel format supported by VKMS. > > diff --git a/drivers/gpu/drm/vkms/vkms_formats.h b/drivers/gpu/drm/vkms/vkms_formats.h > > index d583855cb320..b4fe62ab9c65 100644 > > --- a/drivers/gpu/drm/vkms/vkms_formats.h > > +++ b/drivers/gpu/drm/vkms/vkms_formats.h > > @@ -13,4 +13,9 @@ void get_conversion_matrix_to_argb_u16(u32 format, enum drm_color_encoding encod > > enum drm_color_range range, > > struct conversion_matrix *matrix); > > +#if IS_ENABLED(CONFIG_KUNIT) > > +struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel_2, > > + const struct conversion_matrix *matrix); > > +#endif > > + > > #endif /* _VKMS_FORMATS_H_ */ > >
diff --git a/drivers/gpu/drm/vkms/Kconfig b/drivers/gpu/drm/vkms/Kconfig index 9def079f685b..98ecfce929f3 100644 --- a/drivers/gpu/drm/vkms/Kconfig +++ b/drivers/gpu/drm/vkms/Kconfig @@ -14,3 +14,18 @@ config DRM_VKMS a VKMS. If M is selected the module will be called vkms. + +config DRM_VKMS_KUNIT_TESTS + tristate "KUnit tests for VKMS." if !KUNIT_ALL_TESTS + depends on DRM_VKMS=y && KUNIT + default KUNIT_ALL_TESTS + help + This builds unit tests for VKMS. This option is not useful for + distributions or general kernels, but only for kernel + developers working on VKMS. + + For more information on KUnit and unit tests in general, + please refer to the KUnit documentation in + Documentation/dev-tools/kunit/. + + If in doubt, say "N". diff --git a/drivers/gpu/drm/vkms/Makefile b/drivers/gpu/drm/vkms/Makefile index 1b28a6a32948..8d3e46dde635 100644 --- a/drivers/gpu/drm/vkms/Makefile +++ b/drivers/gpu/drm/vkms/Makefile @@ -9,3 +9,4 @@ vkms-y := \ vkms_writeback.o obj-$(CONFIG_DRM_VKMS) += vkms.o +obj-$(CONFIG_DRM_VKMS_KUNIT_TESTS) += 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/Makefile b/drivers/gpu/drm/vkms/tests/Makefile new file mode 100644 index 000000000000..2d1df668569e --- /dev/null +++ b/drivers/gpu/drm/vkms/tests/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_DRM_VKMS_KUNIT_TESTS) += vkms_format_test.o diff --git a/drivers/gpu/drm/vkms/tests/vkms_format_test.c b/drivers/gpu/drm/vkms/tests/vkms_format_test.c new file mode 100644 index 000000000000..351409897ca3 --- /dev/null +++ b/drivers/gpu/drm/vkms/tests/vkms_format_test.c @@ -0,0 +1,232 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include <kunit/test.h> + +#include <drm/drm_fixed.h> +#include <drm/drm_fourcc.h> + +#include "../../drm_crtc_internal.h" + +#include "../vkms_formats.h" + +#define TEST_BUFF_SIZE 50 + +MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING); + +struct pixel_yuv_u8 { + u8 y, u, v; +}; + +struct yuv_u8_to_argb_u16_case { + enum drm_color_encoding encoding; + enum drm_color_range range; + size_t n_colors; + struct format_pair { + char *name; + struct pixel_yuv_u8 yuv; + struct pixel_argb_u16 argb; + } colors[TEST_BUFF_SIZE]; +}; + +/* + * The YUV color representation were acquired via the colour python framework. + * Below are the function calls used for generating each case. + * + * For more information got to the docs: + * https://colour.readthedocs.io/en/master/generated/colour.RGB_to_YCbCr.html + */ +static struct yuv_u8_to_argb_u16_case yuv_u8_to_argb_u16_cases[] = { + /* + * colour.RGB_to_YCbCr(<rgb color in 16 bit form>, + * K=colour.WEIGHTS_YCBCR["ITU-R BT.601"], + * in_bits = 16, + * in_legal = False, + * in_int = True, + * out_bits = 8, + * out_legal = False, + * out_int = True) + */ + { + .encoding = DRM_COLOR_YCBCR_BT601, + .range = DRM_COLOR_YCBCR_FULL_RANGE, + .n_colors = 6, + .colors = { + { "white", { 0xff, 0x80, 0x80 }, { 0xffff, 0xffff, 0xffff, 0xffff }}, + { "gray", { 0x80, 0x80, 0x80 }, { 0xffff, 0x8080, 0x8080, 0x8080 }}, + { "black", { 0x00, 0x80, 0x80 }, { 0xffff, 0x0000, 0x0000, 0x0000 }}, + { "red", { 0x4c, 0x55, 0xff }, { 0xffff, 0xffff, 0x0000, 0x0000 }}, + { "green", { 0x96, 0x2c, 0x15 }, { 0xffff, 0x0000, 0xffff, 0x0000 }}, + { "blue", { 0x1d, 0xff, 0x6b }, { 0xffff, 0x0000, 0x0000, 0xffff }}, + }, + }, + /* + * colour.RGB_to_YCbCr(<rgb color in 16 bit form>, + * K=colour.WEIGHTS_YCBCR["ITU-R BT.601"], + * in_bits = 16, + * in_legal = False, + * in_int = True, + * out_bits = 8, + * out_legal = True, + * out_int = True) + */ + { + .encoding = DRM_COLOR_YCBCR_BT601, + .range = DRM_COLOR_YCBCR_LIMITED_RANGE, + .n_colors = 6, + .colors = { + { "white", { 0xeb, 0x80, 0x80 }, { 0xffff, 0xffff, 0xffff, 0xffff }}, + { "gray", { 0x7e, 0x80, 0x80 }, { 0xffff, 0x8080, 0x8080, 0x8080 }}, + { "black", { 0x10, 0x80, 0x80 }, { 0xffff, 0x0000, 0x0000, 0x0000 }}, + { "red", { 0x51, 0x5a, 0xf0 }, { 0xffff, 0xffff, 0x0000, 0x0000 }}, + { "green", { 0x91, 0x36, 0x22 }, { 0xffff, 0x0000, 0xffff, 0x0000 }}, + { "blue", { 0x29, 0xf0, 0x6e }, { 0xffff, 0x0000, 0x0000, 0xffff }}, + }, + }, + /* + * colour.RGB_to_YCbCr(<rgb color in 16 bit form>, + * K=colour.WEIGHTS_YCBCR["ITU-R BT.709"], + * in_bits = 16, + * in_legal = False, + * in_int = True, + * out_bits = 8, + * out_legal = False, + * out_int = True) + */ + { + .encoding = DRM_COLOR_YCBCR_BT709, + .range = DRM_COLOR_YCBCR_FULL_RANGE, + .n_colors = 4, + .colors = { + { "white", { 0xff, 0x80, 0x80 }, { 0xffff, 0xffff, 0xffff, 0xffff }}, + { "gray", { 0x80, 0x80, 0x80 }, { 0xffff, 0x8080, 0x8080, 0x8080 }}, + { "black", { 0x00, 0x80, 0x80 }, { 0xffff, 0x0000, 0x0000, 0x0000 }}, + { "red", { 0x36, 0x63, 0xff }, { 0xffff, 0xffff, 0x0000, 0x0000 }}, + { "green", { 0xb6, 0x1e, 0x0c }, { 0xffff, 0x0000, 0xffff, 0x0000 }}, + { "blue", { 0x12, 0xff, 0x74 }, { 0xffff, 0x0000, 0x0000, 0xffff }}, + }, + }, + /* + * colour.RGB_to_YCbCr(<rgb color in 16 bit form>, + * K=colour.WEIGHTS_YCBCR["ITU-R BT.709"], + * in_bits = 16, + * int_legal = False, + * in_int = True, + * out_bits = 8, + * out_legal = True, + * out_int = True) + */ + { + .encoding = DRM_COLOR_YCBCR_BT709, + .range = DRM_COLOR_YCBCR_LIMITED_RANGE, + .n_colors = 4, + .colors = { + { "white", { 0xeb, 0x80, 0x80 }, { 0xffff, 0xffff, 0xffff, 0xffff }}, + { "gray", { 0x7e, 0x80, 0x80 }, { 0xffff, 0x8080, 0x8080, 0x8080 }}, + { "black", { 0x10, 0x80, 0x80 }, { 0xffff, 0x0000, 0x0000, 0x0000 }}, + { "red", { 0x3f, 0x66, 0xf0 }, { 0xffff, 0xffff, 0x0000, 0x0000 }}, + { "green", { 0xad, 0x2a, 0x1a }, { 0xffff, 0x0000, 0xffff, 0x0000 }}, + { "blue", { 0x20, 0xf0, 0x76 }, { 0xffff, 0x0000, 0x0000, 0xffff }}, + }, + }, + /* + * colour.RGB_to_YCbCr(<rgb color in 16 bit form>, + * K=colour.WEIGHTS_YCBCR["ITU-R BT.2020"], + * in_bits = 16, + * in_legal = False, + * in_int = True, + * out_bits = 8, + * out_legal = False, + * out_int = True) + */ + { + .encoding = DRM_COLOR_YCBCR_BT2020, + .range = DRM_COLOR_YCBCR_FULL_RANGE, + .n_colors = 4, + .colors = { + { "white", { 0xff, 0x80, 0x80 }, { 0xffff, 0xffff, 0xffff, 0xffff }}, + { "gray", { 0x80, 0x80, 0x80 }, { 0xffff, 0x8080, 0x8080, 0x8080 }}, + { "black", { 0x00, 0x80, 0x80 }, { 0xffff, 0x0000, 0x0000, 0x0000 }}, + { "red", { 0x43, 0x5c, 0xff }, { 0xffff, 0xffff, 0x0000, 0x0000 }}, + { "green", { 0xad, 0x24, 0x0b }, { 0xffff, 0x0000, 0xffff, 0x0000 }}, + { "blue", { 0x0f, 0xff, 0x76 }, { 0xffff, 0x0000, 0x0000, 0xffff }}, + }, + }, + /* + * colour.RGB_to_YCbCr(<rgb color in 16 bit form>, + * K=colour.WEIGHTS_YCBCR["ITU-R BT.2020"], + * in_bits = 16, + * in_legal = False, + * in_int = True, + * out_bits = 8, + * out_legal = True, + * out_int = True) + */ + { + .encoding = DRM_COLOR_YCBCR_BT2020, + .range = DRM_COLOR_YCBCR_LIMITED_RANGE, + .n_colors = 4, + .colors = { + { "white", { 0xeb, 0x80, 0x80 }, { 0xffff, 0xffff, 0xffff, 0xffff }}, + { "gray", { 0x7e, 0x80, 0x80 }, { 0xffff, 0x8080, 0x8080, 0x8080 }}, + { "black", { 0x10, 0x80, 0x80 }, { 0xffff, 0x0000, 0x0000, 0x0000 }}, + { "red", { 0x4a, 0x61, 0xf0 }, { 0xffff, 0xffff, 0x0000, 0x0000 }}, + { "green", { 0xa4, 0x2f, 0x19 }, { 0xffff, 0x0000, 0xffff, 0x0000 }}, + { "blue", { 0x1d, 0xf0, 0x77 }, { 0xffff, 0x0000, 0x0000, 0xffff }}, + }, + }, +}; + +static void vkms_format_test_yuv_u8_to_argb_u16(struct kunit *test) +{ + const struct yuv_u8_to_argb_u16_case *param = test->param_value; + struct pixel_argb_u16 argb; + + for (size_t i = 0; i < param->n_colors; i++) { + const struct format_pair *color = ¶m->colors[i]; + struct conversion_matrix matrix; + + get_conversion_matrix_to_argb_u16 + (DRM_FORMAT_NV12, param->encoding, param->range, &matrix); + + argb = argb_u16_from_yuv888(color->yuv.y, color->yuv.u, color->yuv.v, &matrix); + + KUNIT_EXPECT_LE_MSG(test, abs_diff(argb.a, color->argb.a), 257, + "On the A channel of the color %s expected 0x%04x, got 0x%04x", + color->name, color->argb.a, argb.a); + KUNIT_EXPECT_LE_MSG(test, abs_diff(argb.r, color->argb.r), 257, + "On the R channel of the color %s expected 0x%04x, got 0x%04x", + color->name, color->argb.r, argb.r); + KUNIT_EXPECT_LE_MSG(test, abs_diff(argb.g, color->argb.g), 257, + "On the G channel of the color %s expected 0x%04x, got 0x%04x", + color->name, color->argb.g, argb.g); + KUNIT_EXPECT_LE_MSG(test, abs_diff(argb.b, color->argb.b), 257, + "On the B channel of the color %s expected 0x%04x, got 0x%04x", + color->name, color->argb.b, argb.b); + } +} + +static void vkms_format_test_yuv_u8_to_argb_u16_case_desc(struct yuv_u8_to_argb_u16_case *t, + char *desc) +{ + snprintf(desc, KUNIT_PARAM_DESC_SIZE, "%s - %s", + drm_get_color_encoding_name(t->encoding), drm_get_color_range_name(t->range)); +} + +KUNIT_ARRAY_PARAM(yuv_u8_to_argb_u16, yuv_u8_to_argb_u16_cases, + vkms_format_test_yuv_u8_to_argb_u16_case_desc +); + +static struct kunit_case vkms_format_test_cases[] = { + KUNIT_CASE_PARAM(vkms_format_test_yuv_u8_to_argb_u16, yuv_u8_to_argb_u16_gen_params), + {} +}; + +static struct kunit_suite vkms_format_test_suite = { + .name = "vkms-format", + .test_cases = vkms_format_test_cases, +}; + +kunit_test_suite(vkms_format_test_suite); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Kunit test for vkms format conversion"); diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c index adb1228e5201..0b201185eae7 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -7,6 +7,8 @@ #include <drm/drm_rect.h> #include <drm/drm_fixed.h> +#include <kunit/visibility.h> + #include "vkms_formats.h" /** @@ -247,8 +249,8 @@ static struct pixel_argb_u16 argb_u16_from_RGB565(const __le16 *pixel) return out_pixel; } -static struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel_2, - const struct conversion_matrix *matrix) +VISIBLE_IF_KUNIT struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel_2, + const struct conversion_matrix *matrix) { u16 r, g, b; s64 fp_y, fp_channel_1, fp_channel_2; @@ -278,6 +280,7 @@ static struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel return argb_u16_from_u16161616(0xffff, r, g, b); } +EXPORT_SYMBOL_IF_KUNIT(argb_u16_from_yuv888); /* * The following functions are read_line function for each pixel format supported by VKMS. diff --git a/drivers/gpu/drm/vkms/vkms_formats.h b/drivers/gpu/drm/vkms/vkms_formats.h index d583855cb320..b4fe62ab9c65 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.h +++ b/drivers/gpu/drm/vkms/vkms_formats.h @@ -13,4 +13,9 @@ void get_conversion_matrix_to_argb_u16(u32 format, enum drm_color_encoding encod enum drm_color_range range, struct conversion_matrix *matrix); +#if IS_ENABLED(CONFIG_KUNIT) +struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel_2, + const struct conversion_matrix *matrix); +#endif + #endif /* _VKMS_FORMATS_H_ */