Skip to content

Commit 556c6dd

Browse files
committed
fbdev/xilinxfb: Use fbdev I/O helpers
Set struct fb_ops and with FB_DEFAULT_IOMEM_OPS, fbdev's initializer for I/O memory. Sets the callbacks to the cfb_ and fb_io_ functions. Select the correct modules with Kconfig's FB_IOMEM_HELPERS token. The macro and token set the currently selected values, so there is no functional change. v3: * use _IOMEM_ in commit message v2: * updated to use _IOMEM_ tokens Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Acked-by: Helge Deller <deller@gmx.de> Cc: Michal Simek <michal.simek@amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230803184034.6456-47-tzimmermann@suse.de
1 parent 517c00c commit 556c6dd

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

drivers/video/fbdev/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,9 +1742,7 @@ config FB_PS3_DEFAULT_SIZE_M
17421742
config FB_XILINX
17431743
tristate "Xilinx frame buffer support"
17441744
depends on FB && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
1745-
select FB_CFB_FILLRECT
1746-
select FB_CFB_COPYAREA
1747-
select FB_CFB_IMAGEBLIT
1745+
select FB_IOMEM_HELPERS
17481746
help
17491747
Include support for the Xilinx ML300/ML403 reference design
17501748
framebuffer. ML300 carries a 640*480 LCD display on the board,

drivers/video/fbdev/xilinxfb.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,9 @@ xilinx_fb_blank(int blank_mode, struct fb_info *fbi)
251251

252252
static const struct fb_ops xilinxfb_ops = {
253253
.owner = THIS_MODULE,
254+
FB_DEFAULT_IOMEM_OPS,
254255
.fb_setcolreg = xilinx_fb_setcolreg,
255256
.fb_blank = xilinx_fb_blank,
256-
.fb_fillrect = cfb_fillrect,
257-
.fb_copyarea = cfb_copyarea,
258-
.fb_imageblit = cfb_imageblit,
259257
};
260258

261259
/* ---------------------------------------------------------------------

0 commit comments

Comments
 (0)