Skip to content

Commit 6ebf23b

Browse files
committed
drm/radeon: Use regular fbdev I/O helpers
Use the regular fbdev helpers for framebuffer I/O instead of DRM's helpers. Radeon 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: Alex Deucher <alexander.deucher@amd.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230530151228.22979-7-tzimmermann@suse.de
1 parent 7fca1dd commit 6ebf23b

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

drivers/gpu/drm/radeon/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ config DRM_RADEON
1111
select DRM_SUBALLOC_HELPER
1212
select DRM_TTM
1313
select DRM_TTM_HELPER
14+
select FB_IO_HELPERS if DRM_FBDEV_EMULATION
1415
select SND_HDA_COMPONENT if SND_HDA_CORE
1516
select POWER_SUPPLY
1617
select HWMON

drivers/gpu/drm/radeon/radeon_fbdev.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
* David Airlie
2525
*/
2626

27+
#include <linux/fb.h>
2728
#include <linux/pci.h>
2829
#include <linux/pm_runtime.h>
2930
#include <linux/vga_switcheroo.h>
@@ -190,14 +191,10 @@ static void radeon_fbdev_fb_destroy(struct fb_info *info)
190191

191192
static const struct fb_ops radeon_fbdev_fb_ops = {
192193
.owner = THIS_MODULE,
193-
DRM_FB_HELPER_DEFAULT_OPS,
194194
.fb_open = radeon_fbdev_fb_open,
195195
.fb_release = radeon_fbdev_fb_release,
196-
.fb_read = drm_fb_helper_cfb_read,
197-
.fb_write = drm_fb_helper_cfb_write,
198-
.fb_fillrect = drm_fb_helper_cfb_fillrect,
199-
.fb_copyarea = drm_fb_helper_cfb_copyarea,
200-
.fb_imageblit = drm_fb_helper_cfb_imageblit,
196+
FB_DEFAULT_IO_OPS,
197+
DRM_FB_HELPER_DEFAULT_OPS,
201198
.fb_destroy = radeon_fbdev_fb_destroy,
202199
};
203200

0 commit comments

Comments
 (0)