Commit 744d35d3 authored by Thomas Zimmermann's avatar Thomas Zimmermann

fbdev: Align deferred I/O with naming of helpers

Deferred-I/O generator macros generate callbacks for struct fb_ops
that operate on memory ranges in I/O address space or system address
space. Rename the macros to use the _IOMEM_ and _SYSMEM_ infixes of
their underlying helpers. Adapt all users. No functional changes.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarHelge Deller <deller@gmx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230729193157.15446-5-tzimmermann@suse.de
parent b21f187f
...@@ -34,9 +34,9 @@ static int drm_fbdev_generic_fb_release(struct fb_info *info, int user) ...@@ -34,9 +34,9 @@ static int drm_fbdev_generic_fb_release(struct fb_info *info, int user)
return 0; return 0;
} }
FB_GEN_DEFAULT_DEFERRED_SYS_OPS(drm_fbdev_generic, FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(drm_fbdev_generic,
drm_fb_helper_damage_range, drm_fb_helper_damage_range,
drm_fb_helper_damage_area); drm_fb_helper_damage_area);
static void drm_fbdev_generic_fb_destroy(struct fb_info *info) static void drm_fbdev_generic_fb_destroy(struct fb_info *info)
{ {
......
...@@ -85,9 +85,9 @@ static void intel_fbdev_invalidate(struct intel_fbdev *ifbdev) ...@@ -85,9 +85,9 @@ static void intel_fbdev_invalidate(struct intel_fbdev *ifbdev)
intel_frontbuffer_invalidate(to_frontbuffer(ifbdev), ORIGIN_CPU); intel_frontbuffer_invalidate(to_frontbuffer(ifbdev), ORIGIN_CPU);
} }
FB_GEN_DEFAULT_DEFERRED_IO_OPS(intel_fbdev, FB_GEN_DEFAULT_DEFERRED_IOMEM_OPS(intel_fbdev,
drm_fb_helper_damage_range, drm_fb_helper_damage_range,
drm_fb_helper_damage_area) drm_fb_helper_damage_area)
static int intel_fbdev_set_par(struct fb_info *info) static int intel_fbdev_set_par(struct fb_info *info)
{ {
......
...@@ -25,9 +25,9 @@ module_param(fbdev, bool, 0600); ...@@ -25,9 +25,9 @@ module_param(fbdev, bool, 0600);
* fbdev funcs, to implement legacy fbdev interface on top of drm driver * fbdev funcs, to implement legacy fbdev interface on top of drm driver
*/ */
FB_GEN_DEFAULT_DEFERRED_SYS_OPS(msm_fbdev, FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(msm_fbdev,
drm_fb_helper_damage_range, drm_fb_helper_damage_range,
drm_fb_helper_damage_area) drm_fb_helper_damage_area)
static int msm_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma) static int msm_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma)
{ {
......
...@@ -985,9 +985,9 @@ static void broadsheetfb_defio_damage_area(struct fb_info *info, u32 x, u32 y, ...@@ -985,9 +985,9 @@ static void broadsheetfb_defio_damage_area(struct fb_info *info, u32 x, u32 y,
broadsheetfb_dpy_update(par); broadsheetfb_dpy_update(par);
} }
FB_GEN_DEFAULT_DEFERRED_SYS_OPS(broadsheetfb, FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(broadsheetfb,
broadsheetfb_defio_damage_range, broadsheetfb_defio_damage_range,
broadsheetfb_defio_damage_area) broadsheetfb_defio_damage_area)
static const struct fb_ops broadsheetfb_ops = { static const struct fb_ops broadsheetfb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -135,9 +135,9 @@ static void hecubafb_defio_damage_area(struct fb_info *info, u32 x, u32 y, ...@@ -135,9 +135,9 @@ static void hecubafb_defio_damage_area(struct fb_info *info, u32 x, u32 y,
hecubafb_dpy_update(par); hecubafb_dpy_update(par);
} }
FB_GEN_DEFAULT_DEFERRED_SYS_OPS(hecubafb, FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(hecubafb,
hecubafb_defio_damage_range, hecubafb_defio_damage_range,
hecubafb_defio_damage_area) hecubafb_defio_damage_area)
static const struct fb_ops hecubafb_ops = { static const struct fb_ops hecubafb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -498,9 +498,9 @@ static void metronomefb_defio_damage_area(struct fb_info *info, u32 x, u32 y, ...@@ -498,9 +498,9 @@ static void metronomefb_defio_damage_area(struct fb_info *info, u32 x, u32 y,
metronomefb_dpy_update(par); metronomefb_dpy_update(par);
} }
FB_GEN_DEFAULT_DEFERRED_SYS_OPS(metronomefb, FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(metronomefb,
metronomefb_defio_damage_range, metronomefb_defio_damage_range,
metronomefb_defio_damage_area) metronomefb_defio_damage_area)
static const struct fb_ops metronomefb_ops = { static const struct fb_ops metronomefb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -317,9 +317,9 @@ static void ssd1307fb_defio_damage_area(struct fb_info *info, u32 x, u32 y, ...@@ -317,9 +317,9 @@ static void ssd1307fb_defio_damage_area(struct fb_info *info, u32 x, u32 y,
ssd1307fb_update_rect(par, x, y, width, height); ssd1307fb_update_rect(par, x, y, width, height);
} }
FB_GEN_DEFAULT_DEFERRED_SYS_OPS(ssd1307fb, FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(ssd1307fb,
ssd1307fb_defio_damage_range, ssd1307fb_defio_damage_range,
ssd1307fb_defio_damage_area) ssd1307fb_defio_damage_area)
static const struct fb_ops ssd1307fb_ops = { static const struct fb_ops ssd1307fb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -306,9 +306,9 @@ static void xenfb_defio_damage_area(struct fb_info *info, u32 x, u32 y, ...@@ -306,9 +306,9 @@ static void xenfb_defio_damage_area(struct fb_info *info, u32 x, u32 y,
xenfb_refresh(xenfb_info, x, y, width, height); xenfb_refresh(xenfb_info, x, y, width, height);
} }
FB_GEN_DEFAULT_DEFERRED_SYS_OPS(xenfb, FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(xenfb,
xenfb_defio_damage_range, xenfb_defio_damage_range,
xenfb_defio_damage_area) xenfb_defio_damage_area)
static const struct fb_ops xenfb_fb_ops = { static const struct fb_ops xenfb_fb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -682,11 +682,11 @@ extern int fb_deferred_io_fsync(struct file *file, loff_t start, ...@@ -682,11 +682,11 @@ extern int fb_deferred_io_fsync(struct file *file, loff_t start,
__damage_area(info, image->dx, image->dy, image->width, image->height); \ __damage_area(info, image->dx, image->dy, image->width, image->height); \
} }
#define FB_GEN_DEFAULT_DEFERRED_IO_OPS(__prefix, __damage_range, __damage_area) \ #define FB_GEN_DEFAULT_DEFERRED_IOMEM_OPS(__prefix, __damage_range, __damage_area) \
__FB_GEN_DEFAULT_DEFERRED_OPS_RDWR(__prefix, __damage_range, io) \ __FB_GEN_DEFAULT_DEFERRED_OPS_RDWR(__prefix, __damage_range, io) \
__FB_GEN_DEFAULT_DEFERRED_OPS_DRAW(__prefix, __damage_area, cfb) __FB_GEN_DEFAULT_DEFERRED_OPS_DRAW(__prefix, __damage_area, cfb)
#define FB_GEN_DEFAULT_DEFERRED_SYS_OPS(__prefix, __damage_range, __damage_area) \ #define FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(__prefix, __damage_range, __damage_area) \
__FB_GEN_DEFAULT_DEFERRED_OPS_RDWR(__prefix, __damage_range, sys) \ __FB_GEN_DEFAULT_DEFERRED_OPS_RDWR(__prefix, __damage_range, sys) \
__FB_GEN_DEFAULT_DEFERRED_OPS_DRAW(__prefix, __damage_area, sys) __FB_GEN_DEFAULT_DEFERRED_OPS_DRAW(__prefix, __damage_area, sys)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment