fbdev: Fix image blitting for arbitrary image widths
Subsystems (3)
cover fbdev: Fix image blitting for arbitrary image widths
Recent optimization of the fbdev image-bitting helpers broke the code for image width that do not align with multiples of 8. Both, sys and cfb, are affected. Fix this problem by handling the trailing pixels on each line separately.
Tested with simpledrm and the 7x14 font.
Thomas Zimmermann (2):
fbdev: Fix sys_imageblit() for arbitrary image widths
fbdev: Fix cfb_imageblit() for arbitrary image widths
drivers/video/fbdev/core/cfbimgblt.c | 28 +++++++++++++++++++++++---- drivers/video/fbdev/core/sysimgblt.c | 29 ++++++++++++++++++++++++---- 2 files changed, 49 insertions(+), 8 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/2 fbdev: Fix sys_imageblit() for arbitrary image widths
Commit 6f29e04938bf ("fbdev: Improve performance of sys_imageblit()") broke sys_imageblit() for image width that are not aligned to 8-bit boundaries. Fix this by handling the trailing pixels on each line separately. The performance improvements in the original commit do not regress by this change.
--- drivers/video/fbdev/core/sysimgblt.c | 29 ++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-)
drivers/video/fbdev/core/sysimgblt.c +25 -4
@@ -188,7 +188,7 @@ static void fast_imageblit(const struct fb_image *image, struct fb_info *p, {u32 fgx = fgcolor, bgx = bgcolor, bpp = p->var.bits_per_pixel;u32 ppw =32 /bpp, spitch = (image->width +7 )/8 ; -u32 bit_mask, eorx; +u32 bit_mask, eorx, shift;const char *s = image->data, *src;u32 *dst;const u32 *tab;
@@ -229,17 +229,23 @@ static void fast_imageblit(const struct fb_image *image, struct fb_info *p,for (i = image->height; i--; ) { dst = dst1; + shift =8 ; src = s; +/* +* Manually unroll the per-line copying loop for better +* performance. This works until we processed the last +* completely filled source byte (inclusive). +*/ switch (ppw) {case 4 :/* 8 bpp */ -for (j = k; j; j -=2 , ++src) { +for (j = k; j >=2 ; j -=2 , ++src) { *dst++ = colortab[(*src >>4 ) & bit_mask]; *dst++ = colortab[(*src >>0 ) & bit_mask]; }break ;case 2 :/* 16 bpp */ -for (j = k; j; j -=4 , ++src) { +for (j = k; j >=4 ; j -=4 , ++src) { *dst++ = colortab[(*src >>6 ) & bit_mask]; *dst++ = colortab[(*src >>4 ) & bit_mask]; *dst++ = colortab[(*src >>2 ) & bit_mask];
@@ -247,7 +253,7 @@ static void fast_imageblit(const struct fb_image *image, struct fb_info *p, }break ;case 1 :/* 32 bpp */ -for (j = k; j; j -=8 , ++src) { +for (j = k; j >=8 ; j -=8 , ++src) { *dst++ = colortab[(*src >>7 ) & bit_mask]; *dst++ = colortab[(*src >>6 ) & bit_mask]; *dst++ = colortab[(*src >>5 ) & bit_mask];
@@ -259,6 +265,21 @@ static void fast_imageblit(const struct fb_image *image, struct fb_info *p, }break ; } + +/* +* For image widths that are not a multiple of 8, there +* are trailing pixels left on the current line. Print +* them as well. +*/ +for (; j--; ) { + shift -= ppw; + *dst++ = colortab[(*src >> shift) & bit_mask]; +if (!shift) { + shift =8 ; + ++src; + } + } + dst1 += p->fix.line_length; s += spitch; }
Signature · 1 line
2.35.1
Re: [PATCH 1/2] fbdev: Fix sys_imageblit() for arbitrary image widths
Hi Thomas,
Quoted 7 lines · Thomas Zimmermann
Commit
6f29e04938bf("fbdev: Improve performance ofsys_imageblit()") brokesys_imageblit()for image width that are not aligned to 8-bit boundaries. Fix this by handling the trailing pixels on each line separately. The performance improvements in the original commit do not regress by this change.Signed-off-by Thomas Zimmermann <[email protected]>
Thanks for fixing! This was very valuable for hammering the bugs out of ssd130xdrm and the xrgb888-to-mono conversion...
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: [PATCH 1/2] fbdev: Fix sys_imageblit() for arbitrary image widths
In reply to Thomas ZimmermannHello Thomas,
Quoted 6 lines · Thomas Zimmermann
Commit
6f29e04938bf("fbdev: Improve performance ofsys_imageblit()") brokesys_imageblit()for image width that are not aligned to 8-bit boundaries. Fix this by handling the trailing pixels on each line separately. The performance improvements in the original commit do not regress by this change.
Quoted 6 lines
Signed-off-by Thomas Zimmermann <[email protected]>Fixes 6f29e04938bf ("fbdev: Improve performance of sys_imageblit()")Cc Thomas Zimmermann <[email protected]>Cc Javier Martinez Canillas <[email protected]>Cc Sam Ravnborg <[email protected]>---
Looks good to me. Also Marek and Geert mentioned that fixes the issue they were seeing.
Signature · 5 lines
Best regards, Javier Martinez Canillas Linux Engineering Red Hat
PATCH 2/2 fbdev: Fix cfb_imageblit() for arbitrary image widths
In reply to Thomas ZimmermannCommit 0d03011894d2 ("fbdev: Improve performance of cfb_imageblit()") broke cfb_imageblit() for image widths that are not aligned to 8-bit boundaries. Fix this by handling the trailing pixels on each line separately. The performance improvements in the original commit do not regress by this change.
--- drivers/video/fbdev/core/cfbimgblt.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)
drivers/video/fbdev/core/cfbimgblt.c +24 -4
@@ -218,7 +218,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info * {u32 fgx = fgcolor, bgx = bgcolor, bpp = p->var.bits_per_pixel;u32 ppw =32 /bpp, spitch = (image->width +7 )/8 ; -u32 bit_mask, eorx; +u32 bit_mask, eorx, shift;const char *s = image->data, *src;u32 __iomem *dst;const u32 *tab =NULL ;
@@ -259,17 +259,23 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *for (i = image->height; i--; ) { dst = (u32 __iomem *)dst1; + shift =8 ; src = s; +/* +* Manually unroll the per-line copying loop for better +* performance. This works until we processed the last +* completely filled source byte (inclusive). +*/ switch (ppw) {case 4 :/* 8 bpp */ -for (j = k; j; j -=2 , ++src) { +for (j = k; j >=2 ; j -=2 , ++src) {FB_WRITEL (colortab[(*src >>4 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>0 ) & bit_mask], dst++); }break ;case 2 :/* 16 bpp */ -for (j = k; j; j -=4 , ++src) { +for (j = k; j >=4 ; j -=4 , ++src) {FB_WRITEL (colortab[(*src >>6 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>4 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>2 ) & bit_mask], dst++);
@@ -277,7 +283,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info * }break ;case 1 :/* 32 bpp */ -for (j = k; j; j -=8 , ++src) { +for (j = k; j >=8 ; j -=8 , ++src) {FB_WRITEL (colortab[(*src >>7 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>6 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>5 ) & bit_mask], dst++);
@@ -290,6 +296,20 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *break ; } +/* +* For image widths that are not a multiple of 8, there +* are trailing pixels left on the current line. Print +* them as well. +*/ +for (; j--; ) { + shift -= ppw; +FB_WRITEL (colortab[(*src >> shift) & bit_mask], dst++); +if (!shift) { + shift =8 ; + ++src; + } + } + dst1 += p->fix.line_length; s += spitch; }
Signature · 1 line
2.35.1
Re: [PATCH 2/2] fbdev: Fix cfb_imageblit() for arbitrary image widths
Quoted 6 lines · Thomas Zimmermann
Commit
0d03011894d2("fbdev: Improve performance ofcfb_imageblit()") brokecfb_imageblit()for image widths that are not aligned to 8-bit boundaries. Fix this by handling the trailing pixels on each line separately. The performance improvements in the original commit do not regress by this change.
Quoted 6 lines
Signed-off-by Thomas Zimmermann <[email protected]>Fixes 0d03011894d2 ("fbdev: Improve performance of cfb_imageblit()")Reported-by Marek Szyprowski <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc Javier Martinez Canillas <[email protected]>Cc Sam Ravnborg <[email protected]>
Quoted 63 lines
--- drivers/video/fbdev/core/cfbimgblt.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)drivers/video/fbdev/core/cfbimgblt.c +17
-4@@ -218,7 +218,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info * {u32 fgx = fgcolor, bgx = bgcolor, bpp = p->var.bits_per_pixel;u32 ppw =32 /bpp, spitch = (image->width +7 )/8 ; -u32 bit_mask, eorx; +u32 bit_mask, eorx, shift;const char *s = image->data, *src;u32 __iomem *dst;const u32 *tab =NULL ;@@ -259,17 +259,23 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *for (i = image->height; i--; ) { dst = (u32 __iomem *)dst1; + shift =8 ; src = s; +/* +* Manually unroll the per-line copying loop for better +* performance. This works until we processed the last +* completely filled source byte (inclusive). +*/ switch (ppw) {case 4 :/* 8 bpp */ -for (j = k; j; j -=2 , ++src) { +for (j = k; j >=2 ; j -=2 , ++src) {FB_WRITEL (colortab[(*src >>4 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>0 ) & bit_mask], dst++); }break ;case 2 :/* 16 bpp */ -for (j = k; j; j -=4 , ++src) { +for (j = k; j >=4 ; j -=4 , ++src) {FB_WRITEL (colortab[(*src >>6 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>4 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>2 ) & bit_mask], dst++);@@ -277,7 +283,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info * }break ;case 1 :/* 32 bpp */ -for (j = k; j; j -=8 , ++src) { +for (j = k; j >=8 ; j -=8 , ++src) {FB_WRITEL (colortab[(*src >>7 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>6 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>5 ) & bit_mask], dst++);@@ -290,6 +296,20 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *break ; } +/* +* For image widths that are not a multiple of 8, there +* are trailing pixels left on the current line. Print +* them as well. +*/ +for (; j--; ) { + shift -= ppw;
drivers/video/fbdev/core/cfbimgblt.c static inline void fast_imageblit(const struct fb_image *image, struct fb_info * · line 315
Quoted 10 lines
drivers/video/fbdev/core/cfbimgblt.c +7
-0+FB_WRITEL (colortab[(*src >> shift) & bit_mask], dst++); +if (!shift) { + shift =8 ; + ++src; + } + } + dst1 += p->fix.line_length; s += spitch; }
Best regards
Signature · 2 lines
Marek Szyprowski, PhD Samsung R&D Institute Poland
Re: [PATCH 2/2] fbdev: Fix cfb_imageblit() for arbitrary image widths
In reply to Thomas ZimmermannQuoted 6 lines · Thomas Zimmermann
Commit
0d03011894d2("fbdev: Improve performance ofcfb_imageblit()") brokecfb_imageblit()for image widths that are not aligned to 8-bit boundaries. Fix this by handling the trailing pixels on each line separately. The performance improvements in the original commit do not regress by this change.
Quoted 6 lines
Signed-off-by Thomas Zimmermann <[email protected]>Fixes 0d03011894d2 ("fbdev: Improve performance of cfb_imageblit()")Reported-by Marek Szyprowski <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc Javier Martinez Canillas <[email protected]>Cc Sam Ravnborg <[email protected]>
On both patches:
Quoted 76 lines
--- drivers/video/fbdev/core/cfbimgblt.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)drivers/video/fbdev/core/cfbimgblt.c +24
-4@@ -218,7 +218,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info * {u32 fgx = fgcolor, bgx = bgcolor, bpp = p->var.bits_per_pixel;u32 ppw =32 /bpp, spitch = (image->width +7 )/8 ; -u32 bit_mask, eorx; +u32 bit_mask, eorx, shift;const char *s = image->data, *src;u32 __iomem *dst;const u32 *tab =NULL ;@@ -259,17 +259,23 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *for (i = image->height; i--; ) { dst = (u32 __iomem *)dst1; + shift =8 ; src = s; +/* +* Manually unroll the per-line copying loop for better +* performance. This works until we processed the last +* completely filled source byte (inclusive). +*/ switch (ppw) {case 4 :/* 8 bpp */ -for (j = k; j; j -=2 , ++src) { +for (j = k; j >=2 ; j -=2 , ++src) {FB_WRITEL (colortab[(*src >>4 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>0 ) & bit_mask], dst++); }break ;case 2 :/* 16 bpp */ -for (j = k; j; j -=4 , ++src) { +for (j = k; j >=4 ; j -=4 , ++src) {FB_WRITEL (colortab[(*src >>6 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>4 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>2 ) & bit_mask], dst++);@@ -277,7 +283,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info * }break ;case 1 :/* 32 bpp */ -for (j = k; j; j -=8 , ++src) { +for (j = k; j >=8 ; j -=8 , ++src) {FB_WRITEL (colortab[(*src >>7 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>6 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>5 ) & bit_mask], dst++);@@ -290,6 +296,20 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *break ; } +/* +* For image widths that are not a multiple of 8, there +* are trailing pixels left on the current line. Print +* them as well. +*/ +for (; j--; ) { + shift -= ppw; +FB_WRITEL (colortab[(*src >> shift) & bit_mask], dst++); +if (!shift) { + shift =8 ; + ++src; + } + } + dst1 += p->fix.line_length; s += spitch; }Signature · 1 line
2.35.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Re: [PATCH 2/2] fbdev: Fix cfb_imageblit() for arbitrary image widths
In reply to Thomas ZimmermannQuoted 6 lines · Thomas Zimmermann
Commit
0d03011894d2("fbdev: Improve performance ofcfb_imageblit()") brokecfb_imageblit()for image widths that are not aligned to 8-bit boundaries. Fix this by handling the trailing pixels on each line separately. The performance improvements in the original commit do not regress by this change.
Quoted 7 lines
Signed-off-by Thomas Zimmermann <[email protected]>Fixes 0d03011894d2 ("fbdev: Improve performance of cfb_imageblit()")Reported-by Marek Szyprowski <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc Javier Martinez Canillas <[email protected]>Cc Sam Ravnborg <[email protected]>---
Signature · 5 lines
Best regards, Javier Martinez Canillas Linux Engineering Red Hat
Re: [2/2] fbdev: Fix cfb_imageblit() for arbitrary image widths
In reply to Thomas ZimmermannQuoted 6 lines · Thomas Zimmermann
Commit
0d03011894d2("fbdev: Improve performance ofcfb_imageblit()") brokecfb_imageblit()for image widths that are not aligned to 8-bit boundaries. Fix this by handling the trailing pixels on each line separately. The performance improvements in the original commit do not regress by this change.
Quoted 9 lines
Signed-off-by Thomas Zimmermann <[email protected]>Fixes 0d03011894d2 ("fbdev: Improve performance of cfb_imageblit()")Reported-by Marek Szyprowski <[email protected]>Cc Thomas Zimmermann <[email protected]>Cc Javier Martinez Canillas <[email protected]>Cc Sam Ravnborg <[email protected]>Tested-by Marek Szyprowski <[email protected]>Acked-by Daniel Vetter <[email protected]>Reviewed-by Javier Martinez Canillas <[email protected]>
Quoted 73 lines
--- drivers/video/fbdev/core/cfbimgblt.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-)drivers/video/fbdev/core/cfbimgblt.c +24
-4@@ -218,7 +218,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info * {u32 fgx = fgcolor, bgx = bgcolor, bpp = p->var.bits_per_pixel;u32 ppw =32 /bpp, spitch = (image->width +7 )/8 ; -u32 bit_mask, eorx; +u32 bit_mask, eorx, shift;const char *s = image->data, *src;u32 __iomem *dst;const u32 *tab =NULL ;@@ -259,17 +259,23 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *for (i = image->height; i--; ) { dst = (u32 __iomem *)dst1; + shift =8 ; src = s; +/* +* Manually unroll the per-line copying loop for better +* performance. This works until we processed the last +* completely filled source byte (inclusive). +*/ switch (ppw) {case 4 :/* 8 bpp */ -for (j = k; j; j -=2 , ++src) { +for (j = k; j >=2 ; j -=2 , ++src) {FB_WRITEL (colortab[(*src >>4 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>0 ) & bit_mask], dst++); }break ;case 2 :/* 16 bpp */ -for (j = k; j; j -=4 , ++src) { +for (j = k; j >=4 ; j -=4 , ++src) {FB_WRITEL (colortab[(*src >>6 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>4 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>2 ) & bit_mask], dst++);@@ -277,7 +283,7 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info * }break ;case 1 :/* 32 bpp */ -for (j = k; j; j -=8 , ++src) { +for (j = k; j >=8 ; j -=8 , ++src) {FB_WRITEL (colortab[(*src >>7 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>6 ) & bit_mask], dst++);FB_WRITEL (colortab[(*src >>5 ) & bit_mask], dst++);@@ -290,6 +296,20 @@ static inline void fast_imageblit(const struct fb_image *image, struct fb_info *break ; } +/* +* For image widths that are not a multiple of 8, there +* are trailing pixels left on the current line. Print +* them as well. +*/ +for (; j--; ) { + shift -= ppw; +FB_WRITEL (colortab[(*src >> shift) & bit_mask], dst++); +if (!shift) { + shift =8 ; + ++src; + } + } + dst1 += p->fix.line_length; s += spitch; }