Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfeeffbb authored by Avuton Olrich's avatar Avuton Olrich Committed by Linus Torvalds
Browse files

cfag12864bfb: Use sys_ instead of cfb_ framebuffer accessors 



Because the framebuffer memory is allocated system RAM, use the sys_ drawing
libraries. It also fixes the following compile error:

  LD      .tmp_vmlinux1
drivers/built-in.o:(.data+0x8b48): undefined reference to `cfb_fillrect'
drivers/built-in.o:(.data+0x8b50): undefined reference to `cfb_copyarea'
drivers/built-in.o:(.data+0x8b58): undefined reference to `cfb_imageblit'

[adaplas]
Use fb_sys_read/write for the same reasons as above.

Signed-off-by: default avatarAvuton Olrich <avuton@gmail.com>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 38d473f9

drivers/auxdisplay/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ config CFAG12864B 
	depends on X86

	depends on FB

	depends on KS0108

	select FB_SYS_FILLRECT

	select FB_SYS_COPYAREA

	select FB_SYS_IMAGEBLIT

	select FB_SYS_FOPS

	default n

	---help---

	  If you have a Crystalfontz 128x64 2-color LCD, cfag12864b Series,

drivers/auxdisplay/cfag12864bfb.c

+5 −3
Original line number Diff line number Diff line
@@ -73,9 +73,11 @@ static int cfag12864bfb_mmap(struct fb_info *info, struct vm_area_struct *vma) 


static struct fb_ops cfag12864bfb_ops = {

	.owner = THIS_MODULE,

	.fb_fillrect = cfb_fillrect,

	.fb_copyarea = cfb_copyarea,

	.fb_imageblit = cfb_imageblit,

	.fb_read = fb_sys_read,

	.fb_write = fb_sys_write,

	.fb_fillrect = sys_fillrect,

	.fb_copyarea = sys_copyarea,

	.fb_imageblit = sys_imageblit,

	.fb_mmap = cfag12864bfb_mmap,

};