drm/tests: Update format-helper tests for sysfb
Subsystems (3)
Thomas Zimmermann
maintainercover drm/tests: Update format-helper tests for sysfb
The helpers drm_fb_blit() and drm_fb_build_fourcc_list() will be integrated into sysfb helpers. Update the DRM format-helper tests accordingly in patches 1 and 2.
The change to drm_fb_build_fourcc_list() is simple enough that we can apply it here in patch 3.
Thomas Zimmermann (3):
drm/tests: Do not use drm_fb_blit() in format-helper tests drm/tests: Test drm_fb_build_fourcc_list() in separate test suite drm/format-helper: Move drm_fb_build_fourcc_list() to sysfb helpers
drivers/gpu/drm/drm_format_helper.c | 246 +++++++---------- drivers/gpu/drm/drm_format_internal.h | 8 + drivers/gpu/drm/sysfb/drm_sysfb_helper.h | 4 + drivers/gpu/drm/sysfb/drm_sysfb_modeset.c | 138 ++++++++++ drivers/gpu/drm/sysfb/efidrm.c | 4 +- drivers/gpu/drm/sysfb/ofdrm.c | 5 +- drivers/gpu/drm/sysfb/simpledrm.c | 5 +- drivers/gpu/drm/sysfb/vesadrm.c | 4 +- drivers/gpu/drm/tests/Makefile | 3 +- .../gpu/drm/tests/drm_format_helper_test.c | 250 ++---------------- drivers/gpu/drm/tests/drm_sysfb_helper_test.c | 167 ++++++++++++ include/drm/drm_format_helper.h | 13 +- 12 files changed, 450 insertions(+), 397 deletions(-) create mode 100644 drivers/gpu/drm/tests/drm_sysfb_helper_test.c
Signature · 1 line
2.49.0
Thomas Zimmermann
maintainerPATCH 1/3 drm/tests: Do not use drm_fb_blit() in format-helper tests
Export additional helpers from the format-helper library and open-code drm_fb_blit() in tests. Prepares for the removal of drm_fb_blit(). Only sysfb drivers use drm_fb_blit(). The function will soon be removed from format helpers and be refactored within sysfb helpers.
--- drivers/gpu/drm/drm_format_helper.c | 108 ++++++++++++++++-- drivers/gpu/drm/drm_format_internal.h | 8 ++ .../gpu/drm/tests/drm_format_helper_test.c | 108 +++--------------- include/drm/drm_format_helper.h | 9 ++ 4 files changed, 131 insertions(+), 102 deletions(-)
drivers/gpu/drm/drm_format_helper.c +98 -10
@@ -857,11 +857,33 @@ static void drm_fb_xrgb8888_to_abgr8888_line(void *dbuf, const void *sbuf, unsigdrm_fb_xfrm_line_32to32 (dbuf, sbuf, pixels, drm_pixel_xrgb8888_to_abgr8888); } -static void drm_fb_xrgb8888_to_abgr8888 (struct iosys_map *dst,const unsigned int *dst_pitch, -const struct iosys_map *src, -const struct drm_framebuffer *fb, -const struct drm_rect *clip, -struct drm_format_conv_state *state) +/** +* drm_fb_xrgb8888_to_abgr8888 - Convert XRGB8888 to ABGR8888 clip buffer +* @dst: Array of ABGR8888 destination buffers +* @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines +* within @dst; can be NULL if scanlines are stored next to each other. +* @src: Array of XRGB8888 source buffer +* @fb: DRM framebuffer +* @clip: Clip rectangle area to copy +* @state: Transform and conversion state +* +* This function copies parts of a framebuffer to display memory and converts the +* color format during the process. The parameters @dst, @dst_pitch and @src refer +* to arrays. Each array must have at least as many entries as there are planes in +* @fb's format. Each entry stores the value for the format's respective color plane +* at the same index. +* +* This function does not apply clipping on @dst (i.e. the destination is at the +* top-left corner). +* +* Drivers can use this function for ABGR8888 devices that don't support XRGB8888 +* natively. It sets an opaque alpha channel as part of the conversion. +*/ +void drm_fb_xrgb8888_to_abgr8888 (struct iosys_map *dst,const unsigned int *dst_pitch, +const struct iosys_map *src, +const struct drm_framebuffer *fb, +const struct drm_rect *clip, +struct drm_format_conv_state *state) {static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES ] = {4 ,
@@ -870,17 +892,40 @@ static void drm_fb_xrgb8888_to_abgr8888(struct iosys_map *dst, const unsigned indrm_fb_xfrm (dst, dst_pitch, dst_pixsize, src, fb, clip, false, state, drm_fb_xrgb8888_to_abgr8888_line); } +EXPORT_SYMBOL (drm_fb_xrgb8888_to_abgr8888);static void drm_fb_xrgb8888_to_xbgr8888_line (void *dbuf,const void *sbuf,unsigned int pixels) {drm_fb_xfrm_line_32to32 (dbuf, sbuf, pixels, drm_pixel_xrgb8888_to_xbgr8888); } -static void drm_fb_xrgb8888_to_xbgr8888 (struct iosys_map *dst,const unsigned int *dst_pitch, -const struct iosys_map *src, -const struct drm_framebuffer *fb, -const struct drm_rect *clip, -struct drm_format_conv_state *state) +/** +* drm_fb_xrgb8888_to_xbgr8888 - Convert XRGB8888 to XBGR8888 clip buffer +* @dst: Array of XBGR8888 destination buffers +* @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines +* within @dst; can be NULL if scanlines are stored next to each other. +* @src: Array of XRGB8888 source buffer +* @fb: DRM framebuffer +* @clip: Clip rectangle area to copy +* @state: Transform and conversion state +* +* This function copies parts of a framebuffer to display memory and converts the +* color format during the process. The parameters @dst, @dst_pitch and @src refer +* to arrays. Each array must have at least as many entries as there are planes in +* @fb's format. Each entry stores the value for the format's respective color plane +* at the same index. +* +* This function does not apply clipping on @dst (i.e. the destination is at the +* top-left corner). +* +* Drivers can use this function for XBGR8888 devices that don't support XRGB8888 +* natively. +*/ +void drm_fb_xrgb8888_to_xbgr8888 (struct iosys_map *dst,const unsigned int *dst_pitch, +const struct iosys_map *src, +const struct drm_framebuffer *fb, +const struct drm_rect *clip, +struct drm_format_conv_state *state) {static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES ] = {4 ,
@@ -889,6 +934,49 @@ static void drm_fb_xrgb8888_to_xbgr8888(struct iosys_map *dst, const unsigned indrm_fb_xfrm (dst, dst_pitch, dst_pixsize, src, fb, clip, false, state, drm_fb_xrgb8888_to_xbgr8888_line); } +EXPORT_SYMBOL (drm_fb_xrgb8888_to_xbgr8888); + +static void drm_fb_xrgb8888_to_bgrx8888_line (void *dbuf,const void *sbuf,unsigned int pixels) +{ +drm_fb_xfrm_line_32to32 (dbuf, sbuf, pixels, drm_pixel_xrgb8888_to_bgrx8888); +} + +/** +* drm_fb_xrgb8888_to_bgrx8888 - Convert XRGB8888 to BGRX8888 clip buffer +* @dst: Array of BGRX8888 destination buffers +* @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines +* within @dst; can be NULL if scanlines are stored next to each other. +* @src: Array of XRGB8888 source buffer +* @fb: DRM framebuffer +* @clip: Clip rectangle area to copy +* @state: Transform and conversion state +* +* This function copies parts of a framebuffer to display memory and converts the +* color format during the process. The parameters @dst, @dst_pitch and @src refer +* to arrays. Each array must have at least as many entries as there are planes in +* @fb's format. Each entry stores the value for the format's respective color plane +* at the same index. +* +* This function does not apply clipping on @dst (i.e. the destination is at the +* top-left corner). +* +* Drivers can use this function for BGRX8888 devices that don't support XRGB8888 +* natively. +*/ +void drm_fb_xrgb8888_to_bgrx8888 (struct iosys_map *dst,const unsigned int *dst_pitch, +const struct iosys_map *src, +const struct drm_framebuffer *fb, +const struct drm_rect *clip, +struct drm_format_conv_state *state) +{ +static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES ] = { +4 , + }; + +drm_fb_xfrm (dst, dst_pitch, dst_pixsize, src, fb, clip, false, state, + drm_fb_xrgb8888_to_bgrx8888_line); +} +EXPORT_SYMBOL (drm_fb_xrgb8888_to_bgrx8888);static void drm_fb_xrgb8888_to_xrgb2101010_line (void *dbuf,const void *sbuf,unsigned int pixels) {
drivers/gpu/drm/drm_format_internal.h +8 -0
@@ -111,6 +111,14 @@ static inline u32 drm_pixel_xrgb8888_to_xbgr8888(u32 pix) ((pix &0x000000ff ) <<16 ); } +static inline u32 drm_pixel_xrgb8888_to_bgrx8888 (u32 pix) +{ +return ((pix &0xff000000 ) >>24 ) |/* also copy filler bits */ + ((pix &0x00ff0000 ) >>8 ) | + ((pix &0x0000ff00 ) <<8 ) | + ((pix &0x000000ff ) <<24 ); +} +static inline u32 drm_pixel_xrgb8888_to_abgr8888 (u32 pix) { return GENMASK(31, 24) | /* fill alpha bits */
drivers/gpu/drm/tests/drm_format_helper_test.c +16 -92
210 lines not on this page · raw message
include/drm/drm_format_helper.h +9 -0
@@ -102,6 +102,15 @@ void drm_fb_xrgb8888_to_bgr888(struct iosys_map *dst, const unsigned int *dst_pivoid drm_fb_xrgb8888_to_argb8888 (struct iosys_map *dst,const unsigned int *dst_pitch,const struct iosys_map *src,const struct drm_framebuffer *fb,const struct drm_rect *clip,struct drm_format_conv_state *state); +void drm_fb_xrgb8888_to_abgr8888 (struct iosys_map *dst,const unsigned int *dst_pitch, +const struct iosys_map *src,const struct drm_framebuffer *fb, +const struct drm_rect *clip,struct drm_format_conv_state *state); +void drm_fb_xrgb8888_to_xbgr8888 (struct iosys_map *dst,const unsigned int *dst_pitch, +const struct iosys_map *src,const struct drm_framebuffer *fb, +const struct drm_rect *clip,struct drm_format_conv_state *state); +void drm_fb_xrgb8888_to_bgrx8888 (struct iosys_map *dst,const unsigned int *dst_pitch, +const struct iosys_map *src,const struct drm_framebuffer *fb, +const struct drm_rect *clip,struct drm_format_conv_state *state); void drm_fb_xrgb8888_to_xrgb2101010(struct iosys_map *dst, const unsigned int *dst_pitch, const struct iosys_map *src, const struct drm_framebuffer *fb, const struct drm_rect *clip,
Signature · 1 line
2.49.0
Re: [PATCH 1/3] drm/tests: Do not use drm_fb_blit() in format-helper tests
Quoted 6 lines · Thomas Zimmermann
Export additional helpers from the format-helper library and open-code
drm_fb_blit()in tests. Prepares for the removal ofdrm_fb_blit(). Only sysfb drivers usedrm_fb_blit(). The function will soon be removed from format helpers and be refactored within sysfb helpers.Signed-off-by Thomas Zimmermann <[email protected]>
Alternatively, we have VISIBLE_IF_KUNIT and EXPORT_SYMBOL_IF_KUNIT, or EXPORT_SYMBOL_FOR_TESTS_ONLY if you don't want to make it part of the API.
Either way,
Maxime
Thomas Zimmermann
maintainerRe: [PATCH 1/3] drm/tests: Do not use drm_fb_blit() in format-helper tests
Hi
Am 06.06.25 um 09:41 schrieb Maxime Ripard:
Quoted 10 lines · Thomas Zimmermann
Quoted 6 lines
Export additional helpers from the format-helper library and open-code
drm_fb_blit()in tests. Prepares for the removal ofdrm_fb_blit(). Only sysfb drivers usedrm_fb_blit(). The function will soon be removed from format helpers and be refactored within sysfb helpers.Signed-off-by Thomas Zimmermann <[email protected]>Alternatively, we have
VISIBLE_IF_KUNITandEXPORT_SYMBOL_IF_KUNIT, orEXPORT_SYMBOL_FOR_TESTS_ONLYif you don't want to make it part of the API.
Once drm_fb_blit() has been merged into the sysfb helpers, these symbols would be exported anyway.
Quoted 4 lines
Either way,
Acked-by Maxime Ripard <[email protected]>
Thanks for looking over the series.
Best regards
Thomas
Quoted 2 lines
Maxime
Signature · 7 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Thomas Zimmermann
maintainerPATCH 2/3 drm/tests: Test drm_fb_build_fourcc_list() in separate test suite
In reply to Thomas ZimmermannOnly sysfb drivers use drm_fb_build_fourcc_list(). The helper will be moved from format helpers to sysfb helpers. Moving the related tests to their own test suite.
--- drivers/gpu/drm/tests/Makefile | 3 +- .../gpu/drm/tests/drm_format_helper_test.c | 142 --------------- drivers/gpu/drm/tests/drm_sysfb_helper_test.c | 166 ++++++++++++++++++ 3 files changed, 168 insertions(+), 143 deletions(-) create mode 100644 drivers/gpu/drm/tests/drm_sysfb_helper_test.c
drivers/gpu/drm/tests/Makefile +2 -1
@@ -23,6 +23,7 @@ obj-$(CONFIG_DRM_KUNIT_TEST) += \ drm_modes_test.o \ drm_plane_helper_test.o \ drm_probe_helper_test.o \ - drm_rect_test.o + drm_rect_test.o \ + drm_sysfb_helper_test.o CFLAGS_drm_mm_test.o := $(DISABLE_STRUCTLEAK_PLUGIN)
drivers/gpu/drm/tests/drm_format_helper_test.c +0 -142
154 lines not on this page · raw message
drivers/gpu/drm/tests/drm_sysfb_helper_test.c new file +166 -0
166 lines not on this page · raw message
Signature · 1 line
2.49.0
Re: [PATCH 2/3] drm/tests: Test drm_fb_build_fourcc_list() in separate test suite
Hi,
Quoted 17 lines · Thomas Zimmermann
Only sysfb drivers use
drm_fb_build_fourcc_list(). The helper will be moved from format helpers to sysfb helpers. Moving the related tests to their own test suite.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/gpu/drm/tests/Makefile | 3 +- .../gpu/drm/tests/drm_format_helper_test.c | 142 --------------- drivers/gpu/drm/tests/drm_sysfb_helper_test.c | 166 ++++++++++++++++++ 3 files changed, 168 insertions(+), 143 deletions(-) create mode 100644 drivers/gpu/drm/tests/drm_sysfb_helper_test.cdrivers/gpu/drm/tests/Makefile +0
-0
drivers/gpu/drm/tests/Makefile obj-$(CONFIG_DRM_KUNIT_TEST) += \ · line 27
Quoted 6 lines
drivers/gpu/drm/tests/Makefile +2
-1@@ -23,6 +23,7 @@ obj-$(CONFIG_DRM_KUNIT_TEST) += \ drm_modes_test.o \ drm_plane_helper_test.o \ drm_probe_helper_test.o \ - drm_rect_test.o + drm_rect_test.o \ + drm_sysfb_helper_test.o
We've tried to keep the same name than where the implementation of what we're testing was so far. Judging by patch 3, that would be drm_sysfb_modeset_test.c here.
Once fixed,
Maxime
Thomas Zimmermann
maintainerPATCH 3/3 drm/format-helper: Move drm_fb_build_fourcc_list() to sysfb helpers
In reply to Thomas ZimmermannOnly sysfb drivers use drm_fb_build_fourcc_list(). Move the function to sysfb helpers and rename it accordingly. Update drivers and tests.
--- drivers/gpu/drm/drm_format_helper.c | 138 ------------------ drivers/gpu/drm/sysfb/drm_sysfb_helper.h | 4 + drivers/gpu/drm/sysfb/drm_sysfb_modeset.c | 138 ++++++++++++++++++ drivers/gpu/drm/sysfb/efidrm.c | 4 +- drivers/gpu/drm/sysfb/ofdrm.c | 5 +- drivers/gpu/drm/sysfb/simpledrm.c | 5 +- drivers/gpu/drm/sysfb/vesadrm.c | 4 +- drivers/gpu/drm/tests/drm_sysfb_helper_test.c | 9 +- include/drm/drm_format_helper.h | 4 - 9 files changed, 155 insertions(+), 156 deletions(-)
drivers/gpu/drm/drm_format_helper.c +0 -138
@@ -1338,141 +1338,3 @@ void drm_fb_xrgb8888_to_mono(struct iosys_map *dst, const unsigned int *dst_pitc } }EXPORT_SYMBOL (drm_fb_xrgb8888_to_mono); - -static uint32_t drm_fb_nonalpha_fourcc (uint32_t fourcc) -{ -/* only handle formats with depth != 0 and alpha channel */ -switch (fourcc) { -case DRM_FORMAT_ARGB1555 : -return DRM_FORMAT_XRGB1555 ; -case DRM_FORMAT_ABGR1555 : -return DRM_FORMAT_XBGR1555 ; -case DRM_FORMAT_RGBA5551 : -return DRM_FORMAT_RGBX5551 ; -case DRM_FORMAT_BGRA5551 : -return DRM_FORMAT_BGRX5551 ; -case DRM_FORMAT_ARGB8888 : -return DRM_FORMAT_XRGB8888 ; -case DRM_FORMAT_ABGR8888 : -return DRM_FORMAT_XBGR8888 ; -case DRM_FORMAT_RGBA8888 : -return DRM_FORMAT_RGBX8888 ; -case DRM_FORMAT_BGRA8888 : -return DRM_FORMAT_BGRX8888 ; -case DRM_FORMAT_ARGB2101010 : -return DRM_FORMAT_XRGB2101010 ; -case DRM_FORMAT_ABGR2101010 : -return DRM_FORMAT_XBGR2101010 ; -case DRM_FORMAT_RGBA1010102 : -return DRM_FORMAT_RGBX1010102 ; -case DRM_FORMAT_BGRA1010102 : -return DRM_FORMAT_BGRX1010102 ; - } - -return fourcc; -} - -static bool is_listed_fourcc (const uint32_t *fourccs,size_t nfourccs,uint32_t fourcc) -{ -const uint32_t *fourccs_end = fourccs + nfourccs; - -while (fourccs < fourccs_end) { -if (*fourccs == fourcc) -return true; - ++fourccs; - } -return false; -} - -/** -* drm_fb_build_fourcc_list - Filters a list of supported color formats against -* the device's native formats -* @dev: DRM device -* @native_fourccs: 4CC codes of natively supported color formats -* @native_nfourccs: The number of entries in @native_fourccs -* @fourccs_out: Returns 4CC codes of supported color formats -* @nfourccs_out: The number of available entries in @fourccs_out -* -* This function create a list of supported color format from natively -* supported formats and additional emulated formats. -* At a minimum, most userspace programs expect at least support for -* XRGB8888 on the primary plane. Devices that have to emulate the -* format, and possibly others, can use drm_fb_build_fourcc_list() to -* create a list of supported color formats. The returned list can -* be handed over to drm_universal_plane_init() et al. Native formats -* will go before emulated formats. Native formats with alpha channel -* will be replaced by such without, as primary planes usually don't -* support alpha. Other heuristics might be applied -* to optimize the order. Formats near the beginning of the list are -* usually preferred over formats near the end of the list. -* -* Returns: -* The number of color-formats 4CC codes returned in @fourccs_out. -*/ -size_t drm_fb_build_fourcc_list (struct drm_device *dev, -const u32 *native_fourccs,size_t native_nfourccs, -u32 *fourccs_out,size_t nfourccs_out) -{ -/* -* XRGB8888 is the default fallback format for most of userspace -* and it's currently the only format that should be emulated for -* the primary plane. Only if there's ever another default fallback, -* it should be added here. -*/ -static const uint32_t extra_fourccs[] = { -DRM_FORMAT_XRGB8888 , - }; -static const size_t extra_nfourccs =ARRAY_SIZE (extra_fourccs); - -u32 *fourccs = fourccs_out; -const u32 *fourccs_end = fourccs_out + nfourccs_out; -size_t i; - -/* -* The device's native formats go first. -*/ - -for (i =0 ; i < native_nfourccs; ++i) { -/* -* Several DTs, boot loaders and firmware report native -* alpha formats that are non-alpha formats instead. So -* replace alpha formats by non-alpha formats. -*/ -u32 fourcc =drm_fb_nonalpha_fourcc (native_fourccs[i]); - -if (is_listed_fourcc (fourccs_out, fourccs - fourccs_out, fourcc)) { -continue ;/* skip duplicate entries */ - }else if (fourccs == fourccs_end) { -drm_warn (dev,"Ignoring native format %p4cc\n" , &fourcc); -continue ;/* end of available output buffer */ - } - -drm_dbg_kms (dev,"adding native format %p4cc\n" , &fourcc); - - *fourccs = fourcc; - ++fourccs; - } - -/* -* The extra formats, emulated by the driver, go second. -*/ - -for (i =0 ; (i < extra_nfourccs) && (fourccs < fourccs_end); ++i) { -u32 fourcc = extra_fourccs[i]; - -if (is_listed_fourcc (fourccs_out, fourccs - fourccs_out, fourcc)) { -continue ;/* skip duplicate and native entries */ - }else if (fourccs == fourccs_end) { -drm_warn (dev,"Ignoring emulated format %p4cc\n" , &fourcc); -continue ;/* end of available output buffer */ - } - -drm_dbg_kms (dev,"adding emulated format %p4cc\n" , &fourcc); - - *fourccs = fourcc; - ++fourccs; - } - -return fourccs - fourccs_out; -} -EXPORT_SYMBOL (drm_fb_build_fourcc_list);
drivers/gpu/drm/sysfb/drm_sysfb_helper.h +4 -0
@@ -93,6 +93,10 @@ static inline struct drm_sysfb_device *to_drm_sysfb_device(struct drm_device *de* Plane */ +size_t drm_sysfb_build_fourcc_list (struct drm_device *dev, +const u32 *native_fourccs,size_t native_nfourccs, +u32 *fourccs_out,size_t nfourccs_out); +int drm_sysfb_plane_helper_atomic_check (struct drm_plane *plane,struct drm_atomic_state *new_state); void drm_sysfb_plane_helper_atomic_update(struct drm_plane *plane,
drivers/gpu/drm/sysfb/drm_sysfb_modeset.c +138 -0
144 lines not on this page · raw message
drivers/gpu/drm/sysfb/efidrm.c +2 -2
@@ -271,8 +271,8 @@ static struct efidrm_device *efidrm_device_create(struct drm_driver *drv,/* Primary plane */ - nformats =drm_fb_build_fourcc_list (dev, &format->format,1 , - efi->formats,ARRAY_SIZE (efi->formats)); + nformats =drm_sysfb_build_fourcc_list (dev, &format->format,1 , + efi->formats,ARRAY_SIZE (efi->formats)); primary_plane = &efi->primary_plane; ret = drm_universal_plane_init(dev, primary_plane, 0, &efidrm_primary_plane_funcs,
drivers/gpu/drm/sysfb/ofdrm.c +2 -3
@@ -15,7 +15,6 @@#include <drm/drm_drv.h> #include <drm/drm_edid.h> #include <drm/drm_fbdev_shmem.h> -#include <drm/drm_format_helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
@@ -1015,8 +1014,8 @@ static struct ofdrm_device *ofdrm_device_create(struct drm_driver *drv,/* Primary plane */ - nformats =drm_fb_build_fourcc_list (dev, &format->format,1 , - odev->formats,ARRAY_SIZE (odev->formats)); + nformats =drm_sysfb_build_fourcc_list (dev, &format->format,1 , + odev->formats,ARRAY_SIZE (odev->formats)); primary_plane = &odev->primary_plane; ret = drm_universal_plane_init(dev, primary_plane, 0, &ofdrm_primary_plane_funcs,
drivers/gpu/drm/sysfb/simpledrm.c +2 -3
@@ -18,7 +18,6 @@#include <drm/drm_device.h> #include <drm/drm_drv.h> #include <drm/drm_fbdev_shmem.h> -#include <drm/drm_format_helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
@@ -765,8 +764,8 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,/* Primary plane */ - nformats =drm_fb_build_fourcc_list (dev, &format->format,1 , - sdev->formats,ARRAY_SIZE (sdev->formats)); + nformats =drm_sysfb_build_fourcc_list (dev, &format->format,1 , + sdev->formats,ARRAY_SIZE (sdev->formats)); primary_plane = &sdev->primary_plane; ret = drm_universal_plane_init(dev, primary_plane, 0, &simpledrm_primary_plane_funcs,
drivers/gpu/drm/sysfb/vesadrm.c +2 -2
@@ -402,8 +402,8 @@ static struct vesadrm_device *vesadrm_device_create(struct drm_driver *drv,/* Primary plane */ - nformats =drm_fb_build_fourcc_list (dev, &format->format,1 , - vesa->formats,ARRAY_SIZE (vesa->formats)); + nformats =drm_sysfb_build_fourcc_list (dev, &format->format,1 , + vesa->formats,ARRAY_SIZE (vesa->formats)); primary_plane = &vesa->primary_plane; ret = drm_universal_plane_init(dev, primary_plane, 0, &vesadrm_primary_plane_funcs,
drivers/gpu/drm/tests/drm_sysfb_helper_test.c +5 -4
@@ -2,10 +2,11 @@#include <kunit/test.h> -#include <drm/drm_format_helper.h> #include <drm/drm_fourcc.h> #include <drm/drm_kunit_helpers.h> +#include "../sysfb/drm_sysfb_helper.h" +#define TEST_BUF_SIZE 50struct fb_build_fourcc_list_case {
@@ -141,9 +142,9 @@ static void drm_test_fb_build_fourcc_list(struct kunit *test) drm =__drm_kunit_helper_alloc_drm_device (test, dev,sizeof (*drm),0 ,DRIVER_MODESET );KUNIT_ASSERT_NOT_ERR_OR_NULL (test, drm); - nfourccs_out =drm_fb_build_fourcc_list (drm, params->native_fourccs, - params->native_fourccs_size, - fourccs_out,TEST_BUF_SIZE ); + nfourccs_out =drm_sysfb_build_fourcc_list (drm, params->native_fourccs, + params->native_fourccs_size, + fourccs_out,TEST_BUF_SIZE );KUNIT_EXPECT_EQ (test, nfourccs_out, params->expected_fourccs_size);KUNIT_EXPECT_MEMEQ (test, fourccs_out, params->expected,TEST_BUF_SIZE );
include/drm/drm_format_helper.h +0 -4
@@ -134,8 +134,4 @@ void drm_fb_xrgb8888_to_mono(struct iosys_map *dst, const unsigned int *dst_pitc const struct iosys_map *src, const struct drm_framebuffer *fb, const struct drm_rect *clip, struct drm_format_conv_state *state); -size_t drm_fb_build_fourcc_list (struct drm_device *dev, -const u32 *native_fourccs,size_t native_nfourccs, -u32 *fourccs_out,size_t nfourccs_out); -#endif /* __LINUX_DRM_FORMAT_HELPER_H */
Signature · 1 line
2.49.0
kernel test robot
build botRe: [PATCH 3/3] drm/format-helper: Move drm_fb_build_fourcc_list() to sysfb helpers
kernel test robot noticed the following build errors:
Hi Thomas,
kernel test robot noticed the following build errors:
[auto build test ERROR on linus/master]
[also build test ERROR on next-20250605]
[cannot apply to drm-exynos/exynos-drm-next drm/drm-next drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-misc/drm-misc-next drm-tip/drm-tip v6.15] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Thomas-Zimmermann/drm-tests-Do-not-use-drm_fb_blit-in-format-helper-tests/20250604-235451 base: linus/master patch link: https://lore.kernel.org/r/20250604154844.28995-4-tzimmermann%40suse.de patch subject: [PATCH 3/3] drm/format-helper: Move drm_fb_build_fourcc_list() to sysfb helpers config: arm-randconfig-003-20250606 (https://download.01.org/0day-ci/archive/20250606/[email protected]/config) compiler: clang version 21.0.0git (https://github.com/llvm/llvm-project f819f46284f2a79790038e1f6649172789734ae8) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250606/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>, old ones prefixed by <<):
>> ERROR: modpost: "drm_sysfb_build_fourcc_list" [drivers/gpu/drm/tests/drm_sysfb_helper_test.ko] undefined!
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [PATCH 3/3] drm/format-helper: Move drm_fb_build_fourcc_list() to sysfb helpers
In reply to Thomas ZimmermannQuoted 4 lines · Thomas Zimmermann
Only sysfb drivers use
drm_fb_build_fourcc_list(). Move the function to sysfb helpers and rename it accordingly. Update drivers and tests.Signed-off-by Thomas Zimmermann <[email protected]>
Thanks!
Maxime
Re: [PATCH 3/3] drm/format-helper: Move drm_fb_build_fourcc_list() to sysfb helpers
In reply to Thomas ZimmermannThomas Zimmermann <[email protected]> writes:
Hello Thomas,
Quoted 5 lines
Only sysfb drivers use
drm_fb_build_fourcc_list(). Move the function to sysfb helpers and rename it accordingly. Update drivers and tests.Signed-off-by Thomas Zimmermann <[email protected]>---
Signature · 5 lines
Best regards, Javier Martinez Canillas Core Platforms Red Hat