From: Geert Uytterhoeven Date: Wed, 23 May 2007 20:57:50 +0000 (-0700) Subject: ps3fb: use FB_SYS_* instead of FB_CFB_* X-Git-Tag: v2.6.22-rc3~57 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92c4579dbb3bc70bd397e272258c69f88de189b8;p=linux-2.6 ps3fb: use FB_SYS_* instead of FB_CFB_* ps3fb: Use the FB_SYS_* operations instead of the FB_CFB_* operations as the actual frame buffer memory is part of system RAM Signed-off-by: Geert Uytterhoeven Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index fdeb3e68a1..6e1f1ea21b 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -1792,9 +1792,10 @@ config FB_IBM_GXT4500 config FB_PS3 bool "PS3 GPU framebuffer driver" depends on (FB = y) && PS3_PS3AV - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS ---help--- Include support for the virtual frame buffer in the PS3 platform. diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c index 9756a728b7..9cf92ba5d6 100644 --- a/drivers/video/ps3fb.c +++ b/drivers/video/ps3fb.c @@ -951,12 +951,14 @@ static int ps3fb_xdr_settings(u64 xdr_lpar) static struct fb_ops ps3fb_ops = { .fb_open = ps3fb_open, .fb_release = ps3fb_release, + .fb_read = fb_sys_read, + .fb_write = fb_sys_write, .fb_check_var = ps3fb_check_var, .fb_set_par = ps3fb_set_par, .fb_setcolreg = ps3fb_setcolreg, - .fb_fillrect = cfb_fillrect, - .fb_copyarea = cfb_copyarea, - .fb_imageblit = cfb_imageblit, + .fb_fillrect = sys_fillrect, + .fb_copyarea = sys_copyarea, + .fb_imageblit = sys_imageblit, .fb_mmap = ps3fb_mmap, .fb_blank = ps3fb_blank, .fb_ioctl = ps3fb_ioctl,