Skip to content

L
linux
Commit 504a51d7 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files
Options

drm/format-helper: Rename parameter vmap to src 

Rename the parameter vmap to src in all functions. The parameter
contains the locations of the source data and the new name says that.

v3:
	* fix typo in commit message
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220808125406.20752-15-tzimmermann@suse.de
parent f241b064
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 62 deletions
drivers/gpu/drm/drm_format_helper.c
View file @ 504a51d7
...@@ -132,7 +132,7 @@ static int __drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, unsign ...@@ -132,7 +132,7 @@ static int __drm_fb_xfrm_toio(void __iomem *dst, unsigned long dst_pitch, unsign
/* TODO: Make this function work with multi-plane formats. */ /* TODO: Make this function work with multi-plane formats. */
static int drm_fb_xfrm(struct iosys_map *dst, static int drm_fb_xfrm(struct iosys_map *dst,
const unsigned int *dst_pitch, const u8 *dst_pixsize, const unsigned int *dst_pitch, const u8 *dst_pixsize,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip, bool vaddr_cached_hint, const struct drm_rect *clip, bool vaddr_cached_hint,
void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels)) void (*xfrm_line)(void *dbuf, const void *sbuf, unsigned int npixels))
{ {
...@@ -143,13 +143,13 @@ static int drm_fb_xfrm(struct iosys_map *dst, ...@@ -143,13 +143,13 @@ static int drm_fb_xfrm(struct iosys_map *dst,
if (!dst_pitch) if (!dst_pitch)
dst_pitch = default_dst_pitch; dst_pitch = default_dst_pitch;
/* TODO: handle vmap in I/O memory here */ /* TODO: handle src in I/O memory here */
if (dst[0].is_iomem) if (dst[0].is_iomem)
return __drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], dst_pixsize[0], return __drm_fb_xfrm_toio(dst[0].vaddr_iomem, dst_pitch[0], dst_pixsize[0],
vmap[0].vaddr, fb, clip, vaddr_cached_hint, xfrm_line); src[0].vaddr, fb, clip, vaddr_cached_hint, xfrm_line);
else else
return __drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], dst_pixsize[0], return __drm_fb_xfrm(dst[0].vaddr, dst_pitch[0], dst_pixsize[0],
vmap[0].vaddr, fb, clip, vaddr_cached_hint, xfrm_line); src[0].vaddr, fb, clip, vaddr_cached_hint, xfrm_line);
} }
/** /**
...@@ -157,13 +157,13 @@ static int drm_fb_xfrm(struct iosys_map *dst, ...@@ -157,13 +157,13 @@ static int drm_fb_xfrm(struct iosys_map *dst,
* @dst: Array of destination buffers * @dst: Array of destination buffers
* @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines * @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines
* within @dst; can be NULL if scanlines are stored next to each other. * within @dst; can be NULL if scanlines are stored next to each other.
* @vmap: Array of source buffers * @src: Array of source buffers
* @fb: DRM framebuffer * @fb: DRM framebuffer
* @clip: Clip rectangle area to copy * @clip: Clip rectangle area to copy
* *
* This function copies parts of a framebuffer to display memory. Destination and * This function copies parts of a framebuffer to display memory. Destination and
* framebuffer formats must match. No conversion takes place. The parameters @dst, * framebuffer formats must match. No conversion takes place. The parameters @dst,
* @dst_pitch and @vmap refer to arrays. Each array must have at least as many entries * @dst_pitch and @src refer to arrays. Each array must have at least as many entries
* as there are planes in @fb's format. Each entry stores the value for the format's * as there are planes in @fb's format. Each entry stores the value for the format's
* respective color plane at the same index. * respective color plane at the same index.
* *
...@@ -171,7 +171,7 @@ static int drm_fb_xfrm(struct iosys_map *dst, ...@@ -171,7 +171,7 @@ static int drm_fb_xfrm(struct iosys_map *dst,
* top-left corner). * top-left corner).
*/ */
void drm_fb_memcpy(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_memcpy(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip) const struct drm_rect *clip)
{ {
static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
...@@ -190,16 +190,16 @@ void drm_fb_memcpy(struct iosys_map *dst, const unsigned int *dst_pitch, ...@@ -190,16 +190,16 @@ void drm_fb_memcpy(struct iosys_map *dst, const unsigned int *dst_pitch,
size_t len_i = DIV_ROUND_UP(drm_rect_width(clip) * bpp_i, 8); size_t len_i = DIV_ROUND_UP(drm_rect_width(clip) * bpp_i, 8);
unsigned int dst_pitch_i = dst_pitch[i]; unsigned int dst_pitch_i = dst_pitch[i];
struct iosys_map dst_i = dst[i]; struct iosys_map dst_i = dst[i];
struct iosys_map vmap_i = vmap[i]; struct iosys_map src_i = src[i];
if (!dst_pitch_i) if (!dst_pitch_i)
dst_pitch_i = len_i; dst_pitch_i = len_i;
iosys_map_incr(&vmap_i, clip_offset(clip, fb->pitches[i], cpp_i)); iosys_map_incr(&src_i, clip_offset(clip, fb->pitches[i], cpp_i));
for (y = 0; y < lines; y++) { for (y = 0; y < lines; y++) {
/* TODO: handle vmap_i in I/O memory here */ /* TODO: handle src_i in I/O memory here */
iosys_map_memcpy_to(&dst_i, 0, vmap_i.vaddr, len_i); iosys_map_memcpy_to(&dst_i, 0, src_i.vaddr, len_i);
iosys_map_incr(&vmap_i, fb->pitches[i]); iosys_map_incr(&src_i, fb->pitches[i]);
iosys_map_incr(&dst_i, dst_pitch_i); iosys_map_incr(&dst_i, dst_pitch_i);
} }
} }
...@@ -231,14 +231,14 @@ static void drm_fb_swab32_line(void *dbuf, const void *sbuf, unsigned int pixels ...@@ -231,14 +231,14 @@ static void drm_fb_swab32_line(void *dbuf, const void *sbuf, unsigned int pixels
* @dst: Array of destination buffers * @dst: Array of destination buffers
* @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines * @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines
* within @dst; can be NULL if scanlines are stored next to each other. * within @dst; can be NULL if scanlines are stored next to each other.
* @vmap: Array of source buffers * @src: Array of source buffers
* @fb: DRM framebuffer * @fb: DRM framebuffer
* @clip: Clip rectangle area to copy * @clip: Clip rectangle area to copy
* @cached: Source buffer is mapped cached (eg. not write-combined) * @cached: Source buffer is mapped cached (eg. not write-combined)
* *
* This function copies parts of a framebuffer to display memory and swaps per-pixel * This function copies parts of a framebuffer to display memory and swaps per-pixel
* bytes during the process. Destination and framebuffer formats must match. The * bytes during the process. Destination and framebuffer formats must match. The
* parameters @dst, @dst_pitch and @vmap refer to arrays. Each array must have at * parameters @dst, @dst_pitch and @src refer to arrays. Each array must have at
* least as many entries as there are planes in @fb's format. Each entry stores the * least as many entries as there are planes in @fb's format. Each entry stores the
* value for the format's respective color plane at the same index. If @cached is * value for the format's respective color plane at the same index. If @cached is
* false a temporary buffer is used to cache one pixel line at a time to speed up * false a temporary buffer is used to cache one pixel line at a time to speed up
...@@ -248,7 +248,7 @@ static void drm_fb_swab32_line(void *dbuf, const void *sbuf, unsigned int pixels ...@@ -248,7 +248,7 @@ static void drm_fb_swab32_line(void *dbuf, const void *sbuf, unsigned int pixels
* top-left corner). * top-left corner).
*/ */
void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip, bool cached) const struct drm_rect *clip, bool cached)
{ {
const struct drm_format_info *format = fb->format; const struct drm_format_info *format = fb->format;
...@@ -268,7 +268,7 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch, ...@@ -268,7 +268,7 @@ void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch,
return; return;
} }
drm_fb_xfrm(dst, dst_pitch, &cpp, vmap, fb, clip, cached, swab_line); drm_fb_xfrm(dst, dst_pitch, &cpp, src, fb, clip, cached, swab_line);
} }
EXPORT_SYMBOL(drm_fb_swab); EXPORT_SYMBOL(drm_fb_swab);
...@@ -292,13 +292,13 @@ static void drm_fb_xrgb8888_to_rgb332_line(void *dbuf, const void *sbuf, unsigne ...@@ -292,13 +292,13 @@ static void drm_fb_xrgb8888_to_rgb332_line(void *dbuf, const void *sbuf, unsigne
* @dst: Array of RGB332 destination buffers * @dst: Array of RGB332 destination buffers
* @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines * @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines
* within @dst; can be NULL if scanlines are stored next to each other. * within @dst; can be NULL if scanlines are stored next to each other.
* @vmap: Array of XRGB8888 source buffers * @src: Array of XRGB8888 source buffers
* @fb: DRM framebuffer * @fb: DRM framebuffer
* @clip: Clip rectangle area to copy * @clip: Clip rectangle area to copy
* *
* This function copies parts of a framebuffer to display memory and converts the * This function copies parts of a framebuffer to display memory and converts the
* color format during the process. Destination and framebuffer formats must match. The * color format during the process. Destination and framebuffer formats must match. The
* parameters @dst, @dst_pitch and @vmap refer to arrays. Each array must have at * parameters @dst, @dst_pitch and @src refer to arrays. Each array must have at
* least as many entries as there are planes in @fb's format. Each entry stores the * least as many entries as there are planes in @fb's format. Each entry stores the
* value for the format's respective color plane at the same index. * value for the format's respective color plane at the same index.
* *
...@@ -308,14 +308,14 @@ static void drm_fb_xrgb8888_to_rgb332_line(void *dbuf, const void *sbuf, unsigne ...@@ -308,14 +308,14 @@ static void drm_fb_xrgb8888_to_rgb332_line(void *dbuf, const void *sbuf, unsigne
* Drivers can use this function for RGB332 devices that don't support XRGB8888 natively. * Drivers can use this function for RGB332 devices that don't support XRGB8888 natively.
*/ */
void drm_fb_xrgb8888_to_rgb332(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_xrgb8888_to_rgb332(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip) const struct drm_rect *clip)
{ {
static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = { static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = {
1, 1,
}; };
drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false, drm_fb_xfrm(dst, dst_pitch, dst_pixsize, src, fb, clip, false,
drm_fb_xrgb8888_to_rgb332_line); drm_fb_xrgb8888_to_rgb332_line);
} }
EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb332); EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb332);
...@@ -360,14 +360,14 @@ static void drm_fb_xrgb8888_to_rgb565_swab_line(void *dbuf, const void *sbuf, ...@@ -360,14 +360,14 @@ static void drm_fb_xrgb8888_to_rgb565_swab_line(void *dbuf, const void *sbuf,
* @dst: Array of RGB565 destination buffers * @dst: Array of RGB565 destination buffers
* @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines * @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines
* within @dst; can be NULL if scanlines are stored next to each other. * within @dst; can be NULL if scanlines are stored next to each other.
* @vmap: Array of XRGB8888 source buffer * @src: Array of XRGB8888 source buffer
* @fb: DRM framebuffer * @fb: DRM framebuffer
* @clip: Clip rectangle area to copy * @clip: Clip rectangle area to copy
* @swab: Swap bytes * @swab: Swap bytes
* *
* This function copies parts of a framebuffer to display memory and converts the * This function copies parts of a framebuffer to display memory and converts the
* color format during the process. Destination and framebuffer formats must match. The * color format during the process. Destination and framebuffer formats must match. The
* parameters @dst, @dst_pitch and @vmap refer to arrays. Each array must have at * parameters @dst, @dst_pitch and @src refer to arrays. Each array must have at
* least as many entries as there are planes in @fb's format. Each entry stores the * least as many entries as there are planes in @fb's format. Each entry stores the
* value for the format's respective color plane at the same index. * value for the format's respective color plane at the same index.
* *
...@@ -377,7 +377,7 @@ static void drm_fb_xrgb8888_to_rgb565_swab_line(void *dbuf, const void *sbuf, ...@@ -377,7 +377,7 @@ static void drm_fb_xrgb8888_to_rgb565_swab_line(void *dbuf, const void *sbuf,
* Drivers can use this function for RGB565 devices that don't support XRGB8888 natively. * Drivers can use this function for RGB565 devices that don't support XRGB8888 natively.
*/ */
void drm_fb_xrgb8888_to_rgb565(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_xrgb8888_to_rgb565(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip, bool swab) const struct drm_rect *clip, bool swab)
{ {
static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = { static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = {
...@@ -391,7 +391,7 @@ void drm_fb_xrgb8888_to_rgb565(struct iosys_map *dst, const unsigned int *dst_pi ...@@ -391,7 +391,7 @@ void drm_fb_xrgb8888_to_rgb565(struct iosys_map *dst, const unsigned int *dst_pi
else else
xfrm_line = drm_fb_xrgb8888_to_rgb565_line; xfrm_line = drm_fb_xrgb8888_to_rgb565_line;
drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false, xfrm_line); drm_fb_xfrm(dst, dst_pitch, dst_pixsize, src, fb, clip, false, xfrm_line);
} }
EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565); EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);
...@@ -415,13 +415,13 @@ static void drm_fb_xrgb8888_to_rgb888_line(void *dbuf, const void *sbuf, unsigne ...@@ -415,13 +415,13 @@ static void drm_fb_xrgb8888_to_rgb888_line(void *dbuf, const void *sbuf, unsigne
* @dst: Array of RGB888 destination buffers * @dst: Array of RGB888 destination buffers
* @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines * @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines
* within @dst; can be NULL if scanlines are stored next to each other. * within @dst; can be NULL if scanlines are stored next to each other.
* @vmap: Array of XRGB8888 source buffers * @src: Array of XRGB8888 source buffers
* @fb: DRM framebuffer * @fb: DRM framebuffer
* @clip: Clip rectangle area to copy * @clip: Clip rectangle area to copy
* *
* This function copies parts of a framebuffer to display memory and converts the * This function copies parts of a framebuffer to display memory and converts the
* color format during the process. Destination and framebuffer formats must match. The * color format during the process. Destination and framebuffer formats must match. The
* parameters @dst, @dst_pitch and @vmap refer to arrays. Each array must have at * parameters @dst, @dst_pitch and @src refer to arrays. Each array must have at
* least as many entries as there are planes in @fb's format. Each entry stores the * least as many entries as there are planes in @fb's format. Each entry stores the
* value for the format's respective color plane at the same index. * value for the format's respective color plane at the same index.
* *
...@@ -432,14 +432,14 @@ static void drm_fb_xrgb8888_to_rgb888_line(void *dbuf, const void *sbuf, unsigne ...@@ -432,14 +432,14 @@ static void drm_fb_xrgb8888_to_rgb888_line(void *dbuf, const void *sbuf, unsigne
* support XRGB8888. * support XRGB8888.
*/ */
void drm_fb_xrgb8888_to_rgb888(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_xrgb8888_to_rgb888(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip) const struct drm_rect *clip)
{ {
static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = { static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = {
3, 3,
}; };
drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false, drm_fb_xfrm(dst, dst_pitch, dst_pixsize, src, fb, clip, false,
drm_fb_xrgb8888_to_rgb888_line); drm_fb_xrgb8888_to_rgb888_line);
} }
EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb888); EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb888);
...@@ -463,7 +463,7 @@ static void drm_fb_rgb565_to_xrgb8888_line(void *dbuf, const void *sbuf, unsigne ...@@ -463,7 +463,7 @@ static void drm_fb_rgb565_to_xrgb8888_line(void *dbuf, const void *sbuf, unsigne
} }
static void drm_fb_rgb565_to_xrgb8888(struct iosys_map *dst, const unsigned int *dst_pitch, static void drm_fb_rgb565_to_xrgb8888(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct iosys_map *src,
const struct drm_framebuffer *fb, const struct drm_framebuffer *fb,
const struct drm_rect *clip) const struct drm_rect *clip)
{ {
...@@ -471,7 +471,7 @@ static void drm_fb_rgb565_to_xrgb8888(struct iosys_map *dst, const unsigned int ...@@ -471,7 +471,7 @@ static void drm_fb_rgb565_to_xrgb8888(struct iosys_map *dst, const unsigned int
4, 4,
}; };
drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false, drm_fb_xfrm(dst, dst_pitch, dst_pixsize, src, fb, clip, false,
drm_fb_rgb565_to_xrgb8888_line); drm_fb_rgb565_to_xrgb8888_line);
} }
...@@ -491,7 +491,7 @@ static void drm_fb_rgb888_to_xrgb8888_line(void *dbuf, const void *sbuf, unsigne ...@@ -491,7 +491,7 @@ static void drm_fb_rgb888_to_xrgb8888_line(void *dbuf, const void *sbuf, unsigne
} }
static void drm_fb_rgb888_to_xrgb8888(struct iosys_map *dst, const unsigned int *dst_pitch, static void drm_fb_rgb888_to_xrgb8888(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct iosys_map *src,
const struct drm_framebuffer *fb, const struct drm_framebuffer *fb,
const struct drm_rect *clip) const struct drm_rect *clip)
{ {
...@@ -499,7 +499,7 @@ static void drm_fb_rgb888_to_xrgb8888(struct iosys_map *dst, const unsigned int ...@@ -499,7 +499,7 @@ static void drm_fb_rgb888_to_xrgb8888(struct iosys_map *dst, const unsigned int
4, 4,
}; };
drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false, drm_fb_xfrm(dst, dst_pitch, dst_pixsize, src, fb, clip, false,
drm_fb_rgb888_to_xrgb8888_line); drm_fb_rgb888_to_xrgb8888_line);
} }
...@@ -526,13 +526,13 @@ static void drm_fb_xrgb8888_to_xrgb2101010_line(void *dbuf, const void *sbuf, un ...@@ -526,13 +526,13 @@ static void drm_fb_xrgb8888_to_xrgb2101010_line(void *dbuf, const void *sbuf, un
* @dst: Array of XRGB2101010 destination buffers * @dst: Array of XRGB2101010 destination buffers
* @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines * @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines
* within @dst; can be NULL if scanlines are stored next to each other. * within @dst; can be NULL if scanlines are stored next to each other.
* @vmap: Array of XRGB8888 source buffers * @src: Array of XRGB8888 source buffers
* @fb: DRM framebuffer * @fb: DRM framebuffer
* @clip: Clip rectangle area to copy * @clip: Clip rectangle area to copy
* *
* This function copies parts of a framebuffer to display memory and converts the * This function copies parts of a framebuffer to display memory and converts the
* color format during the process. Destination and framebuffer formats must match. The * color format during the process. Destination and framebuffer formats must match. The
* parameters @dst, @dst_pitch and @vmap refer to arrays. Each array must have at * parameters @dst, @dst_pitch and @src refer to arrays. Each array must have at
* least as many entries as there are planes in @fb's format. Each entry stores the * least as many entries as there are planes in @fb's format. Each entry stores the
* value for the format's respective color plane at the same index. * value for the format's respective color plane at the same index.
* *
...@@ -543,14 +543,14 @@ static void drm_fb_xrgb8888_to_xrgb2101010_line(void *dbuf, const void *sbuf, un ...@@ -543,14 +543,14 @@ static void drm_fb_xrgb8888_to_xrgb2101010_line(void *dbuf, const void *sbuf, un
* natively. * natively.
*/ */
void drm_fb_xrgb8888_to_xrgb2101010(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_xrgb8888_to_xrgb2101010(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip) const struct drm_rect *clip)
{ {
static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = { static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = {
4, 4,
}; };
drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false, drm_fb_xfrm(dst, dst_pitch, dst_pixsize, src, fb, clip, false,
drm_fb_xrgb8888_to_xrgb2101010_line); drm_fb_xrgb8888_to_xrgb2101010_line);
} }
...@@ -576,13 +576,13 @@ static void drm_fb_xrgb8888_to_gray8_line(void *dbuf, const void *sbuf, unsigned ...@@ -576,13 +576,13 @@ static void drm_fb_xrgb8888_to_gray8_line(void *dbuf, const void *sbuf, unsigned
* @dst: Array of 8-bit grayscale destination buffers * @dst: Array of 8-bit grayscale destination buffers
* @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines * @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines
* within @dst; can be NULL if scanlines are stored next to each other. * within @dst; can be NULL if scanlines are stored next to each other.
* @vmap: Array of XRGB8888 source buffers * @src: Array of XRGB8888 source buffers
* @fb: DRM framebuffer * @fb: DRM framebuffer
* @clip: Clip rectangle area to copy * @clip: Clip rectangle area to copy
* *
* This function copies parts of a framebuffer to display memory and converts the * This function copies parts of a framebuffer to display memory and converts the
* color format during the process. Destination and framebuffer formats must match. The * color format during the process. Destination and framebuffer formats must match. The
* parameters @dst, @dst_pitch and @vmap refer to arrays. Each array must have at * parameters @dst, @dst_pitch and @src refer to arrays. Each array must have at
* least as many entries as there are planes in @fb's format. Each entry stores the * least as many entries as there are planes in @fb's format. Each entry stores the
* value for the format's respective color plane at the same index. * value for the format's respective color plane at the same index.
* *
...@@ -597,14 +597,14 @@ static void drm_fb_xrgb8888_to_gray8_line(void *dbuf, const void *sbuf, unsigned ...@@ -597,14 +597,14 @@ static void drm_fb_xrgb8888_to_gray8_line(void *dbuf, const void *sbuf, unsigned
* ITU BT.601 is being used for the RGB -> luma (brightness) conversion. * ITU BT.601 is being used for the RGB -> luma (brightness) conversion.
*/ */
void drm_fb_xrgb8888_to_gray8(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_xrgb8888_to_gray8(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip) const struct drm_rect *clip)
{ {
static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = { static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = {
1, 1,
}; };
drm_fb_xfrm(dst, dst_pitch, dst_pixsize, vmap, fb, clip, false, drm_fb_xfrm(dst, dst_pitch, dst_pixsize, src, fb, clip, false,
drm_fb_xrgb8888_to_gray8_line); drm_fb_xrgb8888_to_gray8_line);
} }
EXPORT_SYMBOL(drm_fb_xrgb8888_to_gray8); EXPORT_SYMBOL(drm_fb_xrgb8888_to_gray8);
...@@ -615,14 +615,14 @@ EXPORT_SYMBOL(drm_fb_xrgb8888_to_gray8); ...@@ -615,14 +615,14 @@ EXPORT_SYMBOL(drm_fb_xrgb8888_to_gray8);
* @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines * @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines
* within @dst; can be NULL if scanlines are stored next to each other. * within @dst; can be NULL if scanlines are stored next to each other.
* @dst_format: FOURCC code of the display's color format * @dst_format: FOURCC code of the display's color format
* @vmap: The framebuffer memory to copy from * @src: The framebuffer memory to copy from
* @fb: The framebuffer to copy from * @fb: The framebuffer to copy from
* @clip: Clip rectangle area to copy * @clip: Clip rectangle area to copy
* *
* This function copies parts of a framebuffer to display memory. If the * This function copies parts of a framebuffer to display memory. If the
* formats of the display and the framebuffer mismatch, the blit function * formats of the display and the framebuffer mismatch, the blit function
* will attempt to convert between them during the process. The parameters @dst, * will attempt to convert between them during the process. The parameters @dst,
* @dst_pitch and @vmap refer to arrays. Each array must have at least as many * @dst_pitch and @src refer to arrays. Each array must have at least as many
* entries as there are planes in @dst_format's format. Each entry stores the * entries as there are planes in @dst_format's format. Each entry stores the
* value for the format's respective color plane at the same index. * value for the format's respective color plane at the same index.
* *
...@@ -635,7 +635,7 @@ EXPORT_SYMBOL(drm_fb_xrgb8888_to_gray8); ...@@ -635,7 +635,7 @@ EXPORT_SYMBOL(drm_fb_xrgb8888_to_gray8);
* a negative error code otherwise. * a negative error code otherwise.
*/ */
int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t dst_format, int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t dst_format,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip) const struct drm_rect *clip)
{ {
uint32_t fb_format = fb->format->format; uint32_t fb_format = fb->format->format;
...@@ -651,30 +651,30 @@ int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t d ...@@ -651,30 +651,30 @@ int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t d
dst_format = DRM_FORMAT_XRGB2101010; dst_format = DRM_FORMAT_XRGB2101010;
if (dst_format == fb_format) { if (dst_format == fb_format) {
drm_fb_memcpy(dst, dst_pitch, vmap, fb, clip); drm_fb_memcpy(dst, dst_pitch, src, fb, clip);
return 0; return 0;
} else if (dst_format == DRM_FORMAT_RGB565) { } else if (dst_format == DRM_FORMAT_RGB565) {
if (fb_format == DRM_FORMAT_XRGB8888) { if (fb_format == DRM_FORMAT_XRGB8888) {
drm_fb_xrgb8888_to_rgb565(dst, dst_pitch, vmap, fb, clip, false); drm_fb_xrgb8888_to_rgb565(dst, dst_pitch, src, fb, clip, false);
return 0; return 0;
} }
} else if (dst_format == DRM_FORMAT_RGB888) { } else if (dst_format == DRM_FORMAT_RGB888) {
if (fb_format == DRM_FORMAT_XRGB8888) { if (fb_format == DRM_FORMAT_XRGB8888) {
drm_fb_xrgb8888_to_rgb888(dst, dst_pitch, vmap, fb, clip); drm_fb_xrgb8888_to_rgb888(dst, dst_pitch, src, fb, clip);
return 0; return 0;
} }
} else if (dst_format == DRM_FORMAT_XRGB8888) { } else if (dst_format == DRM_FORMAT_XRGB8888) {
if (fb_format == DRM_FORMAT_RGB888) { if (fb_format == DRM_FORMAT_RGB888) {
drm_fb_rgb888_to_xrgb8888(dst, dst_pitch, vmap, fb, clip); drm_fb_rgb888_to_xrgb8888(dst, dst_pitch, src, fb, clip);
return 0; return 0;
} else if (fb_format == DRM_FORMAT_RGB565) { } else if (fb_format == DRM_FORMAT_RGB565) {
drm_fb_rgb565_to_xrgb8888(dst, dst_pitch, vmap, fb, clip); drm_fb_rgb565_to_xrgb8888(dst, dst_pitch, src, fb, clip);
return 0; return 0;
} }
} else if (dst_format == DRM_FORMAT_XRGB2101010) { } else if (dst_format == DRM_FORMAT_XRGB2101010) {
if (fb_format == DRM_FORMAT_XRGB8888) { if (fb_format == DRM_FORMAT_XRGB8888) {
drm_fb_xrgb8888_to_xrgb2101010(dst, dst_pitch, vmap, fb, clip); drm_fb_xrgb8888_to_xrgb2101010(dst, dst_pitch, src, fb, clip);
return 0; return 0;
} }
} }
...@@ -708,13 +708,13 @@ static void drm_fb_gray8_to_mono_line(void *dbuf, const void *sbuf, unsigned int ...@@ -708,13 +708,13 @@ static void drm_fb_gray8_to_mono_line(void *dbuf, const void *sbuf, unsigned int
* @dst: Array of monochrome destination buffers (0=black, 1=white) * @dst: Array of monochrome destination buffers (0=black, 1=white)
* @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines * @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines
* within @dst; can be NULL if scanlines are stored next to each other. * within @dst; can be NULL if scanlines are stored next to each other.
* @vmap: Array of XRGB8888 source buffers * @src: Array of XRGB8888 source buffers
* @fb: DRM framebuffer * @fb: DRM framebuffer
* @clip: Clip rectangle area to copy * @clip: Clip rectangle area to copy
* *
* This function copies parts of a framebuffer to display memory and converts the * This function copies parts of a framebuffer to display memory and converts the
* color format during the process. Destination and framebuffer formats must match. The * color format during the process. Destination and framebuffer formats must match. The
* parameters @dst, @dst_pitch and @vmap refer to arrays. Each array must have at * parameters @dst, @dst_pitch and @src refer to arrays. Each array must have at
* least as many entries as there are planes in @fb's format. Each entry stores the * least as many entries as there are planes in @fb's format. Each entry stores the
* value for the format's respective color plane at the same index. * value for the format's respective color plane at the same index.
* *
...@@ -734,7 +734,7 @@ static void drm_fb_gray8_to_mono_line(void *dbuf, const void *sbuf, unsigned int ...@@ -734,7 +734,7 @@ static void drm_fb_gray8_to_mono_line(void *dbuf, const void *sbuf, unsigned int
* then the result is converted from grayscale to monochrome. * then the result is converted from grayscale to monochrome.
*/ */
void drm_fb_xrgb8888_to_mono(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_xrgb8888_to_mono(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip) const struct drm_rect *clip)
{ {
static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = { static const unsigned int default_dst_pitch[DRM_FORMAT_MAX_PLANES] = {
...@@ -745,7 +745,7 @@ void drm_fb_xrgb8888_to_mono(struct iosys_map *dst, const unsigned int *dst_pitc ...@@ -745,7 +745,7 @@ void drm_fb_xrgb8888_to_mono(struct iosys_map *dst, const unsigned int *dst_pitc
unsigned int cpp = fb->format->cpp[0]; unsigned int cpp = fb->format->cpp[0];
unsigned int len_src32 = linepixels * cpp; unsigned int len_src32 = linepixels * cpp;
struct drm_device *dev = fb->dev; struct drm_device *dev = fb->dev;
void *vaddr = vmap[0].vaddr; void *vaddr = src[0].vaddr;
unsigned int dst_pitch_0; unsigned int dst_pitch_0;
unsigned int y; unsigned int y;
u8 *mono = dst[0].vaddr, *gray8; u8 *mono = dst[0].vaddr, *gray8;
......
include/drm/drm_format_helper.h
View file @ 504a51d7
...@@ -15,33 +15,33 @@ unsigned int drm_fb_clip_offset(unsigned int pitch, const struct drm_format_info ...@@ -15,33 +15,33 @@ unsigned int drm_fb_clip_offset(unsigned int pitch, const struct drm_format_info
const struct drm_rect *clip); const struct drm_rect *clip);
void drm_fb_memcpy(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_memcpy(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip); const struct drm_rect *clip);
void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_swab(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip, bool cached); const struct drm_rect *clip, bool cached);
void drm_fb_xrgb8888_to_rgb332(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_xrgb8888_to_rgb332(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip); const struct drm_rect *clip);
void drm_fb_xrgb8888_to_rgb565(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_xrgb8888_to_rgb565(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip, bool swab); const struct drm_rect *clip, bool swab);
void drm_fb_xrgb8888_to_rgb888(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_xrgb8888_to_rgb888(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip); const struct drm_rect *clip);
void drm_fb_xrgb8888_to_xrgb2101010(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_xrgb8888_to_xrgb2101010(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip); const struct drm_rect *clip);
void drm_fb_xrgb8888_to_gray8(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_xrgb8888_to_gray8(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip); const struct drm_rect *clip);
int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t dst_format, int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t dst_format,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *rect); const struct drm_rect *rect);
void drm_fb_xrgb8888_to_mono(struct iosys_map *dst, const unsigned int *dst_pitch, void drm_fb_xrgb8888_to_mono(struct iosys_map *dst, const unsigned int *dst_pitch,
const struct iosys_map *vmap, const struct drm_framebuffer *fb, const struct iosys_map *src, const struct drm_framebuffer *fb,
const struct drm_rect *clip); const struct drm_rect *clip);
#endif /* __LINUX_DRM_FORMAT_HELPER_H */ #endif /* __LINUX_DRM_FORMAT_HELPER_H */
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7