fbdev/broadsheetfb: Generate deferred I/O ops

Use the existing generator macros to create deferred-I/O helpers
for broadsheetfb and set them in the fb_ops structure. Functions
for damage handling on memory ranges and areas are provided by
the driver.

Broadsheedfb's implementation of fb_write writes to system memory,
so the generated code can use the respective helper internally.
This also fixes a long-standing bug where fb_write returned an
errno code instead of the number of written bytes. See the commit
message of commit 921b7383f3 ("fbdev: Return number of bytes
read or written") for more details.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Helge Deller <deller@gmx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230706151432.20674-3-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2023-07-06 17:08:45 +02:00
parent 2323ebce32
commit a1ce2014c0

View file

@ -970,90 +970,28 @@ static void broadsheetfb_dpy_deferred_io(struct fb_info *info, struct list_head
}
}
static void broadsheetfb_fillrect(struct fb_info *info,
const struct fb_fillrect *rect)
static void broadsheetfb_defio_damage_range(struct fb_info *info, off_t off, size_t len)
{
struct broadsheetfb_par *par = info->par;
sys_fillrect(info, rect);
broadsheetfb_dpy_update(par);
}
static void broadsheetfb_copyarea(struct fb_info *info,
const struct fb_copyarea *area)
static void broadsheetfb_defio_damage_area(struct fb_info *info, u32 x, u32 y,
u32 width, u32 height)
{
struct broadsheetfb_par *par = info->par;
sys_copyarea(info, area);
broadsheetfb_dpy_update(par);
}
static void broadsheetfb_imageblit(struct fb_info *info,
const struct fb_image *image)
{
struct broadsheetfb_par *par = info->par;
sys_imageblit(info, image);
broadsheetfb_dpy_update(par);
}
/*
* this is the slow path from userspace. they can seek and write to
* the fb. it's inefficient to do anything less than a full screen draw
*/
static ssize_t broadsheetfb_write(struct fb_info *info, const char __user *buf,
size_t count, loff_t *ppos)
{
struct broadsheetfb_par *par = info->par;
unsigned long p = *ppos;
void *dst;
int err = 0;
unsigned long total_size;
if (!info->screen_buffer)
return -ENODEV;
total_size = info->fix.smem_len;
if (p > total_size)
return -EFBIG;
if (count > total_size) {
err = -EFBIG;
count = total_size;
}
if (count + p > total_size) {
if (!err)
err = -ENOSPC;
count = total_size - p;
}
dst = info->screen_buffer + p;
if (copy_from_user(dst, buf, count))
err = -EFAULT;
if (!err)
*ppos += count;
broadsheetfb_dpy_update(par);
return (err) ? err : count;
}
FB_GEN_DEFAULT_DEFERRED_SYS_OPS(broadsheetfb,
broadsheetfb_defio_damage_range,
broadsheetfb_defio_damage_area)
static const struct fb_ops broadsheetfb_ops = {
.owner = THIS_MODULE,
.fb_read = fb_sys_read,
.fb_write = broadsheetfb_write,
.fb_fillrect = broadsheetfb_fillrect,
.fb_copyarea = broadsheetfb_copyarea,
.fb_imageblit = broadsheetfb_imageblit,
.fb_mmap = fb_deferred_io_mmap,
.owner = THIS_MODULE,
FB_DEFAULT_DEFERRED_OPS(broadsheetfb),
};
static struct fb_deferred_io broadsheetfb_defio = {