leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm: switch drm_fb_memcpy_dstclip to accept __iomem dst

Browse Source 
Not all archs have the __io_virt() macro, so cirrus can't simply convert
pointers that way.  The drm format helpers have to use memcpy_toio()
instead.

This patch makes drm_fb_memcpy_dstclip() accept a __iomem dst pointer
and use memcpy_toio() instead of memcpy().  With that separating out the
memcpy loop into the drm_fb_memcpy_lines() helper isn't useful any more,
so move the code back into the calling functins.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20190410063815.17062-2-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2019-04-10 08:38:13 +02:00
parent 80bb8d9832
commit bf4f6d16c8
3 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/cirrus/cirrus.c
View File

@ -307,7 +307,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb,
return -ENOMEM; return -ENOMEM;
if (cirrus->cpp == fb->format->cpp[0]) if (cirrus->cpp == fb->format->cpp[0])
drm_fb_memcpy_dstclip(__io_virt(cirrus->vram), drm_fb_memcpy_dstclip(cirrus->vram,
vmap, fb, rect); vmap, fb, rect);
else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2) else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2)

45
drivers/gpu/drm/drm_format_helper.c
View File

@ -10,23 +10,17 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/io.h>
#include <drm/drm_format_helper.h> #include <drm/drm_format_helper.h>
#include <drm/drm_framebuffer.h> #include <drm/drm_framebuffer.h>
#include <drm/drm_fourcc.h> #include <drm/drm_fourcc.h>
#include <drm/drm_rect.h> #include <drm/drm_rect.h>
static void drm_fb_memcpy_lines(void *dst, unsigned int dst_pitch, static unsigned int clip_offset(struct drm_rect *clip,
void *src, unsigned int src_pitch, unsigned int pitch, unsigned int cpp)
unsigned int linelength, unsigned int lines)
{ {
int line; return clip->y1 * pitch + clip->x1 * cpp;
for (line = 0; line < lines; line++) {
memcpy(dst, src, linelength);
src += src_pitch;
dst += dst_pitch;
}
} }
/** /**
@ -43,35 +37,44 @@ void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb,
struct drm_rect *clip) struct drm_rect *clip)
{ {
unsigned int cpp = drm_format_plane_cpp(fb->format->format, 0); 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; size_t len = (clip->x2 - clip->x1) * cpp;
unsigned int y, lines = clip->y2 - clip->y1;
drm_fb_memcpy_lines(dst, len, vaddr += clip_offset(clip, fb->pitches[0], cpp);
vaddr + offset, fb->pitches[0], for (y = 0; y < lines; y++) {
len, clip->y2 - clip->y1); memcpy(dst, vaddr, len);
vaddr += fb->pitches[0];
dst += len;
}
} }
EXPORT_SYMBOL(drm_fb_memcpy); EXPORT_SYMBOL(drm_fb_memcpy);
/** /**
* drm_fb_memcpy_dstclip - Copy clip buffer * drm_fb_memcpy_dstclip - Copy clip buffer
* @dst: Destination buffer * @dst: Destination buffer (iomem)
* @vaddr: Source buffer * @vaddr: Source buffer
* @fb: DRM framebuffer * @fb: DRM framebuffer
* @clip: Clip rectangle area to copy * @clip: Clip rectangle area to copy
* *
* This function applies clipping on dst, i.e. the destination is a * This function applies clipping on dst, i.e. the destination is a
* full framebuffer but only the clip rect content is copied over. * full (iomem) framebuffer but only the clip rect content is copied over.
*/ */
void drm_fb_memcpy_dstclip(void *dst, void *vaddr, struct drm_framebuffer *fb, void drm_fb_memcpy_dstclip(void __iomem *dst, void *vaddr,
struct drm_framebuffer *fb,
struct drm_rect *clip) struct drm_rect *clip)
{ {
unsigned int cpp = drm_format_plane_cpp(fb->format->format, 0); unsigned int cpp = drm_format_plane_cpp(fb->format->format, 0);
unsigned int offset = (clip->y1 * fb->pitches[0]) + (clip->x1 * cpp); unsigned int offset = clip_offset(clip, fb->pitches[0], cpp);
size_t len = (clip->x2 - clip->x1) * cpp; size_t len = (clip->x2 - clip->x1) * cpp;
unsigned int y, lines = clip->y2 - clip->y1;
drm_fb_memcpy_lines(dst + offset, fb->pitches[0], vaddr += offset;
vaddr + offset, fb->pitches[0], dst += offset;
len, clip->y2 - clip->y1); for (y = 0; y < lines; y++) {
memcpy_toio(dst, vaddr, len);
vaddr += fb->pitches[0];
dst += fb->pitches[0];
}
} }
EXPORT_SYMBOL(drm_fb_memcpy_dstclip); EXPORT_SYMBOL(drm_fb_memcpy_dstclip);

3
include/drm/drm_format_helper.h
View File

@ -15,7 +15,8 @@ struct drm_rect;
void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb, void drm_fb_memcpy(void *dst, void *vaddr, struct drm_framebuffer *fb,
struct drm_rect *clip); struct drm_rect *clip);
void drm_fb_memcpy_dstclip(void *dst, void *vaddr, struct drm_framebuffer *fb, void drm_fb_memcpy_dstclip(void __iomem *dst, void *vaddr,
struct drm_framebuffer *fb,
struct drm_rect *clip); struct drm_rect *clip);
void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb, void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb,
struct drm_rect *clip); struct drm_rect *clip);