drm/format-helper: Move destination-buffer handling into internal helper

The format-convertion helpers handle several cases for different
values of destination buffer and pitch. Move that code into the
internal helper drm_fb_xfrm() and avoid quite a bit of duplication.

v2:
	* remove a duplicated blank line (Jose)
	* use drm_format_info_bpp() (Sam)
 	* fix vaddr_cached_hint bug (Sam)
	* add TODO on vaddr location (Sam)

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220808125406.20752-14-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c
index 53a313f..0fec3b6 100644 (file)
--- a/drivers/gpu/drm/drm_format_helper.c
+++ b/drivers/gpu/drm/drm_format_helper.c
@@ -41,11 +41,11 @@ unsigned int drm_fb_clip_offset(unsigned int pitch, const struct drm_format_info
 }
 EXPORT_SYMBOL(drm_fb_clip_offset);
 
-/* TODO: Make this functon work with multi-plane formats. */
-static int drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long dst_pixsize,
-                      const void *vaddr, const struct drm_framebuffer *fb,
-                      const struct drm_rect *clip, bool vaddr_cached_hint,
-                      void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels))
+/* TODO: Make this function work with multi-plane formats. */
+static int __drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long dst_pixsize,
+                        const void *vaddr, const struct drm_framebuffer *fb,
+                        const struct drm_rect *clip, bool vaddr_cached_hint,
+                        void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels))
 {
        unsigned long linepixels = drm_rect_width(clip);
        unsigned long lines = drm_rect_height(clip);
@@ -84,11 +84,11 @@ static int drm_fb_xfrm(void *dst, unsigned long dst_pitch, unsigned long dst_pix
        return 0;
 }
 
-/* TODO: Make this functon work with multi-plane formats. */
-static int drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, unsigned long dst_pixsize,
-                           const void *vaddr, const struct drm_framebuffer *fb,
-                           const struct drm_rect *clip, bool vaddr_cached_hint,
-                           void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels))
+/* TODO: Make this function work with multi-plane formats. */
+static int __drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, unsigned long dst_pixsize,
+                             const void *vaddr, const struct drm_framebuffer *fb,
+                             const struct drm_rect *clip, bool vaddr_cached_hint,
+                             void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels))
 {
        unsigned long linepixels = drm_rect_width(clip);
        unsigned long lines = drm_rect_height(clip);
@@ -129,6 +129,29 @@ static int drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, unsigned
        return 0;
 }
 
+/* TODO: Make this function work with multi-plane formats. */
+static int drm_fb_xfrm(struct iosys_map *dst,
+                      const unsigned int *dst_pitch, const u8 *dst_pixsize,
+                      const struct iosys_map *vmap, const struct drm_framebuffer *fb,
+                      const struct drm_rect *clip, bool vaddr_cached_hint,
+                      void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels))
+{
+       static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
+               0, 0, 0, 0
+       };
+
+       if (!dst_pitch)
+               dst_pitch = default_dst_pitch;
+
+       /* TODO: handle vmap in I/O memory here */
+       if (dst[0].is_iomem)
+               return __drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], dst_pixsize[0],
+                                         vmap[0].vaddr, fb, clip, vaddr_cached_hint, xfrm_line);
+       else
+               return __drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], dst_pixsize[0],
+                                    vmap[0].vaddr, fb, clip, vaddr_cached_hint, xfrm_line);
+}
+
 /**
  * drm_fb_memcpy - Copy clip buffer
  * @dst: Array of destination buffers
@@ -228,9 +251,6 @@ void drm_fb_swab(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 cached)
 {
-       static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
-               0, 0, 0, 0
-       };
        const struct drm_format_info *format = fb->format;
        u8 cpp = DIV_ROUND_UP(drm_format_info_bpp(format, 0), 8);
        void (*swab_line)(void *dbuf, const void *sbuf, unsigned int npixels);
@@ -245,22 +265,10 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch,
        default:
                drm_warn_once(fb->dev, "Format %p4cc has unsupported pixel size.\n",
                              &format->format);
-               swab_line = NULL;
-               break;
-       }
-       if (!swab_line)
                return;
+       }
 
-       if (!dst_pitch)
-               dst_pitch = default_dst_pitch;
-
-       /* TODO: handle vmap in I/O memory here */
-       if (dst->is_iomem)
-               drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], cpp,
-                                vmap[0].vaddr, fb, clip, cached, swab_line);
-       else
-               drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], cpp, vmap[0].vaddr, fb,
-                           clip, cached, swab_line);
+       drm_fb_xfrm(dst, dst_pitch, &cpp, vmap, fb, clip, cached, swab_line);
 }
 EXPORT_SYMBOL(drm_fb_swab);
 
@@ -303,20 +311,12 @@ void drm_fb_xrgb8888_to_rgb332(struct iosys_map *dst, const unsigned int *dst_pi
                               const struct iosys_map *vmap, const struct drm_framebuffer *fb,
                               const struct drm_rect *clip)
 {
-       static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
-               0, 0, 0, 0
+       static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = {
+               1,
        };
 
-       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], 1, vmap[0].vaddr, fb, clip,
-                                false, drm_fb_xrgb8888_to_rgb332_line);
-       else
-               drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 1, vmap[0].vaddr, fb, clip,
-                           false, drm_fb_xrgb8888_to_rgb332_line);
+       drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false,
+                   drm_fb_xrgb8888_to_rgb332_line);
 }
 EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb332);
 
@@ -380,9 +380,10 @@ void drm_fb_xrgb8888_to_rgb565(struct iosys_map *dst, const unsigned int *dst_pi
                               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
+       static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = {
+               2,
        };
+
        void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels);
 
        if (swab)
@@ -390,16 +391,7 @@ void drm_fb_xrgb8888_to_rgb565(struct iosys_map *dst, const unsigned int *dst_pi
        else
                xfrm_line = drm_fb_xrgb8888_to_rgb565_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(dst[0].vaddr, dst_pitch[0], 2, vmap[0].vaddr, fb, clip,
-                           false, xfrm_line);
+       drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false, xfrm_line);
 }
 EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);
 
@@ -443,20 +435,12 @@ void drm_fb_xrgb8888_to_rgb888(struct iosys_map *dst, const unsigned int *dst_pi
                               const struct iosys_map *vmap, const struct drm_framebuffer *fb,
                               const struct drm_rect *clip)
 {
-       static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
-               0, 0, 0, 0
+       static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = {
+               3,
        };
 
-       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], 3, vmap[0].vaddr, fb,
-                                clip, false, drm_fb_xrgb8888_to_rgb888_line);
-       else
-               drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 3, vmap[0].vaddr, fb,
-                           clip, false, drm_fb_xrgb8888_to_rgb888_line);
+       drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false,
+                   drm_fb_xrgb8888_to_rgb888_line);
 }
 EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb888);
 
@@ -483,20 +467,12 @@ static void drm_fb_rgb565_to_xrgb8888(struct iosys_map *dst, const unsigned int
                                      const struct drm_framebuffer *fb,
                                      const struct drm_rect *clip)
 {
-       static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
-               0, 0, 0, 0
+       static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = {
+               4,
        };
 
-       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], 4, vmap[0].vaddr, fb,
-                                clip, false, drm_fb_rgb565_to_xrgb8888_line);
-       else
-               drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 4, vmap[0].vaddr, fb,
-                           clip, false, drm_fb_rgb565_to_xrgb8888_line);
+       drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false,
+                   drm_fb_rgb565_to_xrgb8888_line);
 }
 
 static void drm_fb_rgb888_to_xrgb8888_line(void *dbuf, const void *sbuf, unsigned int pixels)
@@ -519,20 +495,12 @@ static void drm_fb_rgb888_to_xrgb8888(struct iosys_map *dst, const unsigned int
                                      const struct drm_framebuffer *fb,
                                      const struct drm_rect *clip)
 {
-       static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
-               0, 0, 0, 0
+       static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = {
+               4,
        };
 
-       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], 4, vmap[0].vaddr, fb,
-                                clip, false, drm_fb_rgb888_to_xrgb8888_line);
-       else
-               drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 4, vmap[0].vaddr, fb,
-                           clip, false, drm_fb_rgb888_to_xrgb8888_line);
+       drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false,
+                   drm_fb_rgb888_to_xrgb8888_line);
 }
 
 static void drm_fb_xrgb8888_to_xrgb2101010_line(void *dbuf, const void *sbuf, unsigned int pixels)
@@ -578,20 +546,12 @@ void drm_fb_xrgb8888_to_xrgb2101010(struct iosys_map *dst, const unsigned int *d
                                    const struct iosys_map *vmap, const struct drm_framebuffer *fb,
                                    const struct drm_rect *clip)
 {
-       static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
-               0, 0, 0, 0
+       static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = {
+               4,
        };
 
-       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], 4, vmap[0].vaddr, fb,
-                                clip, false, drm_fb_xrgb8888_to_xrgb2101010_line);
-       else
-               drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 4, vmap[0].vaddr, fb,
-                           clip, false, drm_fb_xrgb8888_to_xrgb2101010_line);
+       drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false,
+                   drm_fb_xrgb8888_to_xrgb2101010_line);
 }
 
 static void drm_fb_xrgb8888_to_gray8_line(void *dbuf, const void *sbuf, unsigned int pixels)
@@ -640,20 +600,12 @@ void drm_fb_xrgb8888_to_gray8(struct iosys_map *dst, const unsigned int *dst_pit
                              const struct iosys_map *vmap, const struct drm_framebuffer *fb,
                              const struct drm_rect *clip)
 {
-       static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
-               0, 0, 0, 0
+       static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = {
+               1,
        };
 
-       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], 1, vmap[0].vaddr, fb,
-                                clip, false, drm_fb_xrgb8888_to_gray8_line);
-       else
-               drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], 1, vmap[0].vaddr, fb,
-                           clip, false, drm_fb_xrgb8888_to_gray8_line);
+       drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false,
+                   drm_fb_xrgb8888_to_gray8_line);
 }
 EXPORT_SYMBOL(drm_fb_xrgb8888_to_gray8);