| Message ID | 20190404152430.8263-2-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/cirrus: rewrite and modernize driver. | expand |
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>
Den 04.04.2019 17.24, skrev Gerd Hoffmann: > 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 +++++++++++++++++++ drm_fb_helper.c is for fbdev code so not a good place for this code, and it's MIT licensed as well. Daniel have in two rounds suggested a new drm_framebuffer_helper.c or drm_format_helper.c as possible destinations for these functions. Noralf.
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) +{ + unsigned int cpp = drm_format_plane_cpp(fb->format->format, 0); + unsigned int pitch = fb->pitches[0]; + void *src = vaddr + (clip->y1 * pitch) + (clip->x1 * cpp); + size_t len = (clip->x2 - clip->x1) * cpp; + unsigned int y; + + for (y = clip->y1; y < clip->y2; y++) { + memcpy(dst, src, len); + src += pitch; + dst += len; + } +} +EXPORT_SYMBOL(drm_fb_memcpy); diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c index d7b38dfb6438..f5c6f35e6161 100644 --- a/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c @@ -26,30 +26,6 @@ static unsigned int spi_max; module_param(spi_max, uint, 0400); MODULE_PARM_DESC(spi_max, "Set a lower SPI max transfer size"); -/** - * tinydrm_memcpy - Copy clip buffer - * @dst: Destination buffer - * @vaddr: Source buffer - * @fb: DRM framebuffer - * @clip: Clip rectangle area to copy - */ -void tinydrm_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb, - struct drm_rect *clip) -{ - unsigned int cpp = drm_format_plane_cpp(fb->format->format, 0); - unsigned int pitch = fb->pitches[0]; - void *src = vaddr + (clip->y1 * pitch) + (clip->x1 * cpp); - size_t len = (clip->x2 - clip->x1) * cpp; - unsigned int y; - - for (y = clip->y1; y < clip->y2; y++) { - memcpy(dst, src, len); - src += pitch; - dst += len; - } -} -EXPORT_SYMBOL(tinydrm_memcpy); - /** * tinydrm_swab16 - Swap bytes into clip buffer * @dst: RGB565 destination buffer diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c index 869c8f56da3b..fb7e4582e293 100644 --- a/drivers/gpu/drm/tinydrm/mipi-dbi.c +++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c @@ -19,6 +19,7 @@ #include <drm/drm_damage_helper.h> #include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_fourcc.h> @@ -220,7 +221,7 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb, if (swap) tinydrm_swab16(dst, src, fb, clip); else - tinydrm_memcpy(dst, src, fb, clip); + drm_fb_memcpy(dst, src, fb, clip); break; case DRM_FORMAT_XRGB8888: tinydrm_xrgb8888_to_rgb565(dst, src, fb, clip, swap);
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(-)