Commit 3e3543c8 authored by Thomas Zimmermann's avatar Thomas Zimmermann

drm/format-helper: Add destination-buffer pitch to drm_fb_swab()

Add destination-buffer pitch as argument to drm_fb_swab(). Done for
consistency with the rest of the interface.

v2:
	* update documentation (Noralf)
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-4-tzimmermann@suse.de
parent 27bd66dd
...@@ -101,6 +101,7 @@ EXPORT_SYMBOL(drm_fb_memcpy_toio); ...@@ -101,6 +101,7 @@ EXPORT_SYMBOL(drm_fb_memcpy_toio);
/** /**
* drm_fb_swab - Swap bytes into clip buffer * drm_fb_swab - Swap bytes into clip buffer
* @dst: Destination buffer * @dst: Destination buffer
* @dst_pitch: Number of bytes between two consecutive scanlines within dst
* @src: Source buffer * @src: Source buffer
* @fb: DRM framebuffer * @fb: DRM framebuffer
* @clip: Clip rectangle area to copy * @clip: Clip rectangle area to copy
...@@ -110,21 +111,27 @@ EXPORT_SYMBOL(drm_fb_memcpy_toio); ...@@ -110,21 +111,27 @@ EXPORT_SYMBOL(drm_fb_memcpy_toio);
* time to speed up slow uncached reads. * time to speed up slow uncached reads.
* *
* This function does not apply clipping on dst, i.e. the destination * 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_swab(void *dst, void *src, struct drm_framebuffer *fb, void drm_fb_swab(void *dst, unsigned int dst_pitch, const void *src,
struct drm_rect *clip, bool cached) const struct drm_framebuffer *fb, const struct drm_rect *clip,
bool cached)
{ {
u8 cpp = fb->format->cpp[0]; u8 cpp = fb->format->cpp[0];
size_t len = drm_rect_width(clip) * cpp; size_t len = drm_rect_width(clip) * cpp;
u16 *src16, *dst16 = dst; const u16 *src16;
u32 *src32, *dst32 = dst; const u32 *src32;
u16 *dst16;
u32 *dst32;
unsigned int x, y; unsigned int x, y;
void *buf = NULL; void *buf = NULL;
if (WARN_ON_ONCE(cpp != 2 && cpp != 4)) if (WARN_ON_ONCE(cpp != 2 && cpp != 4))
return; return;
if (!dst_pitch)
dst_pitch = len;
if (!cached) if (!cached)
buf = kmalloc(len, GFP_KERNEL); buf = kmalloc(len, GFP_KERNEL);
...@@ -140,6 +147,9 @@ void drm_fb_swab(void *dst, void *src, struct drm_framebuffer *fb, ...@@ -140,6 +147,9 @@ void drm_fb_swab(void *dst, void *src, struct drm_framebuffer *fb,
src32 = src; src32 = src;
} }
dst16 = dst;
dst32 = dst;
for (x = clip->x1; x < clip->x2; x++) { for (x = clip->x1; x < clip->x2; x++) {
if (cpp == 4) if (cpp == 4)
*dst32++ = swab32(*src32++); *dst32++ = swab32(*src32++);
...@@ -148,6 +158,7 @@ void drm_fb_swab(void *dst, void *src, struct drm_framebuffer *fb, ...@@ -148,6 +158,7 @@ void drm_fb_swab(void *dst, void *src, struct drm_framebuffer *fb,
} }
src += fb->pitches[0]; src += fb->pitches[0];
dst += dst_pitch;
} }
kfree(buf); kfree(buf);
......
...@@ -211,7 +211,7 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb, ...@@ -211,7 +211,7 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
switch (fb->format->format) { switch (fb->format->format) {
case DRM_FORMAT_RGB565: case DRM_FORMAT_RGB565:
if (swap) if (swap)
drm_fb_swab(dst, src, fb, clip, !gem->import_attach); drm_fb_swab(dst, 0, src, fb, clip, !gem->import_attach);
else else
drm_fb_memcpy(dst, 0, src, fb, clip); drm_fb_memcpy(dst, 0, src, fb, clip);
break; break;
......
...@@ -201,7 +201,7 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb, ...@@ -201,7 +201,7 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb,
len = gud_xrgb8888_to_color(buf, format, vaddr, fb, rect); len = gud_xrgb8888_to_color(buf, format, vaddr, fb, rect);
} }
} else if (gud_is_big_endian() && format->cpp[0] > 1) { } else if (gud_is_big_endian() && format->cpp[0] > 1) {
drm_fb_swab(buf, vaddr, fb, rect, !import_attach); drm_fb_swab(buf, 0, vaddr, fb, rect, !import_attach);
} else if (compression && !import_attach && pitch == fb->pitches[0]) { } else if (compression && !import_attach && pitch == fb->pitches[0]) {
/* can compress directly from the framebuffer */ /* can compress directly from the framebuffer */
buf = vaddr + rect->y1 * pitch; buf = vaddr + rect->y1 * pitch;
......
...@@ -17,8 +17,9 @@ void drm_fb_memcpy(void *dst, unsigned int dst_pitch, const void *vaddr, ...@@ -17,8 +17,9 @@ void drm_fb_memcpy(void *dst, unsigned int dst_pitch, const void *vaddr,
const struct drm_framebuffer *fb, const struct drm_rect *clip); 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, 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); const struct drm_framebuffer *fb, const struct drm_rect *clip);
void drm_fb_swab(void *dst, void *src, struct drm_framebuffer *fb, void drm_fb_swab(void *dst, unsigned int dst_pitch, const void *src,
struct drm_rect *clip, bool cached); const struct drm_framebuffer *fb, const struct drm_rect *clip,
bool cached);
void drm_fb_xrgb8888_to_rgb332(void *dst, void *vaddr, struct drm_framebuffer *fb, void drm_fb_xrgb8888_to_rgb332(void *dst, void *vaddr, struct drm_framebuffer *fb,
struct drm_rect *clip); struct drm_rect *clip);
void drm_fb_xrgb8888_to_rgb565(void *dst, void *vaddr, void drm_fb_xrgb8888_to_rgb565(void *dst, void *vaddr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment