diff options
Diffstat (limited to 'arch/sparc/include/asm/fb.h')
| -rw-r--r-- | arch/sparc/include/asm/fb.h | 47 | 
1 files changed, 27 insertions, 20 deletions
| diff --git a/arch/sparc/include/asm/fb.h b/arch/sparc/include/asm/fb.h index f699962e9ddf..572ecd3e1cc4 100644 --- a/arch/sparc/include/asm/fb.h +++ b/arch/sparc/include/asm/fb.h @@ -1,34 +1,41 @@  /* SPDX-License-Identifier: GPL-2.0 */  #ifndef _SPARC_FB_H_  #define _SPARC_FB_H_ -#include <linux/console.h> -#include <linux/fb.h> -#include <linux/fs.h> -#include <asm/page.h> -#include <asm/prom.h> +#include <linux/io.h> + +struct fb_info; +struct file; +struct vm_area_struct; + +#ifdef CONFIG_SPARC32  static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,  				unsigned long off) -{ -#ifdef CONFIG_SPARC64 -	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); +{ } +#define fb_pgprotect fb_pgprotect  #endif -} -static inline int fb_is_primary_device(struct fb_info *info) -{ -	struct device *dev = info->device; -	struct device_node *node; +int fb_is_primary_device(struct fb_info *info); +#define fb_is_primary_device fb_is_primary_device -	if (console_set_on_cmdline) -		return 0; +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_fromio fb_memcpy_fromio -	node = dev->of_node; -	if (node && -	    node == of_console_device) -		return 1; +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_toio fb_memcpy_toio -	return 0; +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_io + +#include <asm-generic/fb.h>  #endif /* _SPARC_FB_H_ */ | 
