mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-28 16:52:18 +00:00
2fd001cd36
The per-architecture fbdev code has no dependencies on fbdev and can be used for any video-related subsystem. Rename the files to 'video'. Use video-sti.c on parisc as the source file depends on CONFIG_STI_CORE. On arc, arm, arm64, sh, and um the asm header file is an empty wrapper around the file in asm-generic. Let Kbuild generate the file. The build system does this automatically. Only um needs to generate video.h explicitly, so that it overrides the host architecture's header. The latter would otherwise interfere with the build. Further update all includes statements, include guards, and Makefiles. Also update a few strings and comments to refer to video instead of fbdev. v3: - arc, arm, arm64, sh: generate asm header via build system (Sam, Helge, Arnd) - um: rename fb.h to video.h - fix typo in commit message (Sam) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Cc: Vineet Gupta <vgupta@kernel.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: WANG Xuerui <kernel@xen0n.name> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Helge Deller <deller@gmx.de> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Nicholas Piggin <npiggin@gmail.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Rich Felker <dalias@libc.org> Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Cc: "David S. Miller" <davem@davemloft.net> Cc: Andreas Larsson <andreas@gaisler.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: x86@kernel.org Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
137 lines
2.9 KiB
C
137 lines
2.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
|
|
#ifndef __ASM_GENERIC_VIDEO_H_
|
|
#define __ASM_GENERIC_VIDEO_H_
|
|
|
|
/*
|
|
* Only include this header file from your architecture's <asm/fb.h>.
|
|
*/
|
|
|
|
#include <linux/io.h>
|
|
#include <linux/mm_types.h>
|
|
#include <linux/pgtable.h>
|
|
#include <linux/types.h>
|
|
|
|
struct device;
|
|
|
|
#ifndef pgprot_framebuffer
|
|
#define pgprot_framebuffer pgprot_framebuffer
|
|
static inline pgprot_t pgprot_framebuffer(pgprot_t prot,
|
|
unsigned long vm_start, unsigned long vm_end,
|
|
unsigned long offset)
|
|
{
|
|
return pgprot_writecombine(prot);
|
|
}
|
|
#endif
|
|
|
|
#ifndef video_is_primary_device
|
|
#define video_is_primary_device video_is_primary_device
|
|
static inline bool video_is_primary_device(struct device *dev)
|
|
{
|
|
return false;
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* I/O helpers for the framebuffer. Prefer these functions over their
|
|
* regular counterparts. The regular I/O functions provide in-order
|
|
* access and swap bytes to/from little-endian ordering. Neither is
|
|
* required for framebuffers. Instead, the helpers read and write
|
|
* raw framebuffer data. Independent operations can be reordered for
|
|
* improved performance.
|
|
*/
|
|
|
|
#ifndef fb_readb
|
|
static inline u8 fb_readb(const volatile void __iomem *addr)
|
|
{
|
|
return __raw_readb(addr);
|
|
}
|
|
#define fb_readb fb_readb
|
|
#endif
|
|
|
|
#ifndef fb_readw
|
|
static inline u16 fb_readw(const volatile void __iomem *addr)
|
|
{
|
|
return __raw_readw(addr);
|
|
}
|
|
#define fb_readw fb_readw
|
|
#endif
|
|
|
|
#ifndef fb_readl
|
|
static inline u32 fb_readl(const volatile void __iomem *addr)
|
|
{
|
|
return __raw_readl(addr);
|
|
}
|
|
#define fb_readl fb_readl
|
|
#endif
|
|
|
|
#ifndef fb_readq
|
|
#if defined(__raw_readq)
|
|
static inline u64 fb_readq(const volatile void __iomem *addr)
|
|
{
|
|
return __raw_readq(addr);
|
|
}
|
|
#define fb_readq fb_readq
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef fb_writeb
|
|
static inline void fb_writeb(u8 b, volatile void __iomem *addr)
|
|
{
|
|
__raw_writeb(b, addr);
|
|
}
|
|
#define fb_writeb fb_writeb
|
|
#endif
|
|
|
|
#ifndef fb_writew
|
|
static inline void fb_writew(u16 b, volatile void __iomem *addr)
|
|
{
|
|
__raw_writew(b, addr);
|
|
}
|
|
#define fb_writew fb_writew
|
|
#endif
|
|
|
|
#ifndef fb_writel
|
|
static inline void fb_writel(u32 b, volatile void __iomem *addr)
|
|
{
|
|
__raw_writel(b, addr);
|
|
}
|
|
#define fb_writel fb_writel
|
|
#endif
|
|
|
|
#ifndef fb_writeq
|
|
#if defined(__raw_writeq)
|
|
static inline void fb_writeq(u64 b, volatile void __iomem *addr)
|
|
{
|
|
__raw_writeq(b, addr);
|
|
}
|
|
#define fb_writeq fb_writeq
|
|
#endif
|
|
#endif
|
|
|
|
#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_fromio fb_memcpy_fromio
|
|
#endif
|
|
|
|
#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_toio fb_memcpy_toio
|
|
#endif
|
|
|
|
#ifndef fb_memset
|
|
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_io
|
|
#endif
|
|
|
|
#endif /* __ASM_GENERIC_VIDEO_H_ */
|