Commit 26f024f5 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm: add drm_fb_memcpy_dstclip() helper 



It is a drm_fb_memcpy() variant which checks the clip rectangle for the
destination too.

Common code between drm_fb_memcpy() and drm_fb_memcpy_dstclip() was
factored out into the drm_fb_memcpy_lines() helper function.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190405095219.9231-3-kraxel@redhat.com
parent 7415287e

drivers/gpu/drm/drm_format_helper.c

+43 −8
Original line number Diff line number Diff line
@@ -16,30 +16,65 @@ 
#include <drm/drm_fourcc.h>

#include <drm/drm_rect.h>



static void drm_fb_memcpy_lines(void *dst, unsigned int dst_pitch,

				void *src, unsigned int src_pitch,

				unsigned int linelength, unsigned int lines)

{

	int line;



	for (line = 0; line < lines; line++) {

		memcpy(dst, src, linelength);

		src += src_pitch;

		dst += dst_pitch;

	}

}



/**

 * drm_fb_memcpy - Copy clip buffer

 * @dst: Destination buffer

 * @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.

 */

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);

	unsigned int offset = (clip->y1 * fb->pitches[0]) + (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;

	}

	drm_fb_memcpy_lines(dst, len,

			    vaddr + offset, fb->pitches[0],

			    len, clip->y2 - clip->y1);

}

EXPORT_SYMBOL(drm_fb_memcpy);



/**

 * drm_fb_memcpy_dstclip - Copy clip buffer

 * @dst: Destination buffer

 * @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 framebuffer but only the clip rect content is copied over.

 */

void drm_fb_memcpy_dstclip(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 offset = (clip->y1 * fb->pitches[0]) + (clip->x1 * cpp);

	size_t len = (clip->x2 - clip->x1) * cpp;



	drm_fb_memcpy_lines(dst + offset, fb->pitches[0],

			    vaddr + offset, fb->pitches[0],

			    len, clip->y2 - clip->y1);

}

EXPORT_SYMBOL(drm_fb_memcpy_dstclip);



/**

 * drm_fb_swab16 - Swap bytes into clip buffer

 * @dst: RGB565 destination buffer

include/drm/drm_format_helper.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ struct drm_rect; 


void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb,

		   struct drm_rect *clip);

void drm_fb_memcpy_dstclip(void *dst, void *vaddr, struct drm_framebuffer *fb,

			   struct drm_rect *clip);

void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb,

		   struct drm_rect *clip);

void drm_fb_xrgb8888_to_rgb565(u16 *dst, void *vaddr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE