drm: fix cirrus build failure on powerpc
Subsystems (3)
v2 cover drm: fix cirrus build failure on powerpc
Turned out to be a bit more difficuilt than just adding the "asm/io.h" header files. Not all architectures actually have a __io_virt() macro, so cirrus can't depend on that. The drm format helpers have to call memcpy_toio instead. So this little series add support for that.
v2: drop the drm_format_convert abstraction, its overkill (Noralf Trønnes)
Gerd Hoffmann (3):
drm: switch drm_fb_memcpy_dstclip to accept __iomem dst
drm: switch drm_fb_xrgb8888_to_rgb565_dstclip to accept __iomem dst
drm: switch drm_fb_xrgb8888_to_rgb888_dstclip to accept __iomem dst
include/drm/drm_format_helper.h | 7 +- drivers/gpu/drm/cirrus/cirrus.c | 6 +- drivers/gpu/drm/drm_format_helper.c | 215 ++++++++++++++-------------- 3 files changed, 114 insertions(+), 114 deletions(-)
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/3 drm: switch drm_fb_memcpy_dstclip to accept __iomem dst
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.
--- include/drm/drm_format_helper.h | 3 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_format_helper.c | 45 +++++++++++++++-------------- 3 files changed, 27 insertions(+), 23 deletions(-)
include/drm/drm_format_helper.h +2 -1
@@ -15,7 +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, +void drm_fb_memcpy_dstclip (void __iomem *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);
drivers/gpu/drm/cirrus/cirrus.c +1 -1
@@ -307,7 +307,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb,return -ENOMEM ;if (cirrus->cpp == fb->format->cpp[0 ]) -drm_fb_memcpy_dstclip (__io_virt (cirrus->vram), +drm_fb_memcpy_dstclip (cirrus->vram, vmap, fb, rect);else if (fb->format->cpp[0 ] ==4 && cirrus->cpp ==2 )
drivers/gpu/drm/drm_format_helper.c +24 -21
82 lines not on this page · raw message
Signature · 1 line
2.18.1
Re: [PATCH v2 1/3] drm: switch drm_fb_memcpy_dstclip to accept __iomem dst
Den 10.04.2019 08.38, skrev Gerd Hoffmann:
Quoted 11 lines
Not all archs have the
__io_virt()macro, so cirrus can't simply convert pointers that way. The drm format helpers have to usememcpy_toio()instead.This patch makes
drm_fb_memcpy_dstclip()accept a__iomemdst pointer and usememcpy_toio()instead ofmemcpy(). With that separating out the memcpy loop into thedrm_fb_memcpy_lines()helper isn't useful any more, so move the code back into the calling functins.Signed-off-by Gerd Hoffmann <[email protected]>---
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v2 1/3] drm: switch drm_fb_memcpy_dstclip to accept __iomem dst
In reply to Gerd HoffmannDen 10.04.2019 08.38, skrev Gerd Hoffmann:
Quoted 11 lines
Not all archs have the
__io_virt()macro, so cirrus can't simply convert pointers that way. The drm format helpers have to usememcpy_toio()instead.This patch makes
drm_fb_memcpy_dstclip()accept a__iomemdst pointer and usememcpy_toio()instead ofmemcpy(). With that separating out the memcpy loop into thedrm_fb_memcpy_lines()helper isn't useful any more, so move the code back into the calling functins.Signed-off-by Gerd Hoffmann <[email protected]>---
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/3 drm: switch drm_fb_memcpy_dstclip to accept __iomem dst
In reply to Gerd HoffmannNot 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.
--- include/drm/drm_format_helper.h | 3 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_format_helper.c | 45 +++++++++++++++-------------- 3 files changed, 27 insertions(+), 23 deletions(-)
include/drm/drm_format_helper.h +2 -1
@@ -15,7 +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, +void drm_fb_memcpy_dstclip (void __iomem *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);
drivers/gpu/drm/cirrus/cirrus.c +1 -1
@@ -307,7 +307,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb,return -ENOMEM ;if (cirrus->cpp == fb->format->cpp[0 ]) -drm_fb_memcpy_dstclip (__io_virt (cirrus->vram), +drm_fb_memcpy_dstclip (cirrus->vram, vmap, fb, rect);else if (fb->format->cpp[0 ] ==4 && cirrus->cpp ==2 )
drivers/gpu/drm/drm_format_helper.c +24 -21
82 lines not on this page · raw message
Signature · 1 line
2.18.1
PATCH v2 2/3 drm: switch drm_fb_xrgb8888_to_rgb565_dstclip to accept __iomem dst
In reply to Gerd HoffmannNot 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_xrgb8888_to_rgb565_dstclip() accept a __iomem dst pointer and use memcpy_toio() instead of memcpy(). The helper function (drm_fb_xrgb8888_to_rgb565_line) has been changed to process a single scanline.
--- include/drm/drm_format_helper.h | 2 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_format_helper.c | 113 ++++++++++++++-------------- 3 files changed, 60 insertions(+), 57 deletions(-)
include/drm/drm_format_helper.h +1 -1
@@ -23,7 +23,7 @@ void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb,void drm_fb_xrgb8888_to_rgb565 (void *dst,void *vaddr,struct drm_framebuffer *fb,struct drm_rect *clip,bool swap); -void drm_fb_xrgb8888_to_rgb565_dstclip (void *dst,unsigned int dst_pitch, +void drm_fb_xrgb8888_to_rgb565_dstclip (void __iomem *dst,unsigned int dst_pitch,void *vaddr,struct drm_framebuffer *fb,struct drm_rect *clip,bool swap); void drm_fb_xrgb8888_to_rgb888_dstclip(void *dst, unsigned int dst_pitch,
drivers/gpu/drm/cirrus/cirrus.c +1 -1
@@ -311,7 +311,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb, vmap, fb, rect); else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2) - drm_fb_xrgb8888_to_rgb565_dstclip(__io_virt(cirrus->vram), + drm_fb_xrgb8888_to_rgb565_dstclip(cirrus->vram, cirrus->pitch, vmap, fb, rect, false);
drivers/gpu/drm/drm_format_helper.c +58 -55
145 lines not on this page · raw message
Signature · 1 line
2.18.1
Re: [PATCH v2 2/3] drm: switch drm_fb_xrgb8888_to_rgb565_dstclip to accept __iomem dst
Den 10.04.2019 08.38, skrev Gerd Hoffmann:
Quoted 48 lines
Not all archs have the
__io_virt()macro, so cirrus can't simply convert pointers that way. The drm format helpers have to usememcpy_toio()instead.This patch makes
drm_fb_xrgb8888_to_rgb565_dstclip()accept a__iomemdst pointer and usememcpy_toio()instead ofmemcpy(). The helper function (drm_fb_xrgb8888_to_rgb565_line) has been changed to process a single scanline.Signed-off-by Gerd Hoffmann <[email protected]>--- include/drm/drm_format_helper.h | 2 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_format_helper.c | 113 ++++++++++++++-------------- 3 files changed, 60 insertions(+), 57 deletions(-)include/drm/drm_format_helper.h +1
-1@@ -23,7 +23,7 @@ void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb,void drm_fb_xrgb8888_to_rgb565 (void *dst,void *vaddr,struct drm_framebuffer *fb,struct drm_rect *clip,bool swap); -void drm_fb_xrgb8888_to_rgb565_dstclip (void *dst,unsigned int dst_pitch, +void drm_fb_xrgb8888_to_rgb565_dstclip (void __iomem *dst,unsigned int dst_pitch,void *vaddr,struct drm_framebuffer *fb,struct drm_rect *clip,bool swap); void drm_fb_xrgb8888_to_rgb888_dstclip(void *dst, unsigned int dst_pitch,drivers/gpu/drm/cirrus/cirrus.c +1
-1@@ -311,7 +311,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb, vmap, fb, rect); else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2) - drm_fb_xrgb8888_to_rgb565_dstclip(__io_virt(cirrus->vram), + drm_fb_xrgb8888_to_rgb565_dstclip(cirrus->vram, cirrus->pitch, vmap, fb, rect, false);drivers/gpu/drm/drm_format_helper.c +0
-0@@ -113,42 +113,22 @@ void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb, }
drivers/gpu/drm/drm_format_helper.c void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb, · line 118
Quoted 10 lines
drivers/gpu/drm/drm_format_helper.c +3
-5EXPORT_SYMBOL (drm_fb_swab16); -static void drm_fb_xrgb8888_to_rgb565_lines (void *dst,unsigned int dst_pitch, -void *src,unsigned int src_pitch, -unsigned int src_linelength, -unsigned int lines, -bool swap) +static void drm_fb_xrgb8888_to_rgb565_line (u16 *dbuf,u32 *sbuf, +unsigned int pixels, +bool swab)
Both here and further down you change the argument name: swap -> swab. If you want that, you need to fix the function declaration and the docs as well.
With that sorted out:
Quoted 127 lines
drivers/gpu/drm/drm_format_helper.c +48
-50{ -unsigned int linepixels = src_linelength /sizeof (u32); -unsigned int x, y; -u32 *sbuf; -u16 *dbuf, val16; +unsigned int x; +u16 val16; -/* -* The cma memory is write-combined so reads are uncached. -* Speed up by fetching one line at a time. -*/ - sbuf =kmalloc (src_linelength,GFP_KERNEL ); -if (!sbuf) -return ; - -for (y =0 ; y < lines; y++) { -memcpy (sbuf, src, src_linelength); - dbuf = dst; -for (x =0 ; x < linepixels; x++) { - val16 = ((sbuf[x] &0x00F80000 ) >>8 ) | - ((sbuf[x] &0x0000FC00 ) >>5 ) | - ((sbuf[x] &0x000000F8 ) >>3 ); -if (swap) - *dbuf++ =swab16 (val16); -else - *dbuf++ = val16; - } - src += src_pitch; - dst += dst_pitch; +for (x =0 ; x < pixels; x++) { + val16 = ((sbuf[x] &0x00F80000 ) >>8 ) | + ((sbuf[x] &0x0000FC00 ) >>5 ) | + ((sbuf[x] &0x000000F8 ) >>3 ); +if (swab) + dbuf[x] =swab16 (val16); +else + dbuf[x] = val16; } - -kfree (sbuf); }/** @@ -167,23 +147,37 @@ static void drm_fb_xrgb8888_to_rgb565_lines(void *dst, unsigned int dst_pitch,*/ void drm_fb_xrgb8888_to_rgb565 (void *dst,void *vaddr,struct drm_framebuffer *fb, -struct drm_rect *clip,bool swap) +struct drm_rect *clip,bool swab) { -unsigned int src_offset = (clip->y1 * fb->pitches[0 ]) - + (clip->x1 *sizeof (u32)); -size_t src_len = (clip->x2 - clip->x1) *sizeof (u32); -size_t dst_len = (clip->x2 - clip->x1) *sizeof (u16); +size_t linepixels = clip->x2 - clip->x1; +size_t src_len = linepixels *sizeof (u32); +size_t dst_len = linepixels *sizeof (u16); +unsigned y, lines = clip->y2 - clip->y1; +void *sbuf; -drm_fb_xrgb8888_to_rgb565_lines (dst, dst_len, - vaddr + src_offset, fb->pitches[0 ], - src_len, clip->y2 - clip->y1, - swap); +/* +* The cma memory is write-combined so reads are uncached. +* Speed up by fetching one line at a time. +*/ + sbuf =kmalloc (src_len,GFP_KERNEL ); +if (!sbuf) +return ; + + vaddr +=clip_offset (clip, fb->pitches[0 ],sizeof (u32)); +for (y =0 ; y < lines; y++) { +memcpy (sbuf, vaddr, src_len); +drm_fb_xrgb8888_to_rgb565_line (dst, sbuf, linepixels, swab); + vaddr += fb->pitches[0 ]; + dst += dst_len; + } + +kfree (sbuf); }EXPORT_SYMBOL (drm_fb_xrgb8888_to_rgb565);/** * drm_fb_xrgb8888_to_rgb565_dstclip - Convert XRGB8888 to RGB565 clip buffer -* @dst: RGB565 destination buffer +* @dst: RGB565 destination buffer (iomem) * @dst_pitch: destination buffer pitch * @vaddr: XRGB8888 source buffer * @fb: DRM framebuffer @@ -194,22 +188,31 @@ EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);* support XRGB8888. * * 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_xrgb8888_to_rgb565_dstclip (void *dst,unsigned int dst_pitch, +void drm_fb_xrgb8888_to_rgb565_dstclip (void __iomem *dst,unsigned int dst_pitch,void *vaddr,struct drm_framebuffer *fb, -struct drm_rect *clip,bool swap) +struct drm_rect *clip,bool swab) { -unsigned int src_offset = (clip->y1 * fb->pitches[0 ]) - + (clip->x1 *sizeof (u32)); -unsigned int dst_offset = (clip->y1 * dst_pitch) - + (clip->x1 *sizeof (u16)); -size_t src_len = (clip->x2 - clip->x1) *sizeof (u32); +size_t linepixels = clip->x2 - clip->x1; +size_t dst_len = linepixels *sizeof (u16); +unsigned y, lines = clip->y2 - clip->y1; +void *dbuf; -drm_fb_xrgb8888_to_rgb565_lines (dst + dst_offset, dst_pitch, - vaddr + src_offset, fb->pitches[0 ], - src_len, clip->y2 - clip->y1, - swap); + dbuf =kmalloc (dst_len,GFP_KERNEL ); +if (!dbuf) +return ; + + vaddr +=clip_offset (clip, fb->pitches[0 ],sizeof (u32)); + dst +=clip_offset (clip, dst_pitch,sizeof (u16)); +for (y =0 ; y < lines; y++) {
drivers/gpu/drm/drm_format_helper.c EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565); · line 218
Quoted 10 lines
drivers/gpu/drm/drm_format_helper.c +7
-0+drm_fb_xrgb8888_to_rgb565_line (dbuf, vaddr, linepixels, swab); +memcpy_toio (dst, dbuf, dst_len); + vaddr += fb->pitches[0 ]; + dst += dst_len; + } + +kfree (dbuf); }EXPORT_SYMBOL (drm_fb_xrgb8888_to_rgb565_dstclip);
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH v2 2/3] drm: switch drm_fb_xrgb8888_to_rgb565_dstclip to accept __iomem dst
In reply to Gerd HoffmannDen 10.04.2019 08.38, skrev Gerd Hoffmann:
Quoted 48 lines
Not all archs have the
__io_virt()macro, so cirrus can't simply convert pointers that way. The drm format helpers have to usememcpy_toio()instead.This patch makes
drm_fb_xrgb8888_to_rgb565_dstclip()accept a__iomemdst pointer and usememcpy_toio()instead ofmemcpy(). The helper function (drm_fb_xrgb8888_to_rgb565_line) has been changed to process a single scanline.Signed-off-by Gerd Hoffmann <[email protected]>--- include/drm/drm_format_helper.h | 2 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_format_helper.c | 113 ++++++++++++++-------------- 3 files changed, 60 insertions(+), 57 deletions(-)include/drm/drm_format_helper.h +1
-1@@ -23,7 +23,7 @@ void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb,void drm_fb_xrgb8888_to_rgb565 (void *dst,void *vaddr,struct drm_framebuffer *fb,struct drm_rect *clip,bool swap); -void drm_fb_xrgb8888_to_rgb565_dstclip (void *dst,unsigned int dst_pitch, +void drm_fb_xrgb8888_to_rgb565_dstclip (void __iomem *dst,unsigned int dst_pitch,void *vaddr,struct drm_framebuffer *fb,struct drm_rect *clip,bool swap); void drm_fb_xrgb8888_to_rgb888_dstclip(void *dst, unsigned int dst_pitch,drivers/gpu/drm/cirrus/cirrus.c +1
-1@@ -311,7 +311,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb, vmap, fb, rect); else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2) - drm_fb_xrgb8888_to_rgb565_dstclip(__io_virt(cirrus->vram), + drm_fb_xrgb8888_to_rgb565_dstclip(cirrus->vram, cirrus->pitch, vmap, fb, rect, false);drivers/gpu/drm/drm_format_helper.c +0
-0@@ -113,42 +113,22 @@ void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb, }
drivers/gpu/drm/drm_format_helper.c void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb, · line 118
Quoted 10 lines
drivers/gpu/drm/drm_format_helper.c +3
-5EXPORT_SYMBOL (drm_fb_swab16); -static void drm_fb_xrgb8888_to_rgb565_lines (void *dst,unsigned int dst_pitch, -void *src,unsigned int src_pitch, -unsigned int src_linelength, -unsigned int lines, -bool swap) +static void drm_fb_xrgb8888_to_rgb565_line (u16 *dbuf,u32 *sbuf, +unsigned int pixels, +bool swab)
Both here and further down you change the argument name: swap -> swab. If you want that, you need to fix the function declaration and the docs as well.
With that sorted out:
Quoted 127 lines
drivers/gpu/drm/drm_format_helper.c +48
-50{ -unsigned int linepixels = src_linelength /sizeof (u32); -unsigned int x, y; -u32 *sbuf; -u16 *dbuf, val16; +unsigned int x; +u16 val16; -/* -* The cma memory is write-combined so reads are uncached. -* Speed up by fetching one line at a time. -*/ - sbuf =kmalloc (src_linelength,GFP_KERNEL ); -if (!sbuf) -return ; - -for (y =0 ; y < lines; y++) { -memcpy (sbuf, src, src_linelength); - dbuf = dst; -for (x =0 ; x < linepixels; x++) { - val16 = ((sbuf[x] &0x00F80000 ) >>8 ) | - ((sbuf[x] &0x0000FC00 ) >>5 ) | - ((sbuf[x] &0x000000F8 ) >>3 ); -if (swap) - *dbuf++ =swab16 (val16); -else - *dbuf++ = val16; - } - src += src_pitch; - dst += dst_pitch; +for (x =0 ; x < pixels; x++) { + val16 = ((sbuf[x] &0x00F80000 ) >>8 ) | + ((sbuf[x] &0x0000FC00 ) >>5 ) | + ((sbuf[x] &0x000000F8 ) >>3 ); +if (swab) + dbuf[x] =swab16 (val16); +else + dbuf[x] = val16; } - -kfree (sbuf); }/** @@ -167,23 +147,37 @@ static void drm_fb_xrgb8888_to_rgb565_lines(void *dst, unsigned int dst_pitch,*/ void drm_fb_xrgb8888_to_rgb565 (void *dst,void *vaddr,struct drm_framebuffer *fb, -struct drm_rect *clip,bool swap) +struct drm_rect *clip,bool swab) { -unsigned int src_offset = (clip->y1 * fb->pitches[0 ]) - + (clip->x1 *sizeof (u32)); -size_t src_len = (clip->x2 - clip->x1) *sizeof (u32); -size_t dst_len = (clip->x2 - clip->x1) *sizeof (u16); +size_t linepixels = clip->x2 - clip->x1; +size_t src_len = linepixels *sizeof (u32); +size_t dst_len = linepixels *sizeof (u16); +unsigned y, lines = clip->y2 - clip->y1; +void *sbuf; -drm_fb_xrgb8888_to_rgb565_lines (dst, dst_len, - vaddr + src_offset, fb->pitches[0 ], - src_len, clip->y2 - clip->y1, - swap); +/* +* The cma memory is write-combined so reads are uncached. +* Speed up by fetching one line at a time. +*/ + sbuf =kmalloc (src_len,GFP_KERNEL ); +if (!sbuf) +return ; + + vaddr +=clip_offset (clip, fb->pitches[0 ],sizeof (u32)); +for (y =0 ; y < lines; y++) { +memcpy (sbuf, vaddr, src_len); +drm_fb_xrgb8888_to_rgb565_line (dst, sbuf, linepixels, swab); + vaddr += fb->pitches[0 ]; + dst += dst_len; + } + +kfree (sbuf); }EXPORT_SYMBOL (drm_fb_xrgb8888_to_rgb565);/** * drm_fb_xrgb8888_to_rgb565_dstclip - Convert XRGB8888 to RGB565 clip buffer -* @dst: RGB565 destination buffer +* @dst: RGB565 destination buffer (iomem) * @dst_pitch: destination buffer pitch * @vaddr: XRGB8888 source buffer * @fb: DRM framebuffer @@ -194,22 +188,31 @@ EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565);* support XRGB8888. * * 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_xrgb8888_to_rgb565_dstclip (void *dst,unsigned int dst_pitch, +void drm_fb_xrgb8888_to_rgb565_dstclip (void __iomem *dst,unsigned int dst_pitch,void *vaddr,struct drm_framebuffer *fb, -struct drm_rect *clip,bool swap) +struct drm_rect *clip,bool swab) { -unsigned int src_offset = (clip->y1 * fb->pitches[0 ]) - + (clip->x1 *sizeof (u32)); -unsigned int dst_offset = (clip->y1 * dst_pitch) - + (clip->x1 *sizeof (u16)); -size_t src_len = (clip->x2 - clip->x1) *sizeof (u32); +size_t linepixels = clip->x2 - clip->x1; +size_t dst_len = linepixels *sizeof (u16); +unsigned y, lines = clip->y2 - clip->y1; +void *dbuf; -drm_fb_xrgb8888_to_rgb565_lines (dst + dst_offset, dst_pitch, - vaddr + src_offset, fb->pitches[0 ], - src_len, clip->y2 - clip->y1, - swap); + dbuf =kmalloc (dst_len,GFP_KERNEL ); +if (!dbuf) +return ; + + vaddr +=clip_offset (clip, fb->pitches[0 ],sizeof (u32)); + dst +=clip_offset (clip, dst_pitch,sizeof (u16)); +for (y =0 ; y < lines; y++) {
drivers/gpu/drm/drm_format_helper.c EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb565); · line 218
Quoted 10 lines
drivers/gpu/drm/drm_format_helper.c +7
-0+drm_fb_xrgb8888_to_rgb565_line (dbuf, vaddr, linepixels, swab); +memcpy_toio (dst, dbuf, dst_len); + vaddr += fb->pitches[0 ]; + dst += dst_len; + } + +kfree (dbuf); }EXPORT_SYMBOL (drm_fb_xrgb8888_to_rgb565_dstclip);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/3 drm: switch drm_fb_xrgb8888_to_rgb565_dstclip to accept __iomem dst
In reply to Gerd HoffmannNot 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_xrgb8888_to_rgb565_dstclip() accept a __iomem dst pointer and use memcpy_toio() instead of memcpy(). The helper function (drm_fb_xrgb8888_to_rgb565_line) has been changed to process a single scanline.
--- include/drm/drm_format_helper.h | 2 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_format_helper.c | 113 ++++++++++++++-------------- 3 files changed, 60 insertions(+), 57 deletions(-)
include/drm/drm_format_helper.h +1 -1
@@ -23,7 +23,7 @@ void drm_fb_swab16(u16 *dst, void *vaddr, struct drm_framebuffer *fb,void drm_fb_xrgb8888_to_rgb565 (void *dst,void *vaddr,struct drm_framebuffer *fb,struct drm_rect *clip,bool swap); -void drm_fb_xrgb8888_to_rgb565_dstclip (void *dst,unsigned int dst_pitch, +void drm_fb_xrgb8888_to_rgb565_dstclip (void __iomem *dst,unsigned int dst_pitch,void *vaddr,struct drm_framebuffer *fb,struct drm_rect *clip,bool swap); void drm_fb_xrgb8888_to_rgb888_dstclip(void *dst, unsigned int dst_pitch,
drivers/gpu/drm/cirrus/cirrus.c +1 -1
@@ -311,7 +311,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb, vmap, fb, rect); else if (fb->format->cpp[0] == 4 && cirrus->cpp == 2) - drm_fb_xrgb8888_to_rgb565_dstclip(__io_virt(cirrus->vram), + drm_fb_xrgb8888_to_rgb565_dstclip(cirrus->vram, cirrus->pitch, vmap, fb, rect, false);
drivers/gpu/drm/drm_format_helper.c +58 -55
145 lines not on this page · raw message
Signature · 1 line
2.18.1
PATCH v2 3/3 drm: switch drm_fb_xrgb8888_to_rgb888_dstclip to accept __iomem dst
In reply to Gerd HoffmannNot 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_xrgb8888_to_rgb888_dstclip() accept a __iomem dst pointer and use memcpy_toio() instead of memcpy(). The helper function (drm_fb_xrgb8888_to_rgb888_line) has been changed to process a single scanline.
--- include/drm/drm_format_helper.h | 2 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_format_helper.c | 57 +++++++++++++---------------- 3 files changed, 27 insertions(+), 34 deletions(-)
include/drm/drm_format_helper.h +1 -1
@@ -26,7 +26,7 @@ void drm_fb_xrgb8888_to_rgb565(void *dst, void *vaddr,void drm_fb_xrgb8888_to_rgb565_dstclip (void __iomem *dst,unsigned int dst_pitch,void *vaddr,struct drm_framebuffer *fb,struct drm_rect *clip,bool swap); -void drm_fb_xrgb8888_to_rgb888_dstclip (void *dst,unsigned int dst_pitch, +void drm_fb_xrgb8888_to_rgb888_dstclip (void __iomem *dst,unsigned int dst_pitch,void *vaddr,struct drm_framebuffer *fb,struct drm_rect *clip); void drm_fb_xrgb8888_to_gray8(u8 *dst, void *vaddr, struct drm_framebuffer *fb,
drivers/gpu/drm/cirrus/cirrus.c +1 -1
@@ -316,7 +316,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb, vmap, fb, rect, false); else if (fb->format->cpp[0] == 4 && cirrus->cpp == 3) - drm_fb_xrgb8888_to_rgb888_dstclip(__io_virt(cirrus->vram), + drm_fb_xrgb8888_to_rgb888_dstclip(cirrus->vram, cirrus->pitch, vmap, fb, rect);
drivers/gpu/drm/drm_format_helper.c +25 -32
73 lines not on this page · raw message
Signature · 1 line
2.18.1
Re: [PATCH v2 3/3] drm: switch drm_fb_xrgb8888_to_rgb888_dstclip to accept __iomem dst
Den 10.04.2019 08.38, skrev Gerd Hoffmann:
Quoted 11 lines
Not all archs have the
__io_virt()macro, so cirrus can't simply convert pointers that way. The drm format helpers have to usememcpy_toio()instead.This patch makes
drm_fb_xrgb8888_to_rgb888_dstclip()accept a__iomemdst pointer and usememcpy_toio()instead ofmemcpy(). The helper function (drm_fb_xrgb8888_to_rgb888_line) has been changed to process a single scanline.Signed-off-by Gerd Hoffmann <[email protected]>---
Re: [PATCH v2 3/3] drm: switch drm_fb_xrgb8888_to_rgb888_dstclip to accept __iomem dst
In reply to Gerd HoffmannDen 10.04.2019 08.38, skrev Gerd Hoffmann:
Quoted 11 lines
Not all archs have the
__io_virt()macro, so cirrus can't simply convert pointers that way. The drm format helpers have to usememcpy_toio()instead.This patch makes
drm_fb_xrgb8888_to_rgb888_dstclip()accept a__iomemdst pointer and usememcpy_toio()instead ofmemcpy(). The helper function (drm_fb_xrgb8888_to_rgb888_line) has been changed to process a single scanline.Signed-off-by Gerd Hoffmann <[email protected]>---
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v2 3/3 drm: switch drm_fb_xrgb8888_to_rgb888_dstclip to accept __iomem dst
In reply to Gerd HoffmannNot 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_xrgb8888_to_rgb888_dstclip() accept a __iomem dst pointer and use memcpy_toio() instead of memcpy(). The helper function (drm_fb_xrgb8888_to_rgb888_line) has been changed to process a single scanline.
--- include/drm/drm_format_helper.h | 2 +- drivers/gpu/drm/cirrus/cirrus.c | 2 +- drivers/gpu/drm/drm_format_helper.c | 57 +++++++++++++---------------- 3 files changed, 27 insertions(+), 34 deletions(-)
include/drm/drm_format_helper.h +1 -1
@@ -26,7 +26,7 @@ void drm_fb_xrgb8888_to_rgb565(void *dst, void *vaddr,void drm_fb_xrgb8888_to_rgb565_dstclip (void __iomem *dst,unsigned int dst_pitch,void *vaddr,struct drm_framebuffer *fb,struct drm_rect *clip,bool swap); -void drm_fb_xrgb8888_to_rgb888_dstclip (void *dst,unsigned int dst_pitch, +void drm_fb_xrgb8888_to_rgb888_dstclip (void __iomem *dst,unsigned int dst_pitch,void *vaddr,struct drm_framebuffer *fb,struct drm_rect *clip); void drm_fb_xrgb8888_to_gray8(u8 *dst, void *vaddr, struct drm_framebuffer *fb,
drivers/gpu/drm/cirrus/cirrus.c +1 -1
@@ -316,7 +316,7 @@ static int cirrus_fb_blit_rect(struct drm_framebuffer *fb, vmap, fb, rect, false); else if (fb->format->cpp[0] == 4 && cirrus->cpp == 3) - drm_fb_xrgb8888_to_rgb888_dstclip(__io_virt(cirrus->vram), + drm_fb_xrgb8888_to_rgb888_dstclip(cirrus->vram, cirrus->pitch, vmap, fb, rect);
drivers/gpu/drm/drm_format_helper.c +25 -32
73 lines not on this page · raw message
Signature · 1 line
2.18.1