Skip to content

Commit eb958c9

Browse files
committed
drm/armada: Use regular fbdev I/O helpers
Use the regular fbdev helpers for framebuffer I/O instead of DRM's helpers. Armada does not use damage handling, so DRM's fbdev helpers are mere wrappers around the fbdev code. By using fbdev helpers directly within each DRM fbdev emulation, we can eventually remove DRM's wrapper functions entirely. v4: * use initializer macros for struct fb_ops v2: * use FB_IO_HELPERS option Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Sam Ravnborg <sam@ravnborg.org> Cc: Russell King <linux@armlinux.org.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20230530151228.22979-4-tzimmermann@suse.de
1 parent f1061fa commit eb958c9

2 files changed

Lines changed: 3 additions & 5 deletions

File tree

drivers/gpu/drm/armada/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ config DRM_ARMADA
33
tristate "DRM support for Marvell Armada SoCs"
44
depends on DRM && HAVE_CLK && ARM && MMU
55
select DRM_KMS_HELPER
6+
select FB_IO_HELPERS if DRM_FBDEV_EMULATION
67
help
78
Support the "LCD" controllers found on the Marvell Armada 510
89
devices. There are two controllers on the device, each controller

drivers/gpu/drm/armada/armada_fbdev.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
#include <linux/errno.h>
8+
#include <linux/fb.h>
89
#include <linux/kernel.h>
910
#include <linux/module.h>
1011

@@ -33,12 +34,8 @@ static void armada_fbdev_fb_destroy(struct fb_info *info)
3334

3435
static const struct fb_ops armada_fb_ops = {
3536
.owner = THIS_MODULE,
37+
FB_DEFAULT_IO_OPS,
3638
DRM_FB_HELPER_DEFAULT_OPS,
37-
.fb_read = drm_fb_helper_cfb_read,
38-
.fb_write = drm_fb_helper_cfb_write,
39-
.fb_fillrect = drm_fb_helper_cfb_fillrect,
40-
.fb_copyarea = drm_fb_helper_cfb_copyarea,
41-
.fb_imageblit = drm_fb_helper_cfb_imageblit,
4239
.fb_destroy = armada_fbdev_fb_destroy,
4340
};
4441

0 commit comments

Comments
 (0)