Hi Gerd.
On Thu, Apr 04, 2019 at 05:24:25PM +0200, Gerd Hoffmann wrote:
Also rename to drm_fb_memcpy(). Pure code motion, no functional change.
Signed-off-by: Gerd Hoffmann kraxel@redhat.com
include/drm/drm_fb_helper.h | 3 +++ include/drm/tinydrm/tinydrm-helpers.h | 2 -- drivers/gpu/drm/drm_fb_helper.c | 25 +++++++++++++++++++ .../gpu/drm/tinydrm/core/tinydrm-helpers.c | 24 ------------------ drivers/gpu/drm/tinydrm/mipi-dbi.c | 3 ++- 5 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 81ae48a0df48..696017b38add 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -642,4 +642,7 @@ drm_fb_helper_remove_conflicting_pci_framebuffers(struct pci_dev *pdev, #endif }
+void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb,
struct drm_rect *clip);#endif diff --git a/include/drm/tinydrm/tinydrm-helpers.h b/include/drm/tinydrm/tinydrm-helpers.h index ae4a6abc43b5..591ca83330c4 100644 --- a/include/drm/tinydrm/tinydrm-helpers.h +++ b/include/drm/tinydrm/tinydrm-helpers.h @@ -46,8 +46,6 @@ int tinydrm_display_pipe_init(struct drm_device *drm, const struct drm_display_mode *mode, unsigned int rotation);
-void tinydrm_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb,
struct drm_rect *clip);void tinydrm_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb, struct drm_rect *clip); void tinydrm_xrgb8888_to_rgb565(u16 *dst, void *vaddr, diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 03749a24e4dd..22d29834bbe9 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -3353,3 +3353,28 @@ int __init drm_fb_helper_modinit(void) return 0; } EXPORT_SYMBOL(drm_fb_helper_modinit);
+/**
- drm_fb_memcpy - Copy clip buffer
- @dst: Destination buffer
- @vaddr: Source buffer
- @fb: DRM framebuffer
- @clip: Clip rectangle area to copy
- @dstclip: Clip destination too.
- */
+void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb,
struct drm_rect *clip)
Function has no parameter named @dstclip.
With this fixed: Reviewed-by: Sam Ravnborg sam@ravnborg.org