drm/vkms: Add support for YUV and DRM_FORMAT_R*
Louis Chauvet
maintainerv16 cover drm/vkms: Add support for YUV and DRM_FORMAT_R*
This patchset is extracted from [1]. The goal is to introduce the YUV support, thanks to Arthur's work.
- PATCH 1: Add the support of YUV formats
- PATCH 2: Add some drm properties to expose more YUV features
- PATCH 3: Cleanup the todo
- PATCH 4..6: Add some kunit tests
- PATCH 7: Add the support of DRM_FORMAT_R1/2/4/8
[1]: https://lore.kernel.org/r/[email protected]
---
Changes in v16:
- Rebased on drm-misc-next
- Updated comment and changed fail thresholds.
- Link to v15: https://lore.kernel.org/r/[email protected]
Changes in v15:
- Export drm_get_color_encoding_name only for kunit tests
- Link to v14: https://lore.kernel.org/r/[email protected]
Changes in v14:
- Rebased on drm-misc-next
- Link to v13: https://lore.kernel.org/r/[email protected]
Changes since previous series:
- Fix build test as modules issue: https://lore.kernel.org/all/[email protected]/
- Export required symbols in DRM core to use them in kunit
- Update the kunit comments according to Maxime's feedback
- Link to original series: https://lore.kernel.org/r/[email protected]
---
Arthur Grillo (5):
drm/vkms: Add YUV support
drm/vkms: Add range and encoding properties to the plane drm/vkms: Drop YUV formats TODO
drm/vkms: Create KUnit tests for YUV conversions drm/vkms: Add how to run the Kunit tests
Louis Chauvet (2):
drm: Export symbols to use in tests
drm/vkms: Add support for DRM_FORMAT_R*
Documentation/gpu/vkms.rst | 14 +- drivers/gpu/drm/drm_color_mgmt.c | 3 + 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 | 271 +++++++++++++++ drivers/gpu/drm/vkms/vkms_drv.h | 18 + drivers/gpu/drm/vkms/vkms_formats.c | 467 +++++++++++++++++++++++++- drivers/gpu/drm/vkms/vkms_formats.h | 9 + drivers/gpu/drm/vkms/vkms_plane.c | 29 +- 11 files changed, 830 insertions(+), 4 deletions(-)
---
base-commit: 49a167c393b0ceb592b9d2e65cc4f46bcc707108
change-id: 20240201-yuv-1337d90d9576
Best regards,
Signature · 1 line
Louis Chauvet <[email protected]>
Louis Chauvet
maintainerPATCH v16 1/7 drm/vkms: Add YUV support
From: Arthur Grillo <[email protected]>
Add support to the YUV formats bellow:
- NV12/NV16/NV24
- NV21/NV61/NV42
- YUV420/YUV422/YUV444
- YVU420/YVU422/YVU444
The conversion from yuv to rgb is done with fixed-point arithmetic, using 32.32 fixed-point numbers and the drm_fixed helpers.
To do the conversion, a specific matrix must be used for each color range (DRM_COLOR_*_RANGE) and encoding (DRM_COLOR_*). This matrix is stored in the conversion_matrix struct, along with the specific y_offset needed. This matrix is queried only once, in vkms_plane_atomic_update and stored in a vkms_plane_state. Those conversion matrices of each encoding and range were obtained by rounding the values of the original conversion matrices multiplied by 2^32. This is done to avoid the use of floating point operations.
The same reading function is used for YUV and YVU formats. As the only difference between those two category of formats is the order of field, a simple swap in conversion matrix columns allows using the same function.
[Louis Chauvet:
- Adapted Arthur's work
- Implemented the read_line_t callbacks for yuv
- add struct conversion_matrix
- store the whole conversion_matrix in the plane state
- remove struct pixel_yuv_u8
- update the commit message
- Merge the modifications from Arthur]
--- drivers/gpu/drm/vkms/vkms_drv.h | 18 ++ drivers/gpu/drm/vkms/vkms_formats.c | 354 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_formats.h | 4 + drivers/gpu/drm/vkms/vkms_plane.c | 16 +- 4 files changed, 391 insertions(+), 1 deletion(-)
drivers/gpu/drm/vkms/vkms_drv.h +18 -0
@@ -100,17 +100,35 @@ typedef void (*pixel_read_line_t)(const struct vkms_plane_state *plane, int x_st int y_start, enum pixel_read_direction direction, int count, struct pixel_argb_u16 out_pixel[]); +/** +* struct conversion_matrix - Matrix to use for a specific encoding and range +* +* @matrix: Conversion matrix from yuv to rgb. The matrix is stored in a row-major manner and is +* used to compute rgb values from yuv values: +* [[r],[g],[b]] = @matrix * [[y],[u],[v]] +* OR for yvu formats: +* [[r],[g],[b]] = @matrix * [[y],[v],[u]] +* The values of the matrix are signed fixed-point values with 32 bits fractional part. +* @y_offset: Offset to apply on the y value. +*/ +struct conversion_matrix { +s64 matrix[3 ][3 ]; +int y_offset; +}; +/** * struct vkms_plane_state - Driver specific plane state * @base: base plane state * @frame_info: data required for composing computation * @pixel_read_line: function to read a pixel line in this plane. The creator of a * struct vkms_plane_state must ensure that this pointer is valid +* @conversion_matrix: matrix used for yuv formats to convert to rgb */ struct vkms_plane_state {struct drm_shadow_plane_state base;struct vkms_frame_info *frame_info;pixel_read_line_t pixel_read_line; +struct conversion_matrix conversion_matrix; };struct vkms_plane {
drivers/gpu/drm/vkms/vkms_formats.c +354 -0
384 lines not on this page · raw message
drivers/gpu/drm/vkms/vkms_formats.h +4 -0
@@ -9,4 +9,8 @@ pixel_read_line_t get_pixel_read_line_function(u32 format);pixel_write_t get_pixel_write_function (u32 format); +void get_conversion_matrix_to_argb_u16 (u32 format,enum drm_color_encoding encoding, +enum drm_color_range range, +struct conversion_matrix *matrix); +#endif /* _VKMS_FORMATS_H_ */
drivers/gpu/drm/vkms/vkms_plane.c +15 -1
@@ -17,7 +17,19 @@ static const u32 vkms_formats[] = {DRM_FORMAT_XRGB8888 ,DRM_FORMAT_XRGB16161616 ,DRM_FORMAT_ARGB16161616 , -DRM_FORMAT_RGB565 +DRM_FORMAT_RGB565 , +DRM_FORMAT_NV12 , +DRM_FORMAT_NV16 , +DRM_FORMAT_NV24 , +DRM_FORMAT_NV21 , +DRM_FORMAT_NV61 , +DRM_FORMAT_NV42 , +DRM_FORMAT_YUV420 , +DRM_FORMAT_YUV422 , +DRM_FORMAT_YUV444 , +DRM_FORMAT_YVU420 , +DRM_FORMAT_YVU422 , + DRM_FORMAT_YVU444, }; static struct drm_plane_state *
@@ -118,6 +130,8 @@ static void vkms_plane_atomic_update(struct drm_plane *plane, frame_info->rotation = new_state->rotation; vkms_plane_state->pixel_read_line =get_pixel_read_line_function (fmt); +get_conversion_matrix_to_argb_u16 (fmt, new_state->color_encoding, new_state->color_range, + &vkms_plane_state->conversion_matrix); } static int vkms_plane_atomic_check(struct drm_plane *plane,
Signature · 1 line
2.47.1
Louis Chauvet
maintainerPATCH v16 2/7 drm/vkms: Add range and encoding properties to the plane
In reply to Louis ChauvetFrom: Arthur Grillo <[email protected]>
Now that the driver internally handles these quantization ranges and YUV encoding matrices, expose the UAPI for setting them.
--- drivers/gpu/drm/vkms/vkms_plane.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/vkms/vkms_plane.c +9 -0
@@ -218,5 +218,14 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev,drm_plane_create_rotation_property (&plane->base,DRM_MODE_ROTATE_0 ,DRM_MODE_ROTATE_MASK |DRM_MODE_REFLECT_MASK ); +drm_plane_create_color_properties (&plane->base, +BIT (DRM_COLOR_YCBCR_BT601 ) | +BIT (DRM_COLOR_YCBCR_BT709 ) | +BIT (DRM_COLOR_YCBCR_BT2020 ), +BIT (DRM_COLOR_YCBCR_LIMITED_RANGE ) | +BIT (DRM_COLOR_YCBCR_FULL_RANGE ), +DRM_COLOR_YCBCR_BT601 , +DRM_COLOR_YCBCR_FULL_RANGE ); +return plane; }
Signature · 1 line
2.47.1
Louis Chauvet
maintainerPATCH v16 3/7 drm/vkms: Drop YUV formats TODO
In reply to Louis ChauvetFrom: Arthur Grillo <[email protected]>
VKMS has support for YUV formats now. Remove the task from the TODO list.
--- Documentation/gpu/vkms.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Documentation/gpu/vkms.rst +1 -2
@@ -122,8 +122,7 @@ There's lots of plane features we could add support for: - Scaling. -- Additional buffer formats, especially YUV formats for video like NV12. - Low/high bpp RGB formats would also be interesting. +- Additional buffer formats. Low/high bpp RGB formats would be interesting. - Async updates (currently only possible on cursor plane using the legacy cursor api).
Signature · 1 line
2.47.1
PATCH v16 3/7 drm/vkms: Drop YUV formats TODO
Hi Louis,
Thanks a lot for the patches.
I'm not well versed in YUV color formats, so I did my best reading the kernel documentation before reviewing this series... But I'll most likely ask some basic/dump questions.
Quoted 16 lines
From: Arthur Grillo <[email protected]>
VKMS has support for YUV formats now. Remove the task from the TODO list.
Signed-off-by Arthur Grillo <[email protected]>Signed-off-by Louis Chauvet <[email protected]>--- Documentation/gpu/vkms.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)Documentation/gpu/vkms.rst +0
-0
Documentation/gpu/vkms.rst There's lots of plane features we could add support for: · line 125
Quoted 6 lines
Documentation/gpu/vkms.rst +1
-2@@ -122,8 +122,7 @@ There's lots of plane features we could add support for: - Scaling. -- Additional buffer formats, especially YUV formats for video like NV12. - Low/high bpp RGB formats would also be interesting. +- Additional buffer formats. Low/high bpp RGB formats would be interesting.
I see that you implemented support for 6 DRM_FORMAT_NV* formats, but DRM_FORMAT_NV15, DRM_FORMAT_NV20 and DRM_FORMAT_NV30 are not implemented.
The same applies to DRM_FORMAT_Y210 or DRM_FORMAT_YUV410 among others.
Could it be useful to implement all of them in the future? If so, should we add it to the ToDo list?
It might be a great task to get started in kernel development, as there are already similar examples and tests.
Quoted 4 lines
Documentation/gpu/vkms.rst +0
-0- Async updates (currently only possible on cursor plane using the legacy cursor api).
Louis Chauvet
maintainerRe: [PATCH v16 3/7] drm/vkms: Drop YUV formats TODO
Quoted 34 lines · José Expósito
Hi Louis,
Thanks a lot for the patches.
I'm not well versed in YUV color formats, so I did my best reading the kernel documentation before reviewing this series... But I'll most likely ask some basic/dump questions.
Quoted 16 lines
From: Arthur Grillo <[email protected]>
VKMS has support for YUV formats now. Remove the task from the TODO list.
Signed-off-by Arthur Grillo <[email protected]>Signed-off-by Louis Chauvet <[email protected]>--- Documentation/gpu/vkms.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)Documentation/gpu/vkms.rst +0
-0Documentation/gpu/vkms.rst There's lots of plane features we could add support for: · line 125
Quoted 6 lines
Documentation/gpu/vkms.rst +1
-2@@ -122,8 +122,7 @@ There's lots of plane features we could add support for: - Scaling. -- Additional buffer formats, especially YUV formats for video like NV12. - Low/high bpp RGB formats would also be interesting. +- Additional buffer formats. Low/high bpp RGB formats would be interesting.I see that you implemented support for 6 DRM_FORMAT_NV* formats, but
DRM_FORMAT_NV15,DRM_FORMAT_NV20andDRM_FORMAT_NV30are not implemented.
Quoted 4 lines
The same applies to
DRM_FORMAT_Y210orDRM_FORMAT_YUV410among others.Could it be useful to implement all of them in the future? If so, should we add it to the ToDo list?
I don't think we need "all of them" (there are ≈100 + all the modifiers), but definitly all the commonly used ones (I have some of the "common" one ready here [1], I just wait for the YUV series to be accepted to avoid conflicts).
Quoted 2 lines
It might be a great task to get started in kernel development, as there are already similar examples and tests.
I don't think we need to specify which format are missing, the point "Additionnal buffer formats. [...]" seems sufficient. If you think this is relevant, I can add "Easy task" so beginners will find it easier?
[1]:https://lore.kernel.org/all/[email protected]/
Quoted 4 lines
Quoted 4 lines
Documentation/gpu/vkms.rst +0
-0- Async updates (currently only possible on cursor plane using the legacy cursor api).
Re: [PATCH v16 3/7] drm/vkms: Drop YUV formats TODO
Quoted 37 lines · Louis Chauvet
Quoted 36 lines · José Expósito
Hi Louis,
Thanks a lot for the patches.
I'm not well versed in YUV color formats, so I did my best reading the kernel documentation before reviewing this series... But I'll most likely ask some basic/dump questions.
Quoted 16 lines
From: Arthur Grillo <[email protected]>
VKMS has support for YUV formats now. Remove the task from the TODO list.
Signed-off-by Arthur Grillo <[email protected]>Signed-off-by Louis Chauvet <[email protected]>--- Documentation/gpu/vkms.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)Documentation/gpu/vkms.rst +0
-0Documentation/gpu/vkms.rst There's lots of plane features we could add support for: · line 125
Quoted 6 lines
Documentation/gpu/vkms.rst +1
-2@@ -122,8 +122,7 @@ There's lots of plane features we could add support for: - Scaling. -- Additional buffer formats, especially YUV formats for video like NV12. - Low/high bpp RGB formats would also be interesting. +- Additional buffer formats. Low/high bpp RGB formats would be interesting.I see that you implemented support for 6 DRM_FORMAT_NV* formats, but
DRM_FORMAT_NV15,DRM_FORMAT_NV20andDRM_FORMAT_NV30are not implemented.The same applies to
DRM_FORMAT_Y210orDRM_FORMAT_YUV410among others.
Quoted 7 lines
Quoted 2 lines
Could it be useful to implement all of them in the future? If so, should we add it to the ToDo list?
I don't think we need "all of them" (there are ≈100 + all the modifiers), but definitly all the commonly used ones (I have some of the "common" one ready here [1], I just wait for the YUV series to be accepted to avoid conflicts).
Good to know, thanks for the clarification. I think we are good with this to-do item as it is. There's plenty of work that can be done :)
Jose
Quoted 13 lines
Quoted 2 lines
It might be a great task to get started in kernel development, as there are already similar examples and tests.
I don't think we need to specify which format are missing, the point "Additionnal buffer formats. [...]" seems sufficient. If you think this is relevant, I can add "Easy task" so beginners will find it easier?
[1]:https://lore.kernel.org/all/[email protected]/
Quoted 4 lines
Quoted 4 lines
Documentation/gpu/vkms.rst +0
-0- Async updates (currently only possible on cursor plane using the legacy cursor api).
Louis Chauvet
maintainerPATCH v16 4/7 drm: Export symbols to use in tests
In reply to Louis ChauvetThe functions drm_get_color_encoding_name and drm_get_color_range_name are useful for clarifying test results. Therefore, export them so they can be used in tests built as modules.
--- drivers/gpu/drm/drm_color_mgmt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/drm_color_mgmt.c +3 -0
@@ -28,6 +28,7 @@#include <drm/drm_device.h> #include <drm/drm_drv.h> #include <drm/drm_print.h> +#include <kunit/visibility.h> #include "drm_crtc_internal.h"
@@ -494,6 +495,7 @@ const char *drm_get_color_encoding_name(enum drm_color_encoding encoding)return color_encoding_name[encoding]; } +EXPORT_SYMBOL_IF_KUNIT (drm_get_color_encoding_name);/** * drm_get_color_range_name - return a string for color range
@@ -509,6 +511,7 @@ const char *drm_get_color_range_name(enum drm_color_range range)return color_range_name[range]; } +EXPORT_SYMBOL_IF_KUNIT (drm_get_color_range_name);/** * drm_plane_create_color_properties - color encoding related plane properties
Signature · 1 line
2.47.1
PATCH v16 4/7 drm: Export symbols to use in tests
Quoted 5 lines
The functions
drm_get_color_encoding_nameanddrm_get_color_range_nameare useful for clarifying test results. Therefore, export them so they can be used in tests built as modules.Signed-off-by Louis Chauvet <[email protected]>
Nice and simple, in the next version:
Quoted 33 lines
--- drivers/gpu/drm/drm_color_mgmt.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/drm_color_mgmt.c +3
-0@@ -28,6 +28,7 @@#include <drm/drm_device.h> #include <drm/drm_drv.h> #include <drm/drm_print.h> +#include <kunit/visibility.h> #include "drm_crtc_internal.h" @@ -494,6 +495,7 @@ const char *drm_get_color_encoding_name(enum drm_color_encoding encoding)return color_encoding_name[encoding]; } +EXPORT_SYMBOL_IF_KUNIT (drm_get_color_encoding_name);/** * drm_get_color_range_name - return a string for color range @@ -509,6 +511,7 @@ const char *drm_get_color_range_name(enum drm_color_range range)return color_range_name[range]; } +EXPORT_SYMBOL_IF_KUNIT (drm_get_color_range_name);/** * drm_plane_create_color_properties - color encoding related plane properties
Louis Chauvet
maintainerPATCH v16 5/7 drm/vkms: Create KUnit tests for YUV conversions
In reply to Louis ChauvetFrom: Arthur Grillo <[email protected]>
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]
--- 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 | 271 ++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_formats.c | 7 +- drivers/gpu/drm/vkms/vkms_formats.h | 5 + 7 files changed, 304 insertions(+), 2 deletions(-)
drivers/gpu/drm/vkms/Kconfig +15 -0
@@ -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 && 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".
drivers/gpu/drm/vkms/Makefile +1 -0
@@ -9,3 +9,4 @@ vkms-y := \ vkms_writeback.o obj-$(CONFIG_DRM_VKMS) += vkms.o +obj-$(CONFIG_DRM_VKMS_KUNIT_TESTS) += tests/
drivers/gpu/drm/vkms/tests/.kunitconfig new file +4 -0
@@ -0,0 +1,4 @@ +CONFIG_KUNIT=y +CONFIG_DRM=y +CONFIG_DRM_VKMS=y +CONFIG_DRM_VKMS_KUNIT_TESTS=y
drivers/gpu/drm/vkms/tests/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_DRM_VKMS_KUNIT_TESTS) += vkms_format_test.o
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +271 -0
271 lines not on this page · raw message
drivers/gpu/drm/vkms/vkms_formats.c +5 -2
@@ -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 channelreturn 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.
drivers/gpu/drm/vkms/vkms_formats.h +5 -0
@@ -13,4 +13,9 @@ void get_conversion_matrix_to_argb_u16(u32 format, enum drm_color_encoding encodenum 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_ */
Signature · 1 line
2.47.1
Maxime Ripard
maintainerRe: [PATCH v16 5/7] drm/vkms: Create KUnit tests for YUV conversions
Quoted 4 lines · Louis Chauvet
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +4
-0+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"],
drivers/gpu/drm/vkms/tests/vkms_format_test.c line 64
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+* in_bits = 16, +* in_legal = False, +* in_int = True, +* out_bits = 8, +* out_legal = False, +* out_int = True) +* +* Test cases for conversion between YUV BT601 full range and RGB +* using the ITU-R BT.601 weights. +*/
What are the input and output formats?
Ditto for all the other tests.
Maxime
Louis Chauvet
maintainerRe: [PATCH v16 5/7] drm/vkms: Create KUnit tests for YUV conversions
Quoted 18 lines · Maxime Ripard
Quoted 4 lines · Louis Chauvet
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +4
-0+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"], drivers/gpu/drm/vkms/tests/vkms_format_test.c line 64
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+* in_bits = 16, +* in_legal = False, +* in_int = True, +* out_bits = 8, +* out_legal = False, +* out_int = True) +* +* Test cases for conversion between YUV BT601 full range and RGB +* using the ITU-R BT.601 weights. +*/ What are the input and output formats?
Quoted 1 line
Ditto for all the other tests.
There is no really "input" and "output" format, they are reference values for conversion, you should be able to use it in both direction. They are generated by RGB_to_YCbCr (RGB input, YUV output) just because it was easier to create the colors from RGB values.
If you think we should specify what is was used as input and output to generate those values, I can modify the comment to:
Tests cases for color conversion generated by converting RGB values to YUV BT601 full range using the ITU-R BT.601 weights.
Beside that modification, did you notice anything else on the series that require more work before adding your Ack-by/Reviewed-by on the other patches?
Thanks,
Louis Chauvet
Quoted 1 line
Maxime
Maxime Ripard
maintainerRe: [PATCH v16 5/7] drm/vkms: Create KUnit tests for YUV conversions
Quoted 19 lines · Louis Chauvet
Quoted 18 lines · Maxime Ripard
Quoted 4 lines · Louis Chauvet
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +4
-0+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"], drivers/gpu/drm/vkms/tests/vkms_format_test.c line 64
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+* in_bits = 16, +* in_legal = False, +* in_int = True, +* out_bits = 8, +* out_legal = False, +* out_int = True) +* +* Test cases for conversion between YUV BT601 full range and RGB +* using the ITU-R BT.601 weights. +*/ What are the input and output formats?
Quoted 6 lines
Quoted 1 line
Ditto for all the other tests.
There is no really "input" and "output" format, they are reference values for conversion, you should be able to use it in both direction. They are generated by
RGB_to_YCbCr(RGB input, YUV output) just because it was easier to create the colors from RGB values.
RGB and YUV aren't formats, they are color models. XRGB8888 is a format. NV12 is a format.
Quoted 5 lines
If you think we should specify what is was used as input and output to generate those values, I can modify the comment to:
Tests cases for color conversion generated by converting RGB values to YUV BT601 full range using the ITU-R BT.601 weights.
My point is that those comments should provide a way to reimplement the test from scratch, and compare to the actual implementation. It's useful when you have a test failure and start to wonder if the implementation or the test is at fault.
By saying only RGB and YUV, you can't possibly do that.
Quoted 3 lines
Beside that modification, did you notice anything else on the series that require more work before adding your Ack-by/Reviewed-by on the other patches?
The rest looked good to me the last time I looked.
Maxime
Louis Chauvet
maintainerRe: [PATCH v16 5/7] drm/vkms: Create KUnit tests for YUV conversions
Quoted 36 lines · Maxime Ripard
Quoted 19 lines · Louis Chauvet
Quoted 18 lines · Maxime Ripard
Quoted 4 lines · Louis Chauvet
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +4
-0+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"], drivers/gpu/drm/vkms/tests/vkms_format_test.c line 64
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+* in_bits = 16, +* in_legal = False, +* in_int = True, +* out_bits = 8, +* out_legal = False, +* out_int = True) +* +* Test cases for conversion between YUV BT601 full range and RGB +* using the ITU-R BT.601 weights. +*/ What are the input and output formats?
Quoted 6 lines
Quoted 1 line
Ditto for all the other tests.
There is no really "input" and "output" format, they are reference values for conversion, you should be able to use it in both direction. They are generated by
RGB_to_YCbCr(RGB input, YUV output) just because it was easier to create the colors from RGB values.RGB and YUV aren't formats, they are color models. XRGB8888 is a format. NV12 is a format.
Quoted 5 lines
If you think we should specify what is was used as input and output to generate those values, I can modify the comment to:
Tests cases for color conversion generated by converting RGB values to YUV BT601 full range using the ITU-R BT.601 weights.
Quoted 6 lines
My point is that those comments should provide a way to reimplement the test from scratch, and compare to the actual implementation. It's useful when you have a test failure and start to wonder if the implementation or the test is at fault.
By saying only RGB and YUV, you can't possibly do that.
I understand your concern, but I believe there might be a slight misunderstanding. The table in question stores reference values for specific color models, not formats. Therefore, it doesn't specify any particular format like XRGB8888 or NV12.
To clarify this, I can rename the format_pair struct to value_pair. This should make it clearer that we are dealing with color model values rather than formats.
If you want to test a specific format conversion, such as YUV420_to_argbu16, you would need to follow a process like this:
// Recreate a YUV420 data plane_1[0] = test_case.yuv.y plane_2[0] = test_case.yuv.u plane_2[1] = test_case.yuv.v // convertion to test from YUV420 format to argb_u16 rgb_u16 = convert_YUV420_to_argbu16(plane_1, plane_2) // ensure the conversion is valid assert_eq(rgb_u16, test_case.rgb)
The current test is not performing this kind of format conversion. Instead, it verifies that for given (y, u, v) values, the correct (r, g, b, a) values are obtained. In other words, it tests color model conversion, not format conversion.
Do you think I need to change something in this test? If so, can you explain what kind of unit test you are expecting.
Thanks,
Louis Chauvet
Quoted 7 lines
Quoted 3 lines
Beside that modification, did you notice anything else on the series that require more work before adding your Ack-by/Reviewed-by on the other patches?
The rest looked good to me the last time I looked.
Maxime
Maxime Ripard
maintainerRe: [PATCH v16 5/7] drm/vkms: Create KUnit tests for YUV conversions
Quoted 67 lines · Louis Chauvet
Quoted 36 lines · Maxime Ripard
Quoted 19 lines · Louis Chauvet
Quoted 18 lines · Maxime Ripard
Quoted 4 lines · Louis Chauvet
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +4
-0+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"], drivers/gpu/drm/vkms/tests/vkms_format_test.c line 64
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+* in_bits = 16, +* in_legal = False, +* in_int = True, +* out_bits = 8, +* out_legal = False, +* out_int = True) +* +* Test cases for conversion between YUV BT601 full range and RGB +* using the ITU-R BT.601 weights. +*/ What are the input and output formats?
Quoted 6 lines
Quoted 1 line
Ditto for all the other tests.
There is no really "input" and "output" format, they are reference values for conversion, you should be able to use it in both direction. They are generated by
RGB_to_YCbCr(RGB input, YUV output) just because it was easier to create the colors from RGB values.RGB and YUV aren't formats, they are color models. XRGB8888 is a format. NV12 is a format.
Quoted 5 lines
If you think we should specify what is was used as input and output to generate those values, I can modify the comment to:
Tests cases for color conversion generated by converting RGB values to YUV BT601 full range using the ITU-R BT.601 weights.
Quoted 6 lines
My point is that those comments should provide a way to reimplement the test from scratch, and compare to the actual implementation. It's useful when you have a test failure and start to wonder if the implementation or the test is at fault.
By saying only RGB and YUV, you can't possibly do that.
I understand your concern, but I believe there might be a slight misunderstanding. The table in question stores reference values for specific color models, not formats. Therefore, it doesn't specify any particular format like XRGB8888 or NV12.
To clarify this, I can rename the
format_pairstruct tovalue_pair. This should make it clearer that we are dealing with color model values rather than formats.If you want to test a specific format conversion, such as
YUV420_to_argbu16, you would need to follow a process like this:// Recreate a YUV420 data plane_1[0] = test_case.yuv.y plane_2[0] = test_case.yuv.u plane_2[1] = test_case.yuv.v // convertion to test from YUV420 format to argb_u16 rgb_u16 = convert_YUV420_to_argbu16(plane_1, plane_2) // ensure the conversion is valid assert_eq(rgb_u16, test_case.rgb)
Quoted 3 lines
The current test is not performing this kind of format conversion. Instead, it verifies that for given (y, u, v) values, the correct (r, g, b, a) values are obtained.
You already stated that you check for the A, R, G, and B components. On how many bits are the values you are comparing stored? The YUV values you are comparing are stored on how many bits for each channel? With subsampling?
If you want to compare values, you need to encode a given color into bits, and the way that encoding is done is what the format is about.
You might not compare the memory layout but each component individually, but it's still a format.
And then, you have the extra fun on top, like are you comparing full-range or limited-range colors?
Quoted 1 line
In other words, it tests color model conversion, not format conversion.
No, you are testing color encoding, format and model conversions, all at once.
Maxime
Louis Chauvet
maintainerRe: [PATCH v16 5/7] drm/vkms: Create KUnit tests for YUV conversions
Le 19/02/2025 à 11:15, Maxime Ripard a écrit :
Quoted 77 lines · Louis Chauvet
Quoted 67 lines · Maxime Ripard
Quoted 36 lines · Louis Chauvet
Quoted 19 lines · Maxime Ripard
Quoted 18 lines · Louis Chauvet
Quoted 4 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +4
-0+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"], drivers/gpu/drm/vkms/tests/vkms_format_test.c line 64
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+* in_bits = 16, +* in_legal = False, +* in_int = True, +* out_bits = 8, +* out_legal = False, +* out_int = True) +* +* Test cases for conversion between YUV BT601 full range and RGB +* using the ITU-R BT.601 weights. +*/ What are the input and output formats?
Quoted 6 lines
Quoted 1 line
Ditto for all the other tests.
There is no really "input" and "output" format, they are reference values for conversion, you should be able to use it in both direction. They are generated by
RGB_to_YCbCr(RGB input, YUV output) just because it was easier to create the colors from RGB values.RGB and YUV aren't formats, they are color models. XRGB8888 is a format. NV12 is a format.
Quoted 5 lines
If you think we should specify what is was used as input and output to generate those values, I can modify the comment to:
Tests cases for color conversion generated by converting RGB values to YUV BT601 full range using the ITU-R BT.601 weights.
Quoted 6 lines
My point is that those comments should provide a way to reimplement the test from scratch, and compare to the actual implementation. It's useful when you have a test failure and start to wonder if the implementation or the test is at fault.
By saying only RGB and YUV, you can't possibly do that.
I understand your concern, but I believe there might be a slight misunderstanding. The table in question stores reference values for specific color models, not formats. Therefore, it doesn't specify any particular format like XRGB8888 or NV12.
To clarify this, I can rename the
format_pairstruct tovalue_pair. This should make it clearer that we are dealing with color model values rather than formats.If you want to test a specific format conversion, such as
YUV420_to_argbu16, you would need to follow a process like this:// Recreate a YUV420 data plane_1[0] = test_case.yuv.y plane_2[0] = test_case.yuv.u plane_2[1] = test_case.yuv.v // convertion to test from YUV420 format to argb_u16 rgb_u16 = convert_YUV420_to_argbu16(plane_1, plane_2) // ensure the conversion is valid assert_eq(rgb_u16, test_case.rgb)Quoted 3 lines
The current test is not performing this kind of format conversion. Instead, it verifies that for given (y, u, v) values, the correct (r, g, b, a) values are obtained.
You already stated that you check for the A, R, G, and B components. On how many bits are the values you are comparing stored? The YUV values you are comparing are stored on how many bits for each channel? With subsampling?
Quoted 5 lines
If you want to compare values, you need to encode a given color into bits, and the way that encoding is done is what the format is about.
You might not compare the memory layout but each component individually, but it's still a format.
Sorry, I think I misunderstood what a format really is. But even with this explanation, I don't understand well what you ask me to change. Is this better:
The values are computed by converting RGB values, with each component stored as u16, to YUV values, with each component stored as u8. The conversion is done from RGB full range to YUV BT601 full range using the ITU-R BT.601 weights.
TBH, I do not understand what you are asking for exactly. Can you please give the sentence you expect directly?
Thanks,
Louis Chauvet
Quoted 9 lines
And then, you have the extra fun on top, like are you comparing full-range or limited-range colors?
Quoted 1 line
In other words, it tests color model conversion, not format conversion.
No, you are testing color encoding, format and model conversions, all at once.
Maxime
Signature · 3 lines
Louis Chauvet, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Maxime Ripard
maintainerRe: [PATCH v16 5/7] drm/vkms: Create KUnit tests for YUV conversions
Quoted 80 lines · Louis Chauvet
Le 19/02/2025 à 11:15, Maxime Ripard a écrit :
Quoted 77 lines · Louis Chauvet
Quoted 67 lines · Maxime Ripard
Quoted 36 lines · Louis Chauvet
Quoted 19 lines · Maxime Ripard
Quoted 18 lines · Louis Chauvet
Quoted 4 lines
(quoted diff) +4
-0+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"],Review
Quoted 10 lines
(quoted diff) +10
-0+ * in_bits = 16, + * in_legal = False, + * in_int = True, + * out_bits = 8, + * out_legal = False, + * out_int = True) + * + * Test cases for conversion between YUV BT601 full range and RGB + * using the ITU-R BT.601 weights. + */What are the input and output formats?
Quoted 6 lines
Quoted 1 line
Ditto for all the other tests.
There is no really "input" and "output" format, they are reference values for conversion, you should be able to use it in both direction. They are generated by
RGB_to_YCbCr(RGB input, YUV output) just because it was easier to create the colors from RGB values.RGB and YUV aren't formats, they are color models. XRGB8888 is a format. NV12 is a format.
Quoted 5 lines
If you think we should specify what is was used as input and output to generate those values, I can modify the comment to:
Tests cases for color conversion generated by converting RGB values to YUV BT601 full range using the ITU-R BT.601 weights.
Quoted 6 lines
My point is that those comments should provide a way to reimplement the test from scratch, and compare to the actual implementation. It's useful when you have a test failure and start to wonder if the implementation or the test is at fault.
By saying only RGB and YUV, you can't possibly do that.
I understand your concern, but I believe there might be a slight misunderstanding. The table in question stores reference values for specific color models, not formats. Therefore, it doesn't specify any particular format like XRGB8888 or NV12.
To clarify this, I can rename the
format_pairstruct tovalue_pair. This should make it clearer that we are dealing with color model values rather than formats.If you want to test a specific format conversion, such as
YUV420_to_argbu16, you would need to follow a process like this:// Recreate a YUV420 data plane_1[0] = test_case.yuv.y plane_2[0] = test_case.yuv.u plane_2[1] = test_case.yuv.v // convertion to test from YUV420 format to argb_u16 rgb_u16 = convert_YUV420_to_argbu16(plane_1, plane_2) // ensure the conversion is valid assert_eq(rgb_u16, test_case.rgb)Quoted 3 lines
The current test is not performing this kind of format conversion. Instead, it verifies that for given (y, u, v) values, the correct (r, g, b, a) values are obtained.
You already stated that you check for the A, R, G, and B components. On how many bits are the values you are comparing stored? The YUV values you are comparing are stored on how many bits for each channel? With subsampling?
Quoted 7 lines
Quoted 5 lines
If you want to compare values, you need to encode a given color into bits, and the way that encoding is done is what the format is about.
You might not compare the memory layout but each component individually, but it's still a format.
Sorry, I think I misunderstood what a format really is.
Ultimately, a format is how a given "color value" is stored. How many bits will you use? If you have an unaligned number of bits, how many bits of padding you'll use, where the padding is? If there's multiple bytes, what's the endianness?
The answer to all these questions is "the format", and that's why there's so many of them.
Quoted 10 lines
But even with this explanation, I don't understand well what you ask me to change. Is this better:
The values are computed by converting RGB values, with each component stored as u16, to YUV values, with each component stored as u8. The conversion is done from RGB full range to YUV BT601 full range using the ITU-R BT.601 weights.
TBH, I do not understand what you are asking for exactly. Can you please give the sentence you expect directly?
The fourcc[1] code for the input and output format would be nice. And if you can't, an ad-hoc definition of the format, answering the questions I mentionned earlier (and in the previous mail for YUV). I'm really surprised about the RGB component values being stored on 16 bits though. It's super unusual, to the point where it's almost useless for us to test, and we should probably use 8 bits values.
Maxime
1: https://elixir.bootlin.com/linux/v6.13.5/source/include/uapi/drm/drm_fourcc.h#L486
Louis Chauvet
maintainerRe: [PATCH v16 5/7] drm/vkms: Create KUnit tests for YUV conversions
Le 07/03/2025 à 11:20, Maxime Ripard a écrit :
Quoted 89 lines · Louis Chauvet
Quoted 80 lines
Le 19/02/2025 à 11:15, Maxime Ripard a écrit :
Quoted 77 lines · Louis Chauvet
Quoted 67 lines · Maxime Ripard
Quoted 36 lines · Louis Chauvet
Quoted 19 lines · Maxime Ripard
Quoted 18 lines · Louis Chauvet
Quoted 4 lines
(quoted diff) +4
-0+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"],Review
Quoted 10 lines
(quoted diff) +10
-0+ * in_bits = 16, + * in_legal = False, + * in_int = True, + * out_bits = 8, + * out_legal = False, + * out_int = True) + * + * Test cases for conversion between YUV BT601 full range and RGB + * using the ITU-R BT.601 weights. + */What are the input and output formats?
Quoted 6 lines
Quoted 1 line
Ditto for all the other tests.
There is no really "input" and "output" format, they are reference values for conversion, you should be able to use it in both direction. They are generated by
RGB_to_YCbCr(RGB input, YUV output) just because it was easier to create the colors from RGB values.RGB and YUV aren't formats, they are color models. XRGB8888 is a format. NV12 is a format.
Quoted 5 lines
If you think we should specify what is was used as input and output to generate those values, I can modify the comment to:
Tests cases for color conversion generated by converting RGB values to YUV BT601 full range using the ITU-R BT.601 weights.
Quoted 6 lines
My point is that those comments should provide a way to reimplement the test from scratch, and compare to the actual implementation. It's useful when you have a test failure and start to wonder if the implementation or the test is at fault.
By saying only RGB and YUV, you can't possibly do that.
I understand your concern, but I believe there might be a slight misunderstanding. The table in question stores reference values for specific color models, not formats. Therefore, it doesn't specify any particular format like XRGB8888 or NV12.
To clarify this, I can rename the
format_pairstruct tovalue_pair. This should make it clearer that we are dealing with color model values rather than formats.If you want to test a specific format conversion, such as
YUV420_to_argbu16, you would need to follow a process like this:// Recreate a YUV420 data plane_1[0] = test_case.yuv.y plane_2[0] = test_case.yuv.u plane_2[1] = test_case.yuv.v // convertion to test from YUV420 format to argb_u16 rgb_u16 = convert_YUV420_to_argbu16(plane_1, plane_2) // ensure the conversion is valid assert_eq(rgb_u16, test_case.rgb)Quoted 3 lines
The current test is not performing this kind of format conversion. Instead, it verifies that for given (y, u, v) values, the correct (r, g, b, a) values are obtained.
You already stated that you check for the A, R, G, and B components. On how many bits are the values you are comparing stored? The YUV values you are comparing are stored on how many bits for each channel? With subsampling?
Quoted 7 lines
Quoted 5 lines
If you want to compare values, you need to encode a given color into bits, and the way that encoding is done is what the format is about.
You might not compare the memory layout but each component individually, but it's still a format.
Sorry, I think I misunderstood what a format really is.
Quoted 7 lines
Ultimately, a format is how a given "color value" is stored. How many bits will you use? If you have an unaligned number of bits, how many bits of padding you'll use, where the padding is? If there's multiple bytes, what's the endianness?
The answer to all these questions is "the format", and that's why there's so many of them.
Thanks!
Quoted 8 lines
Quoted 8 lines
But even with this explanation, I don't understand well what you ask me to change. Is this better:
The values are computed by converting RGB values, with each component stored as u16, to YUV values, with each component stored as u8. The conversion is done from RGB full range to YUV BT601 full range using the ITU-R BT.601 weights.
Quoted 6 lines
Quoted 2 lines
TBH, I do not understand what you are asking for exactly. Can you please give the sentence you expect directly?
The fourcc[1] code for the input and output format would be nice. And if you can't, an ad-hoc definition of the format, answering the questions I mentionned earlier (and in the previous mail for YUV).
I don't think any fourcc code will apply in this case, the tests use internal VKMS structures pixel_argb_16 and pixel_yuv_u8. How do I describe them better? If I add this comment for the structures, is it enough?
/**
* struct pixel_argb_u16 - Internal representation of a pixel color.
* @r: Red component value, stored in 16 bits, without padding, using
* machine endianness
* @b: [...]
*
* The goal of this structure is to keep enough precision to ensure
* correct composition results in VKMS and simplifying color
* manipulation by splitting each component into its own field.
* Caution: the byte ordering of this structure is machine-dependent,
* you can't cast it directly to AR48 or xR48.
*/
struct pixel_argb_u16 {
u16 a, r, g, b;
};(ditto for pixel_yuv_u8)
Quoted 4 lines
I'm really
surprised about the RGB component values being stored on 16 bits though. It's super unusual, to the point where it's almost useless for us to test, and we should probably use 8 bits values.
We need to have 16 bits because some of the writeback formats are 16 bits.
Louis Chauvet
Quoted 3 lines
Maxime
1: https://elixir.bootlin.com/linux/v6.13.5/source/include/uapi/drm/drm_fourcc.h#L486
Signature · 3 lines
Louis Chauvet, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH v16 5/7] drm/vkms: Create KUnit tests for YUV conversions
Quoted 136 lines · On Fri, 7 Mar 2025 15:50:41 +0100 Louis Chauvet <[email protected]>…
Le 07/03/2025 à 11:20, Maxime Ripard a écrit :
Quoted 89 lines · Louis Chauvet
Quoted 80 lines
Le 19/02/2025 à 11:15, Maxime Ripard a écrit :
Quoted 77 lines · Louis Chauvet
Quoted 67 lines · Maxime Ripard
Quoted 36 lines · Louis Chauvet
Quoted 19 lines · Maxime Ripard
Quoted 18 lines · Louis Chauvet
Quoted 4 lines
(quoted diff) +4
-0+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"],Review
Quoted 10 lines
(quoted diff) +10
-0+ * in_bits = 16, + * in_legal = False, + * in_int = True, + * out_bits = 8, + * out_legal = False, + * out_int = True) + * + * Test cases for conversion between YUV BT601 full range and RGB + * using the ITU-R BT.601 weights. + */What are the input and output formats?
Quoted 6 lines
Quoted 1 line
Ditto for all the other tests.
There is no really "input" and "output" format, they are reference values for conversion, you should be able to use it in both direction. They are generated by
RGB_to_YCbCr(RGB input, YUV output) just because it was easier to create the colors from RGB values.RGB and YUV aren't formats, they are color models. XRGB8888 is a format. NV12 is a format.
Quoted 5 lines
If you think we should specify what is was used as input and output to generate those values, I can modify the comment to:
Tests cases for color conversion generated by converting RGB values to YUV BT601 full range using the ITU-R BT.601 weights.
Quoted 6 lines
My point is that those comments should provide a way to reimplement the test from scratch, and compare to the actual implementation. It's useful when you have a test failure and start to wonder if the implementation or the test is at fault.
By saying only RGB and YUV, you can't possibly do that.
I understand your concern, but I believe there might be a slight misunderstanding. The table in question stores reference values for specific color models, not formats. Therefore, it doesn't specify any particular format like XRGB8888 or NV12.
To clarify this, I can rename the
format_pairstruct tovalue_pair. This should make it clearer that we are dealing with color model values rather than formats.If you want to test a specific format conversion, such as
YUV420_to_argbu16, you would need to follow a process like this:// Recreate a YUV420 data plane_1[0] = test_case.yuv.y plane_2[0] = test_case.yuv.u plane_2[1] = test_case.yuv.v // convertion to test from YUV420 format to argb_u16 rgb_u16 = convert_YUV420_to_argbu16(plane_1, plane_2) // ensure the conversion is valid assert_eq(rgb_u16, test_case.rgb)Quoted 3 lines
The current test is not performing this kind of format conversion. Instead, it verifies that for given (y, u, v) values, the correct (r, g, b, a) values are obtained.
You already stated that you check for the A, R, G, and B components. On how many bits are the values you are comparing stored? The YUV values you are comparing are stored on how many bits for each channel? With subsampling?
Quoted 7 lines
Quoted 5 lines
If you want to compare values, you need to encode a given color into bits, and the way that encoding is done is what the format is about.
You might not compare the memory layout but each component individually, but it's still a format.
Sorry, I think I misunderstood what a format really is.
Quoted 7 lines
Ultimately, a format is how a given "color value" is stored. How many bits will you use? If you have an unaligned number of bits, how many bits of padding you'll use, where the padding is? If there's multiple bytes, what's the endianness?
The answer to all these questions is "the format", and that's why there's so many of them.
Thanks!
Quoted 8 lines
Quoted 8 lines
But even with this explanation, I don't understand well what you ask me to change. Is this better:
The values are computed by converting RGB values, with each component stored as u16, to YUV values, with each component stored as u8. The conversion is done from RGB full range to YUV BT601 full range using the ITU-R BT.601 weights.
Quoted 6 lines
Quoted 2 lines
TBH, I do not understand what you are asking for exactly. Can you please give the sentence you expect directly?
The fourcc[1] code for the input and output format would be nice. And if you can't, an ad-hoc definition of the format, answering the questions I mentionned earlier (and in the previous mail for YUV).
I don't think any fourcc code will apply in this case, the tests use internal VKMS structures
pixel_argb_16andpixel_yuv_u8. How do I describe them better? If I add this comment for the structures, is it enough?/**
* structpixel_argb_u16- Internal representation of a pixel color.
* @r: Red component value, stored in 16 bits, without padding, using
* machine endianness
* @b: [...]
*
* The goal of this structure is to keep enough precision to ensure
* correct composition results in VKMS and simplifying color
* manipulation by splitting each component into its own field.
* Caution: the byte ordering of this structure is machine-dependent,
* you can't cast it directly to AR48 or xR48.
*/struct pixel_argb_u16 { u16 a, r, g, b; };
Quoted 8 lines
(ditto for
pixel_yuv_u8)Quoted 4 lines
I'm really
surprised about the RGB component values being stored on 16 bits though. It's super unusual, to the point where it's almost useless for us to test, and we should probably use 8 bits values.We need to have 16 bits because some of the writeback formats are 16 bits.
Hi Maxime,
Louis' proposed comment is good and accurate. I can elaborate further on it.
pixel_argb_u16 is an internal structure used only for temporary pixel
storage: the intermediate format. It's aim is to make computations on pixel values easy: every input format is converted to it before computations, and after computations it is converted to each output format. This allows VKMS to implement computations, e.g. a matrix operation, in simple code for only one cpu-endian "pixel format", the intermediate format. (drm_fourcc.h has no cpu-endian formats at all, and that is good.)
That VKMS never stores complete images in the intermediate format. To strike a balance between temporary memory requirements and computational overhead, VKMS processes images line-by-line. Only one (or two) line's worth of pixels is needed to be kept in memory per source or destination framebuffer at a time.
16-bit precision is required not just because some writeback and framebuffer formats are 16-bit. We also need extra precision due to the color value encoding. Transfer functions can convert pixel data between the optical and electrical domains. Framebuffers usually contain electrical domain data, because it takes less bits per pixel in order to achieve a specific level of visual image quality (think of color gradient banding). However, some computations, like color space conversion with a matrix, must be done in the optical domain, which requires more bits per pixel in order to not degrade the image quality.
In the future I would even expect needing 32-bit or even 64-bit per channel precision in the intermediate format once higher-than-16 bits per channel framebuffer formats require testing.
YUV can work with 8 bits per pixel for now, because in practice YUV is always stored in electrical domain due its definition. YUV in optical domain is simply never used. However, there are framebuffer formats with more than 8 bits of YUV channels, so this may need extending too.
Thanks,
pq
Maxime Ripard
maintainerRe: [PATCH v16 5/7] drm/vkms: Create KUnit tests for YUV conversions
Hi,
Quoted 178 lines · Pekka Paalanen
Quoted 136 lines · On Fri, 7 Mar 2025 15:50:41 +0100 Louis Chauvet <[email protected]>…
Le 07/03/2025 à 11:20, Maxime Ripard a écrit :
Quoted 89 lines · Louis Chauvet
Quoted 80 lines
Le 19/02/2025 à 11:15, Maxime Ripard a écrit :
Quoted 77 lines · Louis Chauvet
Quoted 67 lines · Maxime Ripard
Quoted 36 lines · Louis Chauvet
Quoted 19 lines · Maxime Ripard
Quoted 18 lines · Louis Chauvet
Quoted 4 lines
(quoted diff) +4
-0+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"],Review
Quoted 10 lines
(quoted diff) +10
-0+ * in_bits = 16, + * in_legal = False, + * in_int = True, + * out_bits = 8, + * out_legal = False, + * out_int = True) + * + * Test cases for conversion between YUV BT601 full range and RGB + * using the ITU-R BT.601 weights. + */What are the input and output formats?
Quoted 6 lines
Quoted 1 line
Ditto for all the other tests.
There is no really "input" and "output" format, they are reference values for conversion, you should be able to use it in both direction. They are generated by
RGB_to_YCbCr(RGB input, YUV output) just because it was easier to create the colors from RGB values.RGB and YUV aren't formats, they are color models. XRGB8888 is a format. NV12 is a format.
Quoted 5 lines
If you think we should specify what is was used as input and output to generate those values, I can modify the comment to:
Tests cases for color conversion generated by converting RGB values to YUV BT601 full range using the ITU-R BT.601 weights.
Quoted 6 lines
My point is that those comments should provide a way to reimplement the test from scratch, and compare to the actual implementation. It's useful when you have a test failure and start to wonder if the implementation or the test is at fault.
By saying only RGB and YUV, you can't possibly do that.
I understand your concern, but I believe there might be a slight misunderstanding. The table in question stores reference values for specific color models, not formats. Therefore, it doesn't specify any particular format like XRGB8888 or NV12.
To clarify this, I can rename the
format_pairstruct tovalue_pair. This should make it clearer that we are dealing with color model values rather than formats.If you want to test a specific format conversion, such as
YUV420_to_argbu16, you would need to follow a process like this:// Recreate a YUV420 data plane_1[0] = test_case.yuv.y plane_2[0] = test_case.yuv.u plane_2[1] = test_case.yuv.v // convertion to test from YUV420 format to argb_u16 rgb_u16 = convert_YUV420_to_argbu16(plane_1, plane_2) // ensure the conversion is valid assert_eq(rgb_u16, test_case.rgb)Quoted 3 lines
The current test is not performing this kind of format conversion. Instead, it verifies that for given (y, u, v) values, the correct (r, g, b, a) values are obtained.
You already stated that you check for the A, R, G, and B components. On how many bits are the values you are comparing stored? The YUV values you are comparing are stored on how many bits for each channel? With subsampling?
Quoted 7 lines
Quoted 5 lines
If you want to compare values, you need to encode a given color into bits, and the way that encoding is done is what the format is about.
You might not compare the memory layout but each component individually, but it's still a format.
Sorry, I think I misunderstood what a format really is.
Quoted 7 lines
Ultimately, a format is how a given "color value" is stored. How many bits will you use? If you have an unaligned number of bits, how many bits of padding you'll use, where the padding is? If there's multiple bytes, what's the endianness?
The answer to all these questions is "the format", and that's why there's so many of them.
Thanks!
Quoted 8 lines
Quoted 8 lines
But even with this explanation, I don't understand well what you ask me to change. Is this better:
The values are computed by converting RGB values, with each component stored as u16, to YUV values, with each component stored as u8. The conversion is done from RGB full range to YUV BT601 full range using the ITU-R BT.601 weights.
Quoted 6 lines
Quoted 2 lines
TBH, I do not understand what you are asking for exactly. Can you please give the sentence you expect directly?
The fourcc[1] code for the input and output format would be nice. And if you can't, an ad-hoc definition of the format, answering the questions I mentionned earlier (and in the previous mail for YUV).
I don't think any fourcc code will apply in this case, the tests use internal VKMS structures
pixel_argb_16andpixel_yuv_u8. How do I describe them better? If I add this comment for the structures, is it enough?/**
* structpixel_argb_u16- Internal representation of a pixel color.
* @r: Red component value, stored in 16 bits, without padding, using
* machine endianness
* @b: [...]
*
* The goal of this structure is to keep enough precision to ensure
* correct composition results in VKMS and simplifying color
* manipulation by splitting each component into its own field.
* Caution: the byte ordering of this structure is machine-dependent,
* you can't cast it directly to AR48 or xR48.
*/struct pixel_argb_u16 { u16 a, r, g, b; };Quoted 8 lines
(ditto for
pixel_yuv_u8)Quoted 4 lines
I'm really
surprised about the RGB component values being stored on 16 bits though. It's super unusual, to the point where it's almost useless for us to test, and we should probably use 8 bits values.We need to have 16 bits because some of the writeback formats are 16 bits.
Hi Maxime,
Louis' proposed comment is good and accurate. I can elaborate further on it.
pixel_argb_u16is an internal structure used only for temporary pixel
storage: the intermediate format. It's aim is to make computations on pixel values easy: every input format is converted to it before computations, and after computations it is converted to each output format. This allows VKMS to implement computations, e.g. a matrix operation, in simple code for only one cpu-endian "pixel format", the intermediate format. (drm_fourcc.hhas no cpu-endian formats at all, and that is good.)That VKMS never stores complete images in the intermediate format. To strike a balance between temporary memory requirements and computational overhead, VKMS processes images line-by-line. Only one (or two) line's worth of pixels is needed to be kept in memory per source or destination framebuffer at a time.
16-bit precision is required not just because some writeback and framebuffer formats are 16-bit. We also need extra precision due to the color value encoding. Transfer functions can convert pixel data between the optical and electrical domains. Framebuffers usually contain electrical domain data, because it takes less bits per pixel in order to achieve a specific level of visual image quality (think of color gradient banding). However, some computations, like color space conversion with a matrix, must be done in the optical domain, which requires more bits per pixel in order to not degrade the image quality.
Quoted 8 lines
In the future I would even expect needing 32-bit or even 64-bit per channel precision in the intermediate format once higher-than-16 bits per channel framebuffer formats require testing.
YUV can work with 8 bits per pixel for now, because in practice YUV is always stored in electrical domain due its definition. YUV in optical domain is simply never used. However, there are framebuffer formats with more than 8 bits of YUV channels, so this may need extending too.
Thanks for your explanations, and yes Louis, I think it's in a much better shape with your suggestion.
We'd still some additional info like whether you're testing limited vs full range, but it's most likely going to be on a per-test basis.
Maxime
PATCH v16 5/7 drm/vkms: Create KUnit tests for YUV conversions
In reply to Louis ChauvetHi Louis,
Quoted 192 lines
From: Arthur Grillo <[email protected]>
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 from0x0000to0xffff
- adapt to the newget_conversion_matrixusage
- apply the changes from Arthur
- move structpixel_yuv_u8to the test itself]Signed-off-by Arthur Grillo <[email protected]>Acked-by Pekka Paalanen <[email protected]>Signed-off-by Louis Chauvet <[email protected]>--- 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 | 271 ++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_formats.c | 7 +- drivers/gpu/drm/vkms/vkms_formats.h | 5 + 7 files changed, 304 insertions(+), 2 deletions(-)drivers/gpu/drm/vkms/Kconfig +15
-0@@ -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 && 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".drivers/gpu/drm/vkms/Makefile +1
-0@@ -9,3 +9,4 @@ vkms-y := \ vkms_writeback.o obj-$(CONFIG_DRM_VKMS) += vkms.o +obj-$(CONFIG_DRM_VKMS_KUNIT_TESTS) += tests/drivers/gpu/drm/vkms/tests/.kunitconfig new file +4
-0@@ -0,0 +1,4 @@ +CONFIG_KUNIT=y +CONFIG_DRM=y +CONFIG_DRM_VKMS=y +CONFIG_DRM_VKMS_KUNIT_TESTS=ydrivers/gpu/drm/vkms/tests/Makefile new file +3
-0@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_DRM_VKMS_KUNIT_TESTS) += vkms_format_test.odrivers/gpu/drm/vkms/tests/vkms_format_test.c new file +108
-0@@ -0,0 +1,271 @@ +// 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 - Reference values to test the color +* conversions in VKMS between YUV to ARGB +* +* @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. +*/ +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) +* +* Test cases for conversion between YUV BT601 full range and RGB +* using the ITU-R BT.601 weights. +*/ + { + .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) +* Test cases for conversion between YUV BT601 limited range and RGB +* using the ITU-R BT.601 weights. +*/ + { + .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,
drivers/gpu/drm/vkms/tests/vkms_format_test.c line 118
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+* out_bits = 8, +* out_legal = False, +* out_int = True) +* Test cases for conversion between YUV BT709 full range and RGB +* using the ITU-R BT.709 weights. +*/ + { + .encoding = DRM_COLOR_YCBCR_BT709, + .range = DRM_COLOR_YCBCR_FULL_RANGE, + .n_colors = 4,
If I understood correctly, "n_colors" here indicates the number of items in "colors", but there is a mismatch between both lengths.
It also applies to the other test cases where "n_colors = 4".
Quoted 102 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +102
-0+ .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) +* Test cases for conversion between YUV BT709 limited range and RGB +* using the ITU-R BT.709 weights. +*/ + { + .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) +* Test cases for conversion between YUV BT2020 full range and RGB +* using the ITU-R BT.2020 weights. +*/ + { + .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) +* Test cases for conversion between YUV BT2020 limited range and RGB +* using the ITU-R BT.709 weights. +*/ + { + .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 }}, + }, + }, +}; + +/* +* 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. +* +* The conversion between YUV and RGB is not totally reversible, so there may be +* some difference between the expected value and the result. +* In addition, there may be some rounding error as the input color is 8 bits +* and output color is 16 bits. +*/ +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;
drivers/gpu/drm/vkms/tests/vkms_format_test.c line 230
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+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);
Running the test on ppc64 (big endian) doesn't fail. For reference:
$ sudo dnf install powerpc64-linux-gnu-gcc
$ sudo dnf install qemu-system-ppc64
$ ./tools/testing/kunit/kunit.py run \
--kunitconfig=drivers/gpu/drm/vkms/tests \
--arch=powerpc --cross_compile=powerpc64-linux-gnu- \
--make_options CF=-D__CHECK_ENDIAN__ \
--kconfig_add CONFIG_KASAN=y \
--kconfig_add CONFIG_KASAN_VMALLOC=yHowever, I wonder if endianness is correctly handled. I always find endianness difficult to reason about, but I'll try my best to explain it.
On a big endian architecture, color->yuv is stored in big endian. This might not be an issue, because its components (y, u and v) are u8.
However, I think that the return value of argb_u16_from_yuv888(), which is the result of argb_u16_from_u16161616(), is returned in big endian while it should be little endian.
Since you are comparing argb.a (big endian) with color->argb.a (big endian) the test succedess, but in this case it should fail because, if I remember correctly, colors must be stored in little endian and therefore, the color returned by argb_u16_from_yuv888() should be little endian.
If you replace this 4 KUNIT_EXPECT_LE_MSG() with KUNIT_EXPECT_MEMEQ(), all test will fail, but you'll notice that the buffers printed in the error log are different depending on the endianness (x86_64 vs ppc64).
What do you think? Did I overlook the conversion?
Have a look to the tests present in drm_format_helper_test.c. They use different functions (cpubuf_to_le32, le32buf_to_cpu, etc) to make sure that colors are represented in little endian and that comparing the expected and actual results happens in the same endian.
Quoted 88 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +41
-0+ +KUNIT_EXPECT_LE_MSG (test,abs_diff (argb.a, color->argb.a),0x1ff , +"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),0x1ff , +"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),0x1ff , +"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),0x1ff , +"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" );drivers/gpu/drm/vkms/vkms_formats.c +5
-2@@ -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 channelreturn 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. drivers/gpu/drm/vkms/vkms_formats.h +5
-0@@ -13,4 +13,9 @@ void get_conversion_matrix_to_argb_u16(u32 format, enum drm_color_encoding encodenum 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_ */
Louis Chauvet
maintainerRe: [PATCH v16 5/7] drm/vkms: Create KUnit tests for YUV conversions
Quoted 20 lines · José Expósito
Hi Louis,
Quoted 18 lines
From: Arthur Grillo <[email protected]>
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 from0x0000to0xffff
- adapt to the newget_conversion_matrixusage
- apply the changes from Arthur
- move structpixel_yuv_u8to the test itself]Signed-off-by Arthur Grillo <[email protected]>Acked-by Pekka Paalanen <[email protected]>Signed-off-by Louis Chauvet <[email protected]>---
[...]
Quoted 20 lines
Quoted 6 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +6
-0+/* +* 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, drivers/gpu/drm/vkms/tests/vkms_format_test.c line 118
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+* out_bits = 8, +* out_legal = False, +* out_int = True) +* Test cases for conversion between YUV BT709 full range and RGB +* using the ITU-R BT.709 weights. +*/ + { + .encoding = DRM_COLOR_YCBCR_BT709, + .range = DRM_COLOR_YCBCR_FULL_RANGE, + .n_colors = 4,If I understood correctly, "
n_colors" here indicates the number of items in "colors", but there is a mismatch between both lengths.
Quoted 1 line
It also applies to the other test cases where "
n_colors= 4".
I don't know how I miss it, I am 100% sure I did the exact same comment to Arthur few mounth ago, thanks!
Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+ .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 }}, + }, + }, +/*
[...]
Quoted 38 lines
Quoted 16 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +16
-0+/* +* 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. +* +* The conversion between YUV and RGB is not totally reversible, so there may be +* some difference between the expected value and the result. +* In addition, there may be some rounding error as the input color is 8 bits +* and output color is 16 bits. +*/ +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;drivers/gpu/drm/vkms/tests/vkms_format_test.c line 230
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+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);Running the test on ppc64 (big endian) doesn't fail. For reference:
$ sudo dnf install powerpc64-linux-gnu-gcc $ sudo dnf install qemu-system-ppc64 $ ./tools/testing/kunit/kunit.py run \ --kunitconfig=drivers/gpu/drm/vkms/tests \ --arch=powerpc --cross_compile=powerpc64-linux-gnu- \ --make_options CF=-D__CHECK_ENDIAN__ \ --kconfig_add CONFIG_KASAN=y \ --kconfig_add CONFIG_KASAN_VMALLOC=y
Quoted 8 lines
However, I wonder if endianness is correctly handled. I always find endianness difficult to reason about, but I'll try my best to explain it.
On a big endian architecture,
color->yuvis stored in big endian. This might not be an issue, because its components (y, u and v) are u8.
However, I think that the return value ofargb_u16_from_yuv888(), which is the result ofargb_u16_from_u16161616(), is returned in big endian while it should be little endian.
The goal of struct argb_u16 is to hide machine-specific issues. We want to be able to do addition, multiplication... without le_from_cpu/cpu_to_le everywhere.
If you look at the rest of the vkms driver, we never do bit manipulation on struct argb_u16, only mathematical operations.
Quoted 4 lines
Since you are comparing argb.a (big endian) with
color->argb.a(big endian) the test succedess, but in this case it should fail because, if I remember correctly, colors must be stored in little endian and therefore, the color returned byargb_u16_from_yuv888()should be little endian.
The colors are stored in a specific endian only in framebuffers, but in our case, this is not a framebuffer. For the argb_u16_to_ARGB16161616, you can see we use cpu_to_le16 to store the data in the proper order.
Quoted 5 lines
If you replace this 4
KUNIT_EXPECT_LE_MSG()withKUNIT_EXPECT_MEMEQ(), all test will fail, but you'll notice that the buffers printed in the error log are different depending on the endianness (x86_64vs ppc64).What do you think? Did I overlook the conversion?
I think yes, but thanks to make me think about it, I will steal your command line to test on powerPC :)
Quoted 4 lines
Have a look to the tests present in
drm_format_helper_test.c. They use different functions (cpubuf_to_le32,le32buf_to_cpu, etc) to make sure that colors are represented in little endian and that comparing the expected and actual results happens in the same endian.
Those tests are testing conversion "buffer to buffer", so yes, there is some endian-dependant issues.
[...]
Re: [PATCH v16 5/7] drm/vkms: Create KUnit tests for YUV conversions
Quoted 125 lines · Louis Chauvet
Quoted 20 lines · José Expósito
Hi Louis,
Quoted 18 lines
From: Arthur Grillo <[email protected]>
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 from0x0000to0xffff
- adapt to the newget_conversion_matrixusage
- apply the changes from Arthur
- move structpixel_yuv_u8to the test itself]Signed-off-by Arthur Grillo <[email protected]>Acked-by Pekka Paalanen <[email protected]>Signed-off-by Louis Chauvet <[email protected]>---
[...]
Quoted 20 lines
Quoted 6 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +6
-0+/* +* 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, drivers/gpu/drm/vkms/tests/vkms_format_test.c line 118
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+* out_bits = 8, +* out_legal = False, +* out_int = True) +* Test cases for conversion between YUV BT709 full range and RGB +* using the ITU-R BT.709 weights. +*/ + { + .encoding = DRM_COLOR_YCBCR_BT709, + .range = DRM_COLOR_YCBCR_FULL_RANGE, + .n_colors = 4,If I understood correctly, "
n_colors" here indicates the number of items in "colors", but there is a mismatch between both lengths.Quoted 1 line
It also applies to the other test cases where "
n_colors= 4".I don't know how I miss it, I am 100% sure I did the exact same comment to Arthur few mounth ago, thanks!
Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+ .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 }}, + }, + }, +/* [...]
Quoted 38 lines
Quoted 16 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +16
-0+/* +* 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. +* +* The conversion between YUV and RGB is not totally reversible, so there may be +* some difference between the expected value and the result. +* In addition, there may be some rounding error as the input color is 8 bits +* and output color is 16 bits. +*/ +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;drivers/gpu/drm/vkms/tests/vkms_format_test.c line 230
Quoted 10 lines
drivers/gpu/drm/vkms/tests/vkms_format_test.c new file +10
-0+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);Running the test on ppc64 (big endian) doesn't fail. For reference:
$ sudo dnf install powerpc64-linux-gnu-gcc $ sudo dnf install qemu-system-ppc64 $ ./tools/testing/kunit/kunit.py run \ --kunitconfig=drivers/gpu/drm/vkms/tests \ --arch=powerpc --cross_compile=powerpc64-linux-gnu- \ --make_options CF=-D__CHECK_ENDIAN__ \ --kconfig_add CONFIG_KASAN=y \ --kconfig_add CONFIG_KASAN_VMALLOC=yQuoted 8 lines
However, I wonder if endianness is correctly handled. I always find endianness difficult to reason about, but I'll try my best to explain it.
On a big endian architecture,
color->yuvis stored in big endian. This might not be an issue, because its components (y, u and v) are u8.
However, I think that the return value ofargb_u16_from_yuv888(), which is the result ofargb_u16_from_u16161616(), is returned in big endian while it should be little endian.The goal of
struct argb_u16is to hide machine-specific issues. We want to be able to do addition, multiplication... withoutle_from_cpu/cpu_to_leeverywhere.If you look at the rest of the vkms driver, we never do bit manipulation on
struct argb_u16, only mathematical operations.Quoted 4 lines
Since you are comparing argb.a (big endian) with
color->argb.a(big endian) the test succedess, but in this case it should fail because, if I remember correctly, colors must be stored in little endian and therefore, the color returned byargb_u16_from_yuv888()should be little endian.The colors are stored in a specific endian only in framebuffers, but in our case, this is not a framebuffer. For the
argb_u16_to_ARGB16161616, you can see we usecpu_to_le16to store the data in the proper order.
Quoted 8 lines
Quoted 5 lines
If you replace this 4
KUNIT_EXPECT_LE_MSG()withKUNIT_EXPECT_MEMEQ(), all test will fail, but you'll notice that the buffers printed in the error log are different depending on the endianness (x86_64vs ppc64).What do you think? Did I overlook the conversion?
I think yes, but thanks to make me think about it, I will steal your command line to test on powerPC :)
Well, at least the command was useful :P Thanks for the explanation. I have been looking with more detail into get_pixel_write_function() and what you mention makes sense now.
Thanks!
Quoted 9 lines
Quoted 4 lines
Have a look to the tests present in
drm_format_helper_test.c. They use different functions (cpubuf_to_le32,le32buf_to_cpu, etc) to make sure that colors are represented in little endian and that comparing the expected and actual results happens in the same endian.Those tests are testing conversion "buffer to buffer", so yes, there is some endian-dependant issues.
[...]
Louis Chauvet
maintainerPATCH v16 6/7 drm/vkms: Add how to run the Kunit tests
In reply to Louis ChauvetFrom: Arthur Grillo <[email protected]>
Now that we have KUnit tests, add instructions on how to run them.
--- Documentation/gpu/vkms.rst | 11 +++++++++++ 1 file changed, 11 insertions(+)
Documentation/gpu/vkms.rst +11 -0
@@ -89,6 +89,17 @@ You can also run subtests if you do not want to run the entire test:: sudo ./build/tests/kms_flip --run-subtest basic-plain-flip --device "sys:/sys/devices/platform/vkms" sudo IGT_DEVICE="sys:/sys/devices/platform/vkms" ./build/tests/kms_flip --run-subtest basic-plain-flip +Testing With KUnit +================== + +KUnit (Kernel unit testing framework) provides a common framework for unit tests +within the Linux kernel. +More information in ../dev-tools/kunit/index.rst . + +To run the VKMS KUnit tests:: + + tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/vkms/tests + TODO ====
Signature · 1 line
2.47.1
PATCH v16 6/7 drm/vkms: Add how to run the Kunit tests
Quoted 6 lines
From: Arthur Grillo <[email protected]>
Now that we have KUnit tests, add instructions on how to run them.
Signed-off-by Arthur Grillo <[email protected]>Signed-off-by Louis Chauvet <[email protected]>
Oh nice, I missed this in [1].
[1] https://patchwork.kernel.org/project/dri-devel/patch/[email protected]/
Quoted 27 lines
--- Documentation/gpu/vkms.rst | 11 +++++++++++ 1 file changed, 11 insertions(+)Documentation/gpu/vkms.rst +11
-0@@ -89,6 +89,17 @@ You can also run subtests if you do not want to run the entire test:: sudo ./build/tests/kms_flip --run-subtest basic-plain-flip --device "sys:/sys/devices/platform/vkms" sudo IGT_DEVICE="sys:/sys/devices/platform/vkms" ./build/tests/kms_flip --run-subtest basic-plain-flip +Testing With KUnit +================== + +KUnit (Kernel unit testing framework) provides a common framework for unit tests +within the Linux kernel. +More information in ../dev-tools/kunit/index.rst . + +To run the VKMS KUnit tests:: + + tools/testing/kunit/kunit.py run --kunitconfig=drivers/gpu/drm/vkms/tests + TODO ====
Louis Chauvet
maintainerPATCH v16 7/7 drm/vkms: Add support for DRM_FORMAT_R*
In reply to Louis ChauvetThis add the support for:
- R1/R2/R4/R8
R1 format was tested with [1] and [2].
[1]: https://lore.kernel.org/r/[email protected]
[2]: https://lore.kernel.org/igt-dev/[email protected]/
--- drivers/gpu/drm/vkms/vkms_formats.c | 110 +++++++++++++++++++++++++++++++++++- drivers/gpu/drm/vkms/vkms_plane.c | 4 ++ 2 files changed, 113 insertions(+), 1 deletion(-)
drivers/gpu/drm/vkms/vkms_formats.c +109 -1
@@ -249,6 +249,16 @@ static struct pixel_argb_u16 argb_u16_from_RGB565(const __le16 *pixel)return out_pixel; } +static struct pixel_argb_u16 argb_u16_from_gray8 (u8 gray) +{ +return argb_u16_from_u8888 (255 , gray, gray, gray); +} + +static struct pixel_argb_u16 argb_u16_from_grayu16 (u16 gray) +{ +return argb_u16_from_u16161616 (0xFFFF , gray, gray, gray); +} + VISIBLE_IF_KUNIT struct pixel_argb_u16 argb_u16_from_yuv888(u8 y, u8 channel_1, u8 channel_2,const struct conversion_matrix *matrix) {
@@ -286,7 +296,7 @@ EXPORT_SYMBOL_IF_KUNIT(argb_u16_from_yuv888);* The following functions are read_line function for each pixel format supported by VKMS. * * They read a line starting at the point @x_start,@y_start following the @direction. The result -* is stored in @out_pixel and in the format ARGB16161616. +* is stored in @out_pixel and in a 64 bits format, see struct pixel_argb_u16. * * These functions are very repetitive, but the innermost pixel loops must be kept inside these * functions for performance reasons. Some benchmarking was done in [1] where having the innermost
@@ -295,6 +305,96 @@ EXPORT_SYMBOL_IF_KUNIT(argb_u16_from_yuv888);* [1]: https://lore.kernel.org/dri-devel/[email protected]/ */ +static void Rx_read_line (const struct vkms_plane_state *plane,int x_start, +int y_start,enum pixel_read_direction direction,int count, +struct pixel_argb_u16 out_pixel[]) +{ +struct pixel_argb_u16 *end = out_pixel + count; +int bits_per_pixel =drm_format_info_bpp (plane->frame_info->fb->format,0 ); +u8 *src_pixels; +int rem_x, rem_y; + +WARN_ONCE (drm_format_info_block_height (plane->frame_info->fb->format,0 ) !=1 , +"%s() only support formats with block_h == 1" , __func__); + +packed_pixels_addr (plane->frame_info, x_start, y_start,0 , &src_pixels, &rem_x, &rem_y); +int bit_offset = (8 - bits_per_pixel) - rem_x * bits_per_pixel; +int step =get_block_step_bytes (plane->frame_info->fb, direction,0 ); +int mask = (0x1 << bits_per_pixel) -1 ; +int lum_per_level =0xFFFF / mask; + +if (direction ==READ_LEFT_TO_RIGHT || direction ==READ_RIGHT_TO_LEFT ) { +int restart_bit_offset; +int step_bit_offset; + +if (direction ==READ_LEFT_TO_RIGHT ) { + restart_bit_offset =8 - bits_per_pixel; + step_bit_offset = -bits_per_pixel; + }else { + restart_bit_offset =0 ; + step_bit_offset = bits_per_pixel; + } + +while (out_pixel < end) { +u8 val = ((*src_pixels) >> bit_offset) & mask; + + *out_pixel =argb_u16_from_grayu16 ((int )val * lum_per_level); + + bit_offset += step_bit_offset; +if (bit_offset <0 ||8 <= bit_offset) { + bit_offset = restart_bit_offset; + src_pixels += step; + } + out_pixel +=1 ; + } + }else if (direction ==READ_TOP_TO_BOTTOM || direction ==READ_BOTTOM_TO_TOP ) { +while (out_pixel < end) { +u8 val = (*src_pixels >> bit_offset) & mask; + *out_pixel =argb_u16_from_grayu16 ((int )val * lum_per_level); + src_pixels += step; + out_pixel +=1 ; + } + } +} + +static void R1_read_line (const struct vkms_plane_state *plane,int x_start, +int y_start,enum pixel_read_direction direction,int count, +struct pixel_argb_u16 out_pixel[]) +{ +Rx_read_line (plane, x_start, y_start, direction, count, out_pixel); +} + +static void R2_read_line (const struct vkms_plane_state *plane,int x_start, +int y_start,enum pixel_read_direction direction,int count, +struct pixel_argb_u16 out_pixel[]) +{ +Rx_read_line (plane, x_start, y_start, direction, count, out_pixel); +} + +static void R4_read_line (const struct vkms_plane_state *plane,int x_start, +int y_start,enum pixel_read_direction direction,int count, +struct pixel_argb_u16 out_pixel[]) +{ +Rx_read_line (plane, x_start, y_start, direction, count, out_pixel); +} + +static void R8_read_line (const struct vkms_plane_state *plane,int x_start, +int y_start,enum pixel_read_direction direction,int count, +struct pixel_argb_u16 out_pixel[]) +{ +struct pixel_argb_u16 *end = out_pixel + count; +u8 *src_pixels; +int step =get_block_step_bytes (plane->frame_info->fb, direction,0 ); + +packed_pixels_addr_1x1 (plane->frame_info, x_start, y_start,0 , &src_pixels); + +while (out_pixel < end) { + *out_pixel =argb_u16_from_gray8 (*src_pixels); + src_pixels += step; + out_pixel +=1 ; + } +} +static void ARGB8888_read_line (const struct vkms_plane_state *plane,int x_start,int y_start,enum pixel_read_direction direction,int count,struct pixel_argb_u16 out_pixel[])
@@ -606,6 +706,14 @@ pixel_read_line_t get_pixel_read_line_function(u32 format)case DRM_FORMAT_YVU422 :case DRM_FORMAT_YVU444 :return &planar_yuv_read_line; +case DRM_FORMAT_R1 : +return &R1_read_line; +case DRM_FORMAT_R2 : +return &R2_read_line; +case DRM_FORMAT_R4 : +return &R4_read_line; +case DRM_FORMAT_R8 : +return &R8_read_line;default :/* * This is a bug in vkms_plane_atomic_check(). All the supported
drivers/gpu/drm/vkms/vkms_plane.c +4 -0
@@ -30,6 +30,10 @@ static const u32 vkms_formats[] = {DRM_FORMAT_YVU420 ,DRM_FORMAT_YVU422 ,DRM_FORMAT_YVU444 , +DRM_FORMAT_R1 , +DRM_FORMAT_R2 , +DRM_FORMAT_R4 , + DRM_FORMAT_R8, }; static struct drm_plane_state *
Signature · 1 line
2.47.1