iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fbdev: Rename fb_mem*() helpers

Browse Source 
Update the names of the fb_mem*() helpers to be consistent with their
regular counterparts. Hence, fb_memset() now becomes fb_memset_io(),
fb_memcpy_fromfb() now becomes fb_memcpy_fromio() and fb_memcpy_tofb()
becomes fb_memcpy_toio(). No functional changes.

v6:
	* update new file fb_io_fops.c

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Sui Jingfeng <suijingfeng@loongson.cn>
Link: https://patchwork.freedesktop.org/patch/msgid/20230512102444.5438-8-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2023-05-12 12:24:44 +02:00
parent 8f8eaa1b02
commit 20d54e48d9
12 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/ia64/include/asm/fb.h
View File

@ -20,23 +20,23 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
}
#define fb_pgprotect fb_pgprotect
static inline void fb_memcpy_fromfb(void *to, const volatile void __iomem *from, size_t n)
static inline void fb_memcpy_fromio(void *to, const volatile void __iomem *from, size_t n)
{
memcpy(to, (void __force *)from, n);
}
#define fb_memcpy_fromfb fb_memcpy_fromfb
#define fb_memcpy_fromio fb_memcpy_fromio
static inline void fb_memcpy_tofb(volatile void __iomem *to, const void *from, size_t n)
static inline void fb_memcpy_toio(volatile void __iomem *to, const void *from, size_t n)
{
memcpy((void __force *)to, from, n);
}
#define fb_memcpy_tofb fb_memcpy_tofb
#define fb_memcpy_toio fb_memcpy_toio
static inline void fb_memset(volatile void __iomem *addr, int c, size_t n)
static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n)
{
memset((void __force *)addr, c, n);
}
#define fb_memset fb_memset
#define fb_memset fb_memset_io
#include <asm-generic/fb.h>

12
arch/loongarch/include/asm/fb.h
View File

@ -8,23 +8,23 @@
#include <linux/compiler.h>
#include <linux/string.h>
static inline void fb_memcpy_fromfb(void *to, const volatile void __iomem *from, size_t n)
static inline void fb_memcpy_fromio(void *to, const volatile void __iomem *from, size_t n)
{
memcpy(to, (void __force *)from, n);
}
#define fb_memcpy_fromfb fb_memcpy_fromfb
#define fb_memcpy_fromio fb_memcpy_fromio
static inline void fb_memcpy_tofb(volatile void __iomem *to, const void *from, size_t n)
static inline void fb_memcpy_toio(volatile void __iomem *to, const void *from, size_t n)
{
memcpy((void __force *)to, from, n);
}
#define fb_memcpy_tofb fb_memcpy_tofb
#define fb_memcpy_toio fb_memcpy_toio
static inline void fb_memset(volatile void __iomem *addr, int c, size_t n)
static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n)
{
memset((void __force *)addr, c, n);
}
#define fb_memset fb_memset
#define fb_memset fb_memset_io
#include <asm-generic/fb.h>

12
arch/sparc/include/asm/fb.h
View File

@ -18,23 +18,23 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
int fb_is_primary_device(struct fb_info *info);
#define fb_is_primary_device fb_is_primary_device
static inline void fb_memcpy_fromfb(void *to, const volatile void __iomem *from, size_t n)
static inline void fb_memcpy_fromio(void *to, const volatile void __iomem *from, size_t n)
{
sbus_memcpy_fromio(to, from, n);
}
#define fb_memcpy_fromfb fb_memcpy_fromfb
#define fb_memcpy_fromio fb_memcpy_fromio
static inline void fb_memcpy_tofb(volatile void __iomem *to, const void *from, size_t n)
static inline void fb_memcpy_toio(volatile void __iomem *to, const void *from, size_t n)
{
sbus_memcpy_toio(to, from, n);
}
#define fb_memcpy_tofb fb_memcpy_tofb
#define fb_memcpy_toio fb_memcpy_toio
static inline void fb_memset(volatile void __iomem *addr, int c, size_t n)
static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n)
{
sbus_memset_io(addr, c, n);
}
#define fb_memset fb_memset
#define fb_memset fb_memset_io
#include <asm-generic/fb.h>

2
drivers/video/fbdev/aty/mach64_cursor.c
View File

@ -153,7 +153,7 @@ static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
u8 m, b;
// Clear cursor image with 1010101010...
fb_memset(dst, 0xaa, 1024);
fb_memset_io(dst, 0xaa, 1024);
offset = align - width*2;

2
drivers/video/fbdev/chipsfb.c
View File

@ -332,7 +332,7 @@ static const struct fb_var_screeninfo chipsfb_var = {
static void init_chips(struct fb_info *p, unsigned long addr)
{
fb_memset(p->screen_base, 0, 0x100000);
fb_memset_io(p->screen_base, 0, 0x100000);
p->fix = chipsfb_fix;
p->fix.smem_start = addr;

4
drivers/video/fbdev/core/fb_io_fops.c
View File

@ -42,7 +42,7 @@ ssize_t fb_io_read(struct fb_info *info, char __user *buf, size_t count, loff_t
while (count) {
c = (count > PAGE_SIZE) ? PAGE_SIZE : count;
dst = buffer;
fb_memcpy_fromfb(dst, src, c);
fb_memcpy_fromio(dst, src, c);
dst += c;
src += c;
@ -117,7 +117,7 @@ ssize_t fb_io_write(struct fb_info *info, const char __user *buf, size_t count,
}
c -= trailing;
fb_memcpy_tofb(dst, src, c);
fb_memcpy_toio(dst, src, c);
dst += c;
src += c;
*ppos += c;

2
drivers/video/fbdev/kyro/fbdev.c
View File

@ -737,7 +737,7 @@ static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
info->var.bits_per_pixel);
size *= info->var.yres_virtual;
fb_memset(info->screen_base, 0, size);
fb_memset_io(info->screen_base, 0, size);
if (register_framebuffer(info) < 0)
goto out_unmap;

2
drivers/video/fbdev/pvr2fb.c
View File

@ -801,7 +801,7 @@ static int __maybe_unused pvr2fb_common_init(void)
goto out_err;
}
fb_memset(fb_info->screen_base, 0, pvr2_fix.smem_len);
fb_memset_io(fb_info->screen_base, 0, pvr2_fix.smem_len);
pvr2_fix.ypanstep = nopan ? 0 : 1;
pvr2_fix.ywrapstep = nowrap ? 0 : 1;

2
drivers/video/fbdev/sstfb.c
View File

@ -335,7 +335,7 @@ static int sst_calc_pll(const int freq, int *freq_out, struct pll_timing *t)
static void sstfb_clear_screen(struct fb_info *info)
{
/* clear screen */
fb_memset(info->screen_base, 0, info->fix.smem_len);
fb_memset_io(info->screen_base, 0, info->fix.smem_len);
}

4
drivers/video/fbdev/stifb.c
View File

@ -527,8 +527,8 @@ rattlerSetupPlanes(struct stifb_info *fb)
fb->id = saved_id;
for (y = 0; y < fb->info.var.yres; ++y)
fb_memset(fb->info.screen_base + y * fb->info.fix.line_length,
0xff, fb->info.var.xres * fb->info.var.bits_per_pixel/8);
fb_memset_io(fb->info.screen_base + y * fb->info.fix.line_length,
0xff, fb->info.var.xres * fb->info.var.bits_per_pixel/8);
CRX24_SET_OVLY_MASK(fb);
SETUP_FB(fb);

2
drivers/video/fbdev/tdfxfb.c
View File

@ -1116,7 +1116,7 @@ static int tdfxfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
u8 *mask = (u8 *)cursor->mask;
int i;
fb_memset(cursorbase, 0, 1024);
fb_memset_io(cursorbase, 0, 1024);
for (i = 0; i < cursor->image.height; i++) {
int h = 0;

16
include/asm-generic/fb.h
View File

@ -108,28 +108,28 @@ static inline void fb_writeq(u64 b, volatile void __iomem *addr)
#endif
#endif
#ifndef fb_memcpy_fromfb
static inline void fb_memcpy_fromfb(void *to, const volatile void __iomem *from, size_t n)
#ifndef fb_memcpy_fromio
static inline void fb_memcpy_fromio(void *to, const volatile void __iomem *from, size_t n)
{
memcpy_fromio(to, from, n);
}
#define fb_memcpy_fromfb fb_memcpy_fromfb
#define fb_memcpy_fromio fb_memcpy_fromio
#endif
#ifndef fb_memcpy_tofb
static inline void fb_memcpy_tofb(volatile void __iomem *to, const void *from, size_t n)
#ifndef fb_memcpy_toio
static inline void fb_memcpy_toio(volatile void __iomem *to, const void *from, size_t n)
{
memcpy_toio(to, from, n);
}
#define fb_memcpy_tofb fb_memcpy_tofb
#define fb_memcpy_toio fb_memcpy_toio
#endif
#ifndef fb_memset
static inline void fb_memset(volatile void __iomem *addr, int c, size_t n)
static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n)
{
memset_io(addr, c, n);
}
#define fb_memset fb_memset
#define fb_memset fb_memset_io
#endif
#endif /* __ASM_GENERIC_FB_H_ */