Skip to content

Commit 95da53d

Browse files
committed
drm/omapdrm: Use regular fbdev I/O helpers
Use the regular fbdev helpers for framebuffer I/O instead of DRM's helpers. Omapdrm 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_SYS_HELPERS option Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Sam Ravnborg <sam@ravnborg.org> Cc: Tomi Valkeinen <tomba@kernel.org> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230530151228.22979-9-tzimmermann@suse.de
1 parent 859cc65 commit 95da53d

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

drivers/gpu/drm/omapdrm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ config DRM_OMAP
44
depends on DRM && OF
55
depends on ARCH_OMAP2PLUS
66
select DRM_KMS_HELPER
7+
select FB_SYS_HELPERS if DRM_FBDEV_EMULATION
78
select VIDEOMODE_HELPERS
89
select HDMI
910
default n

drivers/gpu/drm/omapdrm/omap_fbdev.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* Author: Rob Clark <rob@ti.com>
55
*/
66

7+
#include <linux/fb.h>
8+
79
#include <drm/drm_drv.h>
810
#include <drm/drm_crtc_helper.h>
911
#include <drm/drm_fb_helper.h>
@@ -95,20 +97,13 @@ static void omap_fbdev_fb_destroy(struct fb_info *info)
9597

9698
static const struct fb_ops omap_fb_ops = {
9799
.owner = THIS_MODULE,
98-
100+
FB_DEFAULT_SYS_OPS,
99101
.fb_check_var = drm_fb_helper_check_var,
100102
.fb_set_par = drm_fb_helper_set_par,
101103
.fb_setcmap = drm_fb_helper_setcmap,
102104
.fb_blank = drm_fb_helper_blank,
103105
.fb_pan_display = omap_fbdev_pan_display,
104106
.fb_ioctl = drm_fb_helper_ioctl,
105-
106-
.fb_read = drm_fb_helper_sys_read,
107-
.fb_write = drm_fb_helper_sys_write,
108-
.fb_fillrect = drm_fb_helper_sys_fillrect,
109-
.fb_copyarea = drm_fb_helper_sys_copyarea,
110-
.fb_imageblit = drm_fb_helper_sys_imageblit,
111-
112107
.fb_destroy = omap_fbdev_fb_destroy,
113108
};
114109

0 commit comments

Comments
 (0)