drm/format-helper: Rework format-helper memcpy functions

Move destination-buffer clipping from all format-helper memcpy
function into callers. Support destination-buffer pitch. Only
distinguish between system and I/O memory, but use same logic
everywhere.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Tested-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211110103702.374-3-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c
index 9d2a4c27689b723c6654aba11a2f41a2d7f148ef..32b4c9cff2ef31ff0d0b70115796ed1b7dbea635 100644 (file)
--- a/drivers/gpu/drm/drm_format_helper.c
+++ b/drivers/gpu/drm/drm_format_helper.c
@@ -41,58 +41,62 @@ EXPORT_SYMBOL(drm_fb_clip_offset);
 /**
  * drm_fb_memcpy - Copy clip buffer
  * @dst: Destination buffer
+ * @dst_pitch: Number of bytes between two consecutive scanlines within dst
  * @vaddr: Source buffer
  * @fb: DRM framebuffer
  * @clip: Clip rectangle area to copy
  *
  * This function does not apply clipping on dst, i.e. the destination
- * is a small buffer containing the clip rect only.
+ * is at the top-left corner.
  */
-void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb,
-                  struct drm_rect *clip)
+void drm_fb_memcpy(void *dst, unsigned int dst_pitch, const void *vaddr,
+                  const struct drm_framebuffer *fb, const struct drm_rect *clip)
 {
        unsigned int cpp = fb->format->cpp[0];
        size_t len = (clip->x2 - clip->x1) * cpp;
        unsigned int y, lines = clip->y2 - clip->y1;
 
+       if (!dst_pitch)
+               dst_pitch = len;
+
        vaddr += clip_offset(clip, fb->pitches[0], cpp);
        for (y = 0; y < lines; y++) {
                memcpy(dst, vaddr, len);
                vaddr += fb->pitches[0];
-               dst += len;
+               dst += dst_pitch;
        }
 }
 EXPORT_SYMBOL(drm_fb_memcpy);
 
 /**
- * drm_fb_memcpy_dstclip - Copy clip buffer
+ * drm_fb_memcpy_toio - Copy clip buffer
  * @dst: Destination buffer (iomem)
  * @dst_pitch: Number of bytes between two consecutive scanlines within dst
  * @vaddr: Source buffer
  * @fb: DRM framebuffer
  * @clip: Clip rectangle area to copy
  *
- * This function applies clipping on dst, i.e. the destination is a
- * full (iomem) framebuffer but only the clip rect content is copied over.
+ * This function does not apply clipping on dst, i.e. the destination
+ * is at the top-left corner.
  */
-void drm_fb_memcpy_dstclip(void __iomem *dst, unsigned int dst_pitch,
-                          void *vaddr, struct drm_framebuffer *fb,
-                          struct drm_rect *clip)
+void drm_fb_memcpy_toio(void __iomem *dst, unsigned int dst_pitch, const void *vaddr,
+                       const struct drm_framebuffer *fb, const struct drm_rect *clip)
 {
        unsigned int cpp = fb->format->cpp[0];
-       unsigned int offset = clip_offset(clip, dst_pitch, cpp);
        size_t len = (clip->x2 - clip->x1) * cpp;
        unsigned int y, lines = clip->y2 - clip->y1;
 
-       vaddr += offset;
-       dst += offset;
+       if (!dst_pitch)
+               dst_pitch = len;
+
+       vaddr += clip_offset(clip, fb->pitches[0], cpp);
        for (y = 0; y < lines; y++) {
                memcpy_toio(dst, vaddr, len);
                vaddr += fb->pitches[0];
                dst += dst_pitch;
        }
 }
-EXPORT_SYMBOL(drm_fb_memcpy_dstclip);
+EXPORT_SYMBOL(drm_fb_memcpy_toio);
 
 /**
  * drm_fb_swab - Swap bytes into clip buffer
@@ -481,7 +485,8 @@ int drm_fb_blit_rect_dstclip(void __iomem *dst, unsigned int dst_pitch,
                dst_format = DRM_FORMAT_XRGB8888;
 
        if (dst_format == fb_format) {
-               drm_fb_memcpy_dstclip(dst, dst_pitch, vmap, fb, clip);
+               dst += clip_offset(clip, dst_pitch, fb->format->cpp[0]);
+               drm_fb_memcpy_toio(dst, dst_pitch, vmap, fb, clip);
                return 0;
 
        } else if (dst_format == DRM_FORMAT_RGB565) {

diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c
index 71b646c4131fcfaddf2b42ba70b849a44256da0a..c09df8b06c7a2ac8e2076665c939c821dea97ecc 100644 (file)
--- a/drivers/gpu/drm/drm_mipi_dbi.c
+++ b/drivers/gpu/drm/drm_mipi_dbi.c
@@ -213,7 +213,7 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
                if (swap)
                        drm_fb_swab(dst, src, fb, clip, !gem->import_attach);
                else
-                       drm_fb_memcpy(dst, src, fb, clip);
+                       drm_fb_memcpy(dst, 0, src, fb, clip);
                break;
        case DRM_FORMAT_XRGB8888:
                drm_fb_xrgb8888_to_rgb565(dst, src, fb, clip, swap);

diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c
index daf75c178c2b7a7d31ac4185f0e7308229a2572d..a92112ffd37a04ffb6110ef29efd0ea251147f24 100644 (file)
--- a/drivers/gpu/drm/gud/gud_pipe.c
+++ b/drivers/gpu/drm/gud/gud_pipe.c
@@ -206,7 +206,7 @@ retry:
                /* can compress directly from the framebuffer */
                buf = vaddr + rect->y1 * pitch;
        } else {
-               drm_fb_memcpy(buf, vaddr, fb, rect);
+               drm_fb_memcpy(buf, 0, vaddr, fb, rect);
        }
 
        memset(req, 0, sizeof(*req));

diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_modeset.c b/drivers/gpu/drm/hyperv/hyperv_drm_modeset.c
index 6dd4717d3e1eacd74be7e66e574052a02388ee69..b490c3d2286ec29b72e40c7f0e06495787823b86 100644 (file)
--- a/drivers/gpu/drm/hyperv/hyperv_drm_modeset.c
+++ b/drivers/gpu/drm/hyperv/hyperv_drm_modeset.c
@@ -23,13 +23,16 @@ static int hyperv_blit_to_vram_rect(struct drm_framebuffer *fb,
                                    struct drm_rect *rect)
 {
        struct hyperv_drm_device *hv = to_hv(fb->dev);
+       void __iomem *dst = hv->vram;
        void *vmap = map->vaddr; /* TODO: Use mapping abstraction properly */
        int idx;
 
        if (!drm_dev_enter(&hv->dev, &idx))
                return -ENODEV;
 
-       drm_fb_memcpy_dstclip(hv->vram, fb->pitches[0], vmap, fb, rect);
+       dst += drm_fb_clip_offset(fb->pitches[0], fb->format, rect);
+       drm_fb_memcpy_toio(dst, fb->pitches[0], vmap, fb, rect);
+
        drm_dev_exit(idx);
 
        return 0;

diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index fd98e8bbc550037b6840dc750f948cfabf5014d2..b983541a4c530e1d06e2483c2f1f99f683d2a925 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -847,9 +847,11 @@ static void
 mgag200_handle_damage(struct mga_device *mdev, struct drm_framebuffer *fb,
                      struct drm_rect *clip, const struct dma_buf_map *map)
 {
+       void __iomem *dst = mdev->vram;
        void *vmap = map->vaddr; /* TODO: Use mapping abstraction properly */
 
-       drm_fb_memcpy_dstclip(mdev->vram, fb->pitches[0], vmap, fb, clip);
+       dst += drm_fb_clip_offset(fb->pitches[0], fb->format, clip);
+       drm_fb_memcpy_toio(dst, fb->pitches[0], vmap, fb, clip);
 
        /* Always scanout image at VRAM offset 0 */
        mgag200_set_startadd(mdev, (u32)0);

diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c
index 4611ec408506ba16a4e49f06cad37682a7732d0a..5344e506e8a905215d062f22e8a92e60813df275 100644 (file)
--- a/drivers/gpu/drm/tiny/cirrus.c
+++ b/drivers/gpu/drm/tiny/cirrus.c
@@ -317,28 +317,30 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb, const struct dma_buf_
                               struct drm_rect *rect)
 {
        struct cirrus_device *cirrus = to_cirrus(fb->dev);
+       void __iomem *dst = cirrus->vram;
        void *vmap = map->vaddr; /* TODO: Use mapping abstraction properly */
        int idx;
 
        if (!drm_dev_enter(&cirrus->dev, &idx))
                return -ENODEV;
 
-       if (cirrus->cpp == fb->format->cpp[0])
-               drm_fb_memcpy_dstclip(cirrus->vram, fb->pitches[0],
-                                     vmap, fb, rect);
+       if (cirrus->cpp == fb->format->cpp[0]) {
+               dst += drm_fb_clip_offset(fb->pitches[0], fb->format, rect);
+               drm_fb_memcpy_toio(dst, fb->pitches[0], vmap, fb, rect);
 
-       else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2)
+       } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2) {
                drm_fb_xrgb8888_to_rgb565_dstclip(cirrus->vram,
                                                  cirrus->pitch,
                                                  vmap, fb, rect, false);
 
-       else if (fb->format->cpp[0] == 4 && cirrus->cpp == 3)
+       } else if (fb->format->cpp[0] == 4 && cirrus->cpp == 3) {
                drm_fb_xrgb8888_to_rgb888_dstclip(cirrus->vram,
                                                  cirrus->pitch,
                                                  vmap, fb, rect);
 
-       else
+       } else {
                WARN_ON_ONCE("cpp mismatch");
+       }
 
        drm_dev_exit(idx);
 

diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h
index f5a8b334b18d19c22a4013fb503e3ac8046e2cf4..1fc3ba7b606093643cf34d496202909c2f9d9f71 100644 (file)
--- a/include/drm/drm_format_helper.h
+++ b/include/drm/drm_format_helper.h
@@ -13,11 +13,10 @@ struct drm_rect;
 unsigned int drm_fb_clip_offset(unsigned int pitch, const struct drm_format_info *format,
                                const struct drm_rect *clip);
 
-void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb,
-                  struct drm_rect *clip);
-void drm_fb_memcpy_dstclip(void __iomem *dst, unsigned int dst_pitch, void *vaddr,
-                          struct drm_framebuffer *fb,
-                          struct drm_rect *clip);
+void drm_fb_memcpy(void *dst, unsigned int dst_pitch, const void *vaddr,
+                  const struct drm_framebuffer *fb, const struct drm_rect *clip);
+void drm_fb_memcpy_toio(void __iomem *dst, unsigned int dst_pitch, const void *vaddr,
+                       const struct drm_framebuffer *fb, const struct drm_rect *clip);
 void drm_fb_swab(void *dst, void *src, struct drm_framebuffer *fb,
                 struct drm_rect *clip, bool cached);
 void drm_fb_xrgb8888_to_rgb332(void *dst, void *vaddr, struct drm_framebuffer *fb,