aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/softcursor.c
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@pentafluge.infradead.org>2005-06-21 20:16:58 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 22:07:39 -0400
commitf5a9951c94e7a285a3d00648e3d790a7f016bd11 (patch)
tree47815b54fef9bae70f26053cacdd489ff338d152 /drivers/video/softcursor.c
parent5a3b5899f190a365eed806302f4b58a493233f96 (diff)
[PATCH] fbdev: iomove removal
Since no one is using the inbuf, outbuf of struct fb_pixmap I removed their use in the framebuffer console. The idea is instead move the pixmap functionality below the accelerated functions intead of on top as the way it is now. If there is no objection please apply. This is against Linus latestr GIT tree. Thank you. Signed-off-by: James Simmons <jsimmons@www.infradead.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/softcursor.c')
-rw-r--r--drivers/video/softcursor.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/video/softcursor.c b/drivers/video/softcursor.c
index 13a4511539a1..a6c5ca88d6b0 100644
--- a/drivers/video/softcursor.c
+++ b/drivers/video/softcursor.c
@@ -58,12 +58,8 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
58 } else 58 } else
59 memcpy(src, image->data, dsize); 59 memcpy(src, image->data, dsize);
60 60
61 if (info->pixmap.outbuf) 61 fb_sysmove_buf_aligned(info, &info->pixmap, dst, d_pitch, src,
62 fb_iomove_buf_aligned(info, &info->pixmap, dst, d_pitch, src, 62 s_pitch, image->height);
63 s_pitch, image->height);
64 else
65 fb_sysmove_buf_aligned(info, &info->pixmap, dst, d_pitch, src,
66 s_pitch, image->height);
67 63
68 image->data = dst; 64 image->data = dst;
69 info->fbops->fb_imageblit(info, image); 65 info->fbops->fb_imageblit(info, image);