Commit 27bd66dd authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Tested-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211110103702.374-3-tzimmermann@suse.de
parent 452290f3

drivers/gpu/drm/drm_format_helper.c

+20 −15
Original line number Diff line number Diff line
@@ -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) {

drivers/gpu/drm/drm_mipi_dbi.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/gud/gud_pipe.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb, 
		/* 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));

drivers/gpu/drm/hyperv/hyperv_drm_modeset.c

+4 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/mgag200/mgag200_mode.c

+3 −1
Original line number Diff line number Diff line
@@ -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);