| Message ID | 20230828132131.29295-3-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 1e3c721664e3ab580b7ebca75b9bb62487baa0bc |
| Headers | show |
| Series | fbdev: Use helpers for deferred I/O | expand |
Thomas Zimmermann <tzimmermann@suse.de> writes: > Generate callback functions for struct fb_ops with the fbdev macro > FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(). Initialize struct fb_ops to > the generated functions with fbdev initializer macros. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Bernie Thompson <bernie@plugable.com> > --- Acked-by: Javier Martinez Canillas <javierm@redhat.com> [...] > +static void dlfb_ops_damage_range(struct fb_info *info, off_t off, size_t len) > +{ > + struct dlfb_data *dlfb = info->par; > + int start = max((int)(off / info->fix.line_length), 0); > + int lines = min((u32)((len / info->fix.line_length) + 1), (u32)info->var.yres); > + > + dlfb_handle_damage(dlfb, 0, start, info->var.xres, lines); > +} > + > +static void dlfb_ops_damage_area(struct fb_info *info, u32 x, u32 y, u32 width, u32 height) > +{ > + struct dlfb_data *dlfb = info->par; > + > + dlfb_offload_damage(dlfb, x, y, width, height); > +} > + These two are very similar to the helpers you added for the smscufx driver in patch #1. I guess there's room for further consolidation as follow-up ?
Am 04.09.23 um 15:05 schrieb Javier Martinez Canillas: > Thomas Zimmermann <tzimmermann@suse.de> writes: > >> Generate callback functions for struct fb_ops with the fbdev macro >> FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(). Initialize struct fb_ops to >> the generated functions with fbdev initializer macros. >> >> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >> Cc: Bernie Thompson <bernie@plugable.com> >> --- > > Acked-by: Javier Martinez Canillas <javierm@redhat.com> > > [...] > >> +static void dlfb_ops_damage_range(struct fb_info *info, off_t off, size_t len) >> +{ >> + struct dlfb_data *dlfb = info->par; >> + int start = max((int)(off / info->fix.line_length), 0); >> + int lines = min((u32)((len / info->fix.line_length) + 1), (u32)info->var.yres); >> + >> + dlfb_handle_damage(dlfb, 0, start, info->var.xres, lines); >> +} >> + >> +static void dlfb_ops_damage_area(struct fb_info *info, u32 x, u32 y, u32 width, u32 height) >> +{ >> + struct dlfb_data *dlfb = info->par; >> + >> + dlfb_offload_damage(dlfb, x, y, width, height); >> +} >> + > > These two are very similar to the helpers you added for the smscufx driver > in patch #1. I guess there's room for further consolidation as follow-up ? Maybe. I had patches that take the rectangle computation from [1] and turn it into a helper for these USB drivers. But it's an unrelated change, so I dropped them from this patchset. Best regards Thomas [1] https://elixir.bootlin.com/linux/v6.5.1/source/drivers/gpu/drm/drm_fb_helper.c#L641 >
Thomas Zimmermann <tzimmermann@suse.de> writes: > Am 04.09.23 um 15:05 schrieb Javier Martinez Canillas: >> Thomas Zimmermann <tzimmermann@suse.de> writes: >> >>> Generate callback functions for struct fb_ops with the fbdev macro >>> FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(). Initialize struct fb_ops to >>> the generated functions with fbdev initializer macros. >>> >>> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >>> Cc: Bernie Thompson <bernie@plugable.com> >>> --- >> >> Acked-by: Javier Martinez Canillas <javierm@redhat.com> >> >> [...] >> >>> +static void dlfb_ops_damage_range(struct fb_info *info, off_t off, size_t len) >>> +{ >>> + struct dlfb_data *dlfb = info->par; >>> + int start = max((int)(off / info->fix.line_length), 0); >>> + int lines = min((u32)((len / info->fix.line_length) + 1), (u32)info->var.yres); >>> + >>> + dlfb_handle_damage(dlfb, 0, start, info->var.xres, lines); >>> +} >>> + >>> +static void dlfb_ops_damage_area(struct fb_info *info, u32 x, u32 y, u32 width, u32 height) >>> +{ >>> + struct dlfb_data *dlfb = info->par; >>> + >>> + dlfb_offload_damage(dlfb, x, y, width, height); >>> +} >>> + >> >> These two are very similar to the helpers you added for the smscufx driver >> in patch #1. I guess there's room for further consolidation as follow-up ? > > Maybe. I had patches that take the rectangle computation from [1] and > turn it into a helper for these USB drivers. But it's an unrelated > change, so I dropped them from this patchset. > Great and yes, I meant as separate patch-set, not as a part of this one. > Best regards > Thomas >
diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c index b70762ead13c..2460ff4ac86b 100644 --- a/drivers/video/fbdev/udlfb.c +++ b/drivers/video/fbdev/udlfb.c @@ -715,68 +715,6 @@ static void dlfb_offload_damage(struct dlfb_data *dlfb, int x, int y, int width, schedule_work(&dlfb->damage_work); } -/* - * Path triggered by usermode clients who write to filesystem - * e.g. cat filename > /dev/fb1 - * Not used by X Windows or text-mode console. But useful for testing. - * Slow because of extra copy and we must assume all pixels dirty. - */ -static ssize_t dlfb_ops_write(struct fb_info *info, const char __user *buf, - size_t count, loff_t *ppos) -{ - ssize_t result; - struct dlfb_data *dlfb = info->par; - u32 offset = (u32) *ppos; - - result = fb_sys_write(info, buf, count, ppos); - - if (result > 0) { - int start = max((int)(offset / info->fix.line_length), 0); - int lines = min((u32)((result / info->fix.line_length) + 1), - (u32)info->var.yres); - - dlfb_handle_damage(dlfb, 0, start, info->var.xres, - lines); - } - - return result; -} - -/* hardware has native COPY command (see libdlo), but not worth it for fbcon */ -static void dlfb_ops_copyarea(struct fb_info *info, - const struct fb_copyarea *area) -{ - - struct dlfb_data *dlfb = info->par; - - sys_copyarea(info, area); - - dlfb_offload_damage(dlfb, area->dx, area->dy, - area->width, area->height); -} - -static void dlfb_ops_imageblit(struct fb_info *info, - const struct fb_image *image) -{ - struct dlfb_data *dlfb = info->par; - - sys_imageblit(info, image); - - dlfb_offload_damage(dlfb, image->dx, image->dy, - image->width, image->height); -} - -static void dlfb_ops_fillrect(struct fb_info *info, - const struct fb_fillrect *rect) -{ - struct dlfb_data *dlfb = info->par; - - sys_fillrect(info, rect); - - dlfb_offload_damage(dlfb, rect->dx, rect->dy, rect->width, - rect->height); -} - /* * NOTE: fb_defio.c is holding info->fbdefio.mutex * Touching ANY framebuffer memory that triggers a page fault @@ -1186,14 +1124,31 @@ static int dlfb_ops_blank(int blank_mode, struct fb_info *info) return 0; } +static void dlfb_ops_damage_range(struct fb_info *info, off_t off, size_t len) +{ + struct dlfb_data *dlfb = info->par; + int start = max((int)(off / info->fix.line_length), 0); + int lines = min((u32)((len / info->fix.line_length) + 1), (u32)info->var.yres); + + dlfb_handle_damage(dlfb, 0, start, info->var.xres, lines); +} + +static void dlfb_ops_damage_area(struct fb_info *info, u32 x, u32 y, u32 width, u32 height) +{ + struct dlfb_data *dlfb = info->par; + + dlfb_offload_damage(dlfb, x, y, width, height); +} + +FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(dlfb_ops, + dlfb_ops_damage_range, + dlfb_ops_damage_area) + static const struct fb_ops dlfb_ops = { .owner = THIS_MODULE, - .fb_read = fb_sys_read, - .fb_write = dlfb_ops_write, + __FB_DEFAULT_DEFERRED_OPS_RDWR(dlfb_ops), .fb_setcolreg = dlfb_ops_setcolreg, - .fb_fillrect = dlfb_ops_fillrect, - .fb_copyarea = dlfb_ops_copyarea, - .fb_imageblit = dlfb_ops_imageblit, + __FB_DEFAULT_DEFERRED_OPS_DRAW(dlfb_ops), .fb_mmap = dlfb_ops_mmap, .fb_ioctl = dlfb_ops_ioctl, .fb_open = dlfb_ops_open,
Generate callback functions for struct fb_ops with the fbdev macro FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(). Initialize struct fb_ops to the generated functions with fbdev initializer macros. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: Bernie Thompson <bernie@plugable.com> --- drivers/video/fbdev/udlfb.c | 89 +++++++++---------------------------- 1 file changed, 22 insertions(+), 67 deletions(-)