drm/format-helper: Rework XRGB8888-to-RGBG565 conversion

Update XRGB8888-to-RGB565 conversion to support struct iosys_map
and convert all users. Although these are single-plane color formats,
the new interface supports multi-plane formats for consistency with
drm_fb_blit().

v2:
	* update new Kunit tests
	* update documentation (Sam)
	* add TODO on vaddr location (Sam)

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Tested-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220808125406.20752-7-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c
index 248fd87f0a36215f8c4e0e57a1396dabc7ede719..a77291d2f9b9bc8cff385242465cce54744c0f8c 100644 (file)
--- a/drivers/gpu/drm/drm_format_helper.c
+++ b/drivers/gpu/drm/drm_format_helper.c
@@ -357,53 +357,51 @@ static void drm_fb_xrgb8888_to_rgb565_swab_line(void *dbuf, const void *sbuf,
 
 /**
  * drm_fb_xrgb8888_to_rgb565 - Convert XRGB8888 to RGB565 clip buffer
- * @dst: RGB565 destination buffer
- * @dst_pitch: Number of bytes between two consecutive scanlines within dst
- * @vaddr: XRGB8888 source buffer
+ * @dst: Array of RGB565 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.
+ * @vmap: Array of XRGB8888 source buffer
  * @fb: DRM framebuffer
  * @clip: Clip rectangle area to copy
  * @swab: Swap bytes
  *
- * Drivers can use this function for RGB565 devices that don't natively
- * support XRGB8888.
+ * This function copies parts of a framebuffer to display memory and converts the
+ * color format during the process. Destination and framebuffer formats must match. The
+ * parameters @dst, @dst_pitch and @vmap 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 RGB565 devices that don't support XRGB8888 natively.
  */
-void drm_fb_xrgb8888_to_rgb565(void *dst, unsigned int dst_pitch, const void *vaddr,
-                              const struct drm_framebuffer *fb, const struct drm_rect *clip,
-                              bool swab)
+void drm_fb_xrgb8888_to_rgb565(struct iosys_map *dst, const unsigned int *dst_pitch,
+                              const struct iosys_map *vmap, const struct drm_framebuffer *fb,
+                              const struct drm_rect *clip, bool swab)
 {
+       static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
+               0, 0, 0, 0
+       };
+       void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels);
+
        if (swab)
-               drm_fb_xfrm(dst, dst_pitch, 2, vaddr, fb, clip, false,
-                           drm_fb_xrgb8888_to_rgb565_swab_line);
+               xfrm_line = drm_fb_xrgb8888_to_rgb565_swab_line;
        else
-               drm_fb_xfrm(dst, dst_pitch, 2, vaddr, fb, clip, false,
-                           drm_fb_xrgb8888_to_rgb565_line);
-}
-EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);
+               xfrm_line = drm_fb_xrgb8888_to_rgb565_line;
 
-/**
- * drm_fb_xrgb8888_to_rgb565_toio - Convert XRGB8888 to RGB565 clip buffer
- * @dst: RGB565 destination buffer (iomem)
- * @dst_pitch: Number of bytes between two consecutive scanlines within dst
- * @vaddr: XRGB8888 source buffer
- * @fb: DRM framebuffer
- * @clip: Clip rectangle area to copy
- * @swab: Swap bytes
- *
- * Drivers can use this function for RGB565 devices that don't natively
- * support XRGB8888.
- */
-void drm_fb_xrgb8888_to_rgb565_toio(void __iomem *dst, unsigned int dst_pitch,
-                                   const void *vaddr, const struct drm_framebuffer *fb,
-                                   const struct drm_rect *clip, bool swab)
-{
-       if (swab)
-               drm_fb_xfrm_toio(dst, dst_pitch, 2, vaddr, fb, clip, false,
-                                drm_fb_xrgb8888_to_rgb565_swab_line);
+       if (!dst_pitch)
+               dst_pitch = default_dst_pitch;
+
+       /* TODO: handle vmap in I/O memory here */
+       if (dst[0].is_iomem)
+               drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], 2, vmap[0].vaddr, fb, clip,
+                                false, xfrm_line);
        else
-               drm_fb_xfrm_toio(dst, dst_pitch, 2, vaddr, fb, clip, false,
-                                drm_fb_xrgb8888_to_rgb565_line);
+               drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 2, vmap[0].vaddr, fb, clip,
+                           false, xfrm_line);
 }
-EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565_toio);
+EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);
 
 static void drm_fb_xrgb8888_to_rgb888_line(void *dbuf, const void *sbuf, unsigned int pixels)
 {
@@ -635,8 +633,7 @@ int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t d
 
        } else if (dst_format == DRM_FORMAT_RGB565) {
                if (fb_format == DRM_FORMAT_XRGB8888) {
-                       drm_fb_xrgb8888_to_rgb565_toio(dst[0].vaddr_iomem, dst_pitch[0],
-                                                      vmap[0].vaddr, fb, clip, false);
+                       drm_fb_xrgb8888_to_rgb565(dst, dst_pitch, vmap, fb, clip, false);
                        return 0;
                }
        } else if (dst_format == DRM_FORMAT_RGB888) {

diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c
index a44b7d6ae06c3a1b04741f74b545225335cf565c..84abc3920b5730c67143decb6fc1c1a5e29f44e0 100644 (file)
--- a/drivers/gpu/drm/drm_mipi_dbi.c
+++ b/drivers/gpu/drm/drm_mipi_dbi.c
@@ -206,7 +206,6 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
        struct iosys_map map[DRM_FORMAT_MAX_PLANES];
        struct iosys_map data[DRM_FORMAT_MAX_PLANES];
        struct iosys_map dst_map = IOSYS_MAP_INIT_VADDR(dst);
-       void *src;
        int ret;
 
        ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE);
@@ -216,7 +215,6 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
        ret = drm_gem_fb_vmap(fb, map, data);
        if (ret)
                goto out_drm_gem_fb_end_cpu_access;
-       src = data[0].vaddr; /* TODO: Use mapping abstraction properly */
 
        switch (fb->format->format) {
        case DRM_FORMAT_RGB565:
@@ -226,7 +224,7 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
                        drm_fb_memcpy(&dst_map, NULL, data, fb, clip);
                break;
        case DRM_FORMAT_XRGB8888:
-               drm_fb_xrgb8888_to_rgb565(dst, 0, src, fb, clip, swap);
+               drm_fb_xrgb8888_to_rgb565(&dst_map, NULL, data, fb, clip, swap);
                break;
        default:
                drm_err_once(fb->dev, "Format is not supported: %p4cc\n",

diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c
index 426a3ae6cc506d5eb43d64193e26d5e0408fe13b..a43eb66453522bf1cb0061a9a2c40c6e1712ce72 100644 (file)
--- a/drivers/gpu/drm/gud/gud_pipe.c
+++ b/drivers/gpu/drm/gud/gud_pipe.c
@@ -198,7 +198,8 @@ retry:
                } else if (format->format == DRM_FORMAT_RGB332) {
                        drm_fb_xrgb8888_to_rgb332(&dst, NULL, map_data, fb, rect);
                } else if (format->format == DRM_FORMAT_RGB565) {
-                       drm_fb_xrgb8888_to_rgb565(buf, 0, vaddr, fb, rect, gud_is_big_endian());
+                       drm_fb_xrgb8888_to_rgb565(&dst, NULL, map_data, fb, rect,
+                                                 gud_is_big_endian());
                } else if (format->format == DRM_FORMAT_RGB888) {
                        drm_fb_xrgb8888_to_rgb888(buf, 0, vaddr, fb, rect);
                } else {

diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c b/drivers/gpu/drm/tests/drm_format_helper_test.c
index 7b14694ead59f938075be2ce67da0386acfe6cf4..8284870717969f90eaeb275b9be6e883b53bfb86 100644 (file)
--- a/drivers/gpu/drm/tests/drm_format_helper_test.c
+++ b/drivers/gpu/drm/tests/drm_format_helper_test.c
@@ -227,8 +227,9 @@ static void xrgb8888_to_rgb565_test(struct kunit *test)
        const struct convert_xrgb8888_case *params = test->param_value;
        const struct convert_to_rgb565_result *result = &params->rgb565_result;
        size_t dst_size;
-       __u16 *dst = NULL;
-       __u32 *src = NULL;
+       __u16 *buf = NULL;
+       __u32 *xrgb8888 = NULL;
+       struct iosys_map dst, src;
 
        struct drm_framebuffer fb = {
                .format = drm_format_info(DRM_FORMAT_XRGB8888),
@@ -239,19 +240,19 @@ static void xrgb8888_to_rgb565_test(struct kunit *test)
                                       &params->clip);
        KUNIT_ASSERT_GT(test, dst_size, 0);
 
-       dst = kunit_kzalloc(test, dst_size, GFP_KERNEL);
-       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dst);
+       buf = kunit_kzalloc(test, dst_size, GFP_KERNEL);
+       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buf);
+       iosys_map_set_vaddr(&dst, buf);
 
-       src = le32buf_to_cpu(test, params->xrgb8888, TEST_BUF_SIZE);
-       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, src);
+       xrgb8888 = le32buf_to_cpu(test, params->xrgb8888, TEST_BUF_SIZE);
+       KUNIT_ASSERT_NOT_ERR_OR_NULL(test, xrgb8888);
+       iosys_map_set_vaddr(&src, xrgb8888);
 
-       drm_fb_xrgb8888_to_rgb565(dst, result->dst_pitch, src, &fb,
-                                 &params->clip, false);
-       KUNIT_EXPECT_EQ(test, memcmp(dst, result->expected, dst_size), 0);
+       drm_fb_xrgb8888_to_rgb565(&dst, &result->dst_pitch, &src, &fb, &params->clip, false);
+       KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
 
-       drm_fb_xrgb8888_to_rgb565(dst, result->dst_pitch, src, &fb,
-                                 &params->clip, true);
-       KUNIT_EXPECT_EQ(test, memcmp(dst, result->expected_swab, dst_size), 0);
+       drm_fb_xrgb8888_to_rgb565(&dst, &result->dst_pitch, &src, &fb, &params->clip, true);
+       KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected_swab, dst_size), 0);
 }
 
 static struct kunit_case drm_format_helper_test_cases[] = {

diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
index 73fb9f63d227f1be45b30bcd9764d507eb31a5cf..9cd398e4700b3fc34d4ba6b21d9c7596bd2ba6cf 100644 (file)
--- a/drivers/gpu/drm/tiny/cirrus.c
+++ b/drivers/gpu/drm/tiny/cirrus.c
@@ -335,8 +335,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb,
 
        } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2) {
                iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect));
-               drm_fb_xrgb8888_to_rgb565_toio(dst.vaddr_iomem, cirrus->pitch, vaddr, fb, rect,
-                                              false);
+               drm_fb_xrgb8888_to_rgb565(&dst, &cirrus->pitch, vmap, fb, rect, false);
 
        } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 3) {
                iosys_map_incr(&dst, drm_fb_clip_offset(cirrus->pitch, fb->format, rect));

diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h
index 3c28f099e3ed4723e165e8db106ff2e8c6367a89..9f1d45d7ce840551496788840c9a3b6b574242c8 100644 (file)
--- a/include/drm/drm_format_helper.h
+++ b/include/drm/drm_format_helper.h
@@ -23,12 +23,9 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch,
 void drm_fb_xrgb8888_to_rgb332(struct iosys_map *dst, const unsigned int *dst_pitch,
                               const struct iosys_map *vmap, const struct drm_framebuffer *fb,
                               const struct drm_rect *clip);
-void drm_fb_xrgb8888_to_rgb565(void *dst, unsigned int dst_pitch, const void *vaddr,
-                              const struct drm_framebuffer *fb, const struct drm_rect *clip,
-                              bool swab);
-void drm_fb_xrgb8888_to_rgb565_toio(void __iomem *dst, unsigned int dst_pitch,
-                                   const void *vaddr, const struct drm_framebuffer *fb,
-                                   const struct drm_rect *clip, bool swab);
+void drm_fb_xrgb8888_to_rgb565(struct iosys_map *dst, const unsigned int *dst_pitch,
+                              const struct iosys_map *vmap, const struct drm_framebuffer *fb,
+                              const struct drm_rect *clip, bool swab);
 void drm_fb_xrgb8888_to_rgb888(void *dst, unsigned int dst_pitch, const void *src,
                               const struct drm_framebuffer *fb, const struct drm_rect *clip);
 void drm_fb_xrgb8888_to_rgb888_toio(void __iomem *dst, unsigned int dst_pitch,