mirror of https://gitee.com/openkylin/linux.git
[PATCH] tgafb: fix copying overlapping areas
The direction of copying in the copyarea functions is selected incorrectly, resulting in corruption. This is a fix. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Cc: James Simmons <jsimmons@infradead.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ee9a25e5df
commit
36f71405e6
|
@ -885,7 +885,7 @@ copyarea_line_8bpp(struct fb_info *info, u32 dy, u32 sy,
|
||||||
|
|
||||||
n64 = (height * width) / 64;
|
n64 = (height * width) / 64;
|
||||||
|
|
||||||
if (dy < sy) {
|
if (sy < dy) {
|
||||||
spos = (sy + height) * width;
|
spos = (sy + height) * width;
|
||||||
dpos = (dy + height) * width;
|
dpos = (dy + height) * width;
|
||||||
|
|
||||||
|
@ -933,7 +933,7 @@ copyarea_line_32bpp(struct fb_info *info, u32 dy, u32 sy,
|
||||||
|
|
||||||
n16 = (height * width) / 16;
|
n16 = (height * width) / 16;
|
||||||
|
|
||||||
if (dy < sy) {
|
if (sy < dy) {
|
||||||
src = tga_fb + (sy + height) * width * 4;
|
src = tga_fb + (sy + height) * width * 4;
|
||||||
dst = tga_fb + (dy + height) * width * 4;
|
dst = tga_fb + (dy + height) * width * 4;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue