| Message ID | 20240327204450.14914-4-tzimmermann@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | arch: Remove fbdev dependency from video helpers | expand |
Hi Thomas, On Wed, Mar 27, 2024 at 09:41:31PM +0100, Thomas Zimmermann wrote: > 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. > > Further update all includes statements, includ guards, and Makefiles. ^ missing 'e' > Also update a few strings and comments to refer to video instead of > fbdev. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > 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> If the patch is changed to use the Kbuild file to pick the generic variant of video.h then it is: Reviewed-by: Sam Ravnborg <sam@ravnborg.org> I also added an unrelated sparc comment, that can be addressed another time. Sam > --- > arch/arc/include/asm/fb.h | 8 -------- > arch/arc/include/asm/video.h | 8 ++++++++ > arch/arm/include/asm/fb.h | 6 ------ > arch/arm/include/asm/video.h | 6 ++++++ > arch/arm64/include/asm/fb.h | 10 ---------- > arch/arm64/include/asm/video.h | 10 ++++++++++ > arch/loongarch/include/asm/{fb.h => video.h} | 8 ++++---- > arch/m68k/include/asm/{fb.h => video.h} | 8 ++++---- > arch/mips/include/asm/{fb.h => video.h} | 12 ++++++------ > arch/parisc/include/asm/{fb.h => video.h} | 8 ++++---- > arch/parisc/video/Makefile | 2 +- > arch/parisc/video/{fbdev.c => video-sti.c} | 2 +- > arch/powerpc/include/asm/{fb.h => video.h} | 8 ++++---- > arch/powerpc/kernel/pci-common.c | 2 +- > arch/sh/include/asm/fb.h | 7 ------- > arch/sh/include/asm/video.h | 7 +++++++ > arch/sparc/include/asm/{fb.h => video.h} | 8 ++++---- > arch/sparc/video/Makefile | 2 +- > arch/sparc/video/{fbdev.c => video.c} | 4 ++-- > arch/x86/include/asm/{fb.h => video.h} | 8 ++++---- > arch/x86/video/Makefile | 2 +- > arch/x86/video/{fbdev.c => video.c} | 3 ++- > include/asm-generic/Kbuild | 2 +- > include/asm-generic/{fb.h => video.h} | 6 +++--- > include/linux/fb.h | 2 +- > 25 files changed, 75 insertions(+), 74 deletions(-) > delete mode 100644 arch/arc/include/asm/fb.h > create mode 100644 arch/arc/include/asm/video.h > delete mode 100644 arch/arm/include/asm/fb.h > create mode 100644 arch/arm/include/asm/video.h > delete mode 100644 arch/arm64/include/asm/fb.h > create mode 100644 arch/arm64/include/asm/video.h > rename arch/loongarch/include/asm/{fb.h => video.h} (86%) > rename arch/m68k/include/asm/{fb.h => video.h} (86%) > rename arch/mips/include/asm/{fb.h => video.h} (76%) > rename arch/parisc/include/asm/{fb.h => video.h} (68%) > rename arch/parisc/video/{fbdev.c => video-sti.c} (96%) > rename arch/powerpc/include/asm/{fb.h => video.h} (76%) > delete mode 100644 arch/sh/include/asm/fb.h > create mode 100644 arch/sh/include/asm/video.h > rename arch/sparc/include/asm/{fb.h => video.h} (89%) > rename arch/sparc/video/{fbdev.c => video.c} (86%) > rename arch/x86/include/asm/{fb.h => video.h} (77%) > rename arch/x86/video/{fbdev.c => video.c} (97%) > rename include/asm-generic/{fb.h => video.h} (96%) > > diff --git a/arch/arc/include/asm/fb.h b/arch/arc/include/asm/fb.h > deleted file mode 100644 > index 9c2383d29cbb9..0000000000000 > --- a/arch/arc/include/asm/fb.h > +++ /dev/null > @@ -1,8 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > - > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > - > -#include <asm-generic/fb.h> > - > -#endif /* _ASM_FB_H_ */ > diff --git a/arch/arc/include/asm/video.h b/arch/arc/include/asm/video.h > new file mode 100644 > index 0000000000000..8ff7263727fe7 > --- /dev/null > +++ b/arch/arc/include/asm/video.h > @@ -0,0 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > + > +#include <asm-generic/video.h> > + > +#endif /* _ASM_VIDEO_H_ */ arch/arc/include/asm/video.h only exists to pick include/asm-generic/video.h. The simpler way to do this is to add a line to: arch/arc/include/asm/Kbuild: + generic-y += video.h While touching the file I suggest to move to the simpler way using the Kbuild file. The same goes for all the other video.h files that only picks the asm-generic variant. > diff --git a/arch/arm/include/asm/fb.h b/arch/arm/include/asm/fb.h > deleted file mode 100644 > index ce20a43c30339..0000000000000 > --- a/arch/arm/include/asm/fb.h > +++ /dev/null > @@ -1,6 +0,0 @@ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > - > -#include <asm-generic/fb.h> > - > -#endif /* _ASM_FB_H_ */ > diff --git a/arch/arm/include/asm/video.h b/arch/arm/include/asm/video.h > new file mode 100644 > index 0000000000000..f570565366e67 > --- /dev/null > +++ b/arch/arm/include/asm/video.h > @@ -0,0 +1,6 @@ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > + > +#include <asm-generic/video.h> > + > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/arm64/include/asm/fb.h b/arch/arm64/include/asm/fb.h > deleted file mode 100644 > index 1a495d8fb2ce0..0000000000000 > --- a/arch/arm64/include/asm/fb.h > +++ /dev/null > @@ -1,10 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > -/* > - * Copyright (C) 2012 ARM Ltd. > - */ > -#ifndef __ASM_FB_H_ > -#define __ASM_FB_H_ > - > -#include <asm-generic/fb.h> > - > -#endif /* __ASM_FB_H_ */ > diff --git a/arch/arm64/include/asm/video.h b/arch/arm64/include/asm/video.h > new file mode 100644 > index 0000000000000..fe0e74983f4d9 > --- /dev/null > +++ b/arch/arm64/include/asm/video.h > @@ -0,0 +1,10 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright (C) 2012 ARM Ltd. > + */ > +#ifndef __ASM_VIDEO_H_ > +#define __ASM_VIDEO_H_ > + > +#include <asm-generic/video.h> > + > +#endif /* __ASM_VIDEO_H_ */ > diff --git a/arch/loongarch/include/asm/fb.h b/arch/loongarch/include/asm/video.h > similarity index 86% > rename from arch/loongarch/include/asm/fb.h > rename to arch/loongarch/include/asm/video.h > index 0b218b10a9ec3..9f76845f2d4fd 100644 > --- a/arch/loongarch/include/asm/fb.h > +++ b/arch/loongarch/include/asm/video.h > @@ -2,8 +2,8 @@ > /* > * Copyright (C) 2020-2022 Loongson Technology Corporation Limited > */ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > > #include <linux/compiler.h> > #include <linux/string.h> > @@ -26,6 +26,6 @@ static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n) > } > #define fb_memset fb_memset_io > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _ASM_FB_H_ */ > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/video.h > similarity index 86% > rename from arch/m68k/include/asm/fb.h > rename to arch/m68k/include/asm/video.h > index 9941b7434b696..6cf2194c413d8 100644 > --- a/arch/m68k/include/asm/fb.h > +++ b/arch/m68k/include/asm/video.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > > #include <asm/page.h> > #include <asm/setup.h> > @@ -27,6 +27,6 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, > } > #define pgprot_framebuffer pgprot_framebuffer > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _ASM_FB_H_ */ > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/mips/include/asm/fb.h b/arch/mips/include/asm/video.h > similarity index 76% > rename from arch/mips/include/asm/fb.h > rename to arch/mips/include/asm/video.h > index d98d6681d64ec..007c106d980fd 100644 > --- a/arch/mips/include/asm/fb.h > +++ b/arch/mips/include/asm/video.h > @@ -1,5 +1,5 @@ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > > #include <asm/page.h> > > @@ -13,8 +13,8 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, > > /* > * MIPS doesn't define __raw_ I/O macros, so the helpers > - * in <asm-generic/fb.h> don't generate fb_readq() and > - * fb_write(). We have to provide them here. > + * in <asm-generic/video.h> don't generate fb_readq() and > + * fb_writeq(). We have to provide them here. > * > * TODO: Convert MIPS to generic I/O. The helpers below can > * then be removed. > @@ -33,6 +33,6 @@ static inline void fb_writeq(u64 b, volatile void __iomem *addr) > #define fb_writeq fb_writeq > #endif > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _ASM_FB_H_ */ > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/parisc/include/asm/fb.h b/arch/parisc/include/asm/video.h > similarity index 68% > rename from arch/parisc/include/asm/fb.h > rename to arch/parisc/include/asm/video.h > index ed2a195a3e762..c5dff3223194a 100644 > --- a/arch/parisc/include/asm/fb.h > +++ b/arch/parisc/include/asm/video.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > > #include <linux/types.h> > > @@ -11,6 +11,6 @@ bool video_is_primary_device(struct device *dev); > #define video_is_primary_device video_is_primary_device > #endif > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _ASM_FB_H_ */ > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/parisc/video/Makefile b/arch/parisc/video/Makefile > index 16a73cce46612..b5db5b42880f8 100644 > --- a/arch/parisc/video/Makefile > +++ b/arch/parisc/video/Makefile > @@ -1,3 +1,3 @@ > # SPDX-License-Identifier: GPL-2.0-only > > -obj-$(CONFIG_STI_CORE) += fbdev.o > +obj-$(CONFIG_STI_CORE) += video-sti.o > diff --git a/arch/parisc/video/fbdev.c b/arch/parisc/video/video-sti.c > similarity index 96% > rename from arch/parisc/video/fbdev.c > rename to arch/parisc/video/video-sti.c > index 540fa0c919d59..564661e87093c 100644 > --- a/arch/parisc/video/fbdev.c > +++ b/arch/parisc/video/video-sti.c > @@ -9,7 +9,7 @@ > > #include <video/sticore.h> > > -#include <asm/fb.h> > +#include <asm/video.h> > > bool video_is_primary_device(struct device *dev) > { > diff --git a/arch/powerpc/include/asm/fb.h b/arch/powerpc/include/asm/video.h > similarity index 76% > rename from arch/powerpc/include/asm/fb.h > rename to arch/powerpc/include/asm/video.h > index c0c5d1df7ad1e..e1770114ffc36 100644 > --- a/arch/powerpc/include/asm/fb.h > +++ b/arch/powerpc/include/asm/video.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > > #include <asm/page.h> > > @@ -12,6 +12,6 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, > } > #define pgprot_framebuffer pgprot_framebuffer > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _ASM_FB_H_ */ > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c > index d95a48eff412e..eac84d687b53f 100644 > --- a/arch/powerpc/kernel/pci-common.c > +++ b/arch/powerpc/kernel/pci-common.c > @@ -517,7 +517,7 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, struct vm_area_struct *vma) > } > > /* > - * This one is used by /dev/mem and fbdev who have no clue about the > + * This one is used by /dev/mem and video who have no clue about the > * PCI device, it tries to find the PCI device first and calls the > * above routine > */ > diff --git a/arch/sh/include/asm/fb.h b/arch/sh/include/asm/fb.h > deleted file mode 100644 > index 19df13ee9ca73..0000000000000 > --- a/arch/sh/include/asm/fb.h > +++ /dev/null > @@ -1,7 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > - > -#include <asm-generic/fb.h> > - > -#endif /* _ASM_FB_H_ */ > diff --git a/arch/sh/include/asm/video.h b/arch/sh/include/asm/video.h > new file mode 100644 > index 0000000000000..14f49934a247a > --- /dev/null > +++ b/arch/sh/include/asm/video.h > @@ -0,0 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > + > +#include <asm-generic/video.h> > + > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/sparc/include/asm/fb.h b/arch/sparc/include/asm/video.h > similarity index 89% > rename from arch/sparc/include/asm/fb.h > rename to arch/sparc/include/asm/video.h > index 07f0325d6921c..a6f48f52db584 100644 > --- a/arch/sparc/include/asm/fb.h > +++ b/arch/sparc/include/asm/video.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _SPARC_FB_H_ > -#define _SPARC_FB_H_ > +#ifndef _SPARC_VIDEO_H_ > +#define _SPARC_VIDEO_H_ > > #include <linux/io.h> > #include <linux/types.h> > @@ -40,6 +40,6 @@ static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n) > } > #define fb_memset fb_memset_io > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _SPARC_FB_H_ */ > +#endif /* _SPARC_VIDEO_H_ */ > diff --git a/arch/sparc/video/Makefile b/arch/sparc/video/Makefile > index 9dd82880a027a..fdf83a408d750 100644 > --- a/arch/sparc/video/Makefile > +++ b/arch/sparc/video/Makefile > @@ -1,3 +1,3 @@ > # SPDX-License-Identifier: GPL-2.0-only > > -obj-y += fbdev.o > +obj-y += video.o > diff --git a/arch/sparc/video/fbdev.c b/arch/sparc/video/video.c > similarity index 86% > rename from arch/sparc/video/fbdev.c > rename to arch/sparc/video/video.c > index e46f0499c2774..2414380caadc9 100644 > --- a/arch/sparc/video/fbdev.c > +++ b/arch/sparc/video/video.c > @@ -4,8 +4,8 @@ > #include <linux/device.h> > #include <linux/module.h> > > -#include <asm/fb.h> > #include <asm/prom.h> > +#include <asm/video.h> > > bool video_is_primary_device(struct device *dev) > { > @@ -21,5 +21,5 @@ bool video_is_primary_device(struct device *dev) > } > EXPORT_SYMBOL(video_is_primary_device); > > -MODULE_DESCRIPTION("Sparc fbdev helpers"); > +MODULE_DESCRIPTION("Sparc video helpers"); > MODULE_LICENSE("GPL"); video.c is always built-in, so the MODULE_ things can be dropped. That is an unrelated clean-up so should not be part of this patch. > diff --git a/arch/x86/include/asm/fb.h b/arch/x86/include/asm/video.h > similarity index 77% > rename from arch/x86/include/asm/fb.h > rename to arch/x86/include/asm/video.h > index 999db33792869..0950c9535fae9 100644 > --- a/arch/x86/include/asm/fb.h > +++ b/arch/x86/include/asm/video.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _ASM_X86_FB_H > -#define _ASM_X86_FB_H > +#ifndef _ASM_X86_VIDEO_H > +#define _ASM_X86_VIDEO_H > > #include <linux/types.h> > > @@ -16,6 +16,6 @@ pgprot_t pgprot_framebuffer(pgprot_t prot, > bool video_is_primary_device(struct device *dev); > #define video_is_primary_device video_is_primary_device > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _ASM_X86_FB_H */ > +#endif /* _ASM_X86_VIDEO_H */ > diff --git a/arch/x86/video/Makefile b/arch/x86/video/Makefile > index 9dd82880a027a..fdf83a408d750 100644 > --- a/arch/x86/video/Makefile > +++ b/arch/x86/video/Makefile > @@ -1,3 +1,3 @@ > # SPDX-License-Identifier: GPL-2.0-only > > -obj-y += fbdev.o > +obj-y += video.o > diff --git a/arch/x86/video/fbdev.c b/arch/x86/video/video.c > similarity index 97% > rename from arch/x86/video/fbdev.c > rename to arch/x86/video/video.c > index 4d87ce8e257fe..81fc97a2a837a 100644 > --- a/arch/x86/video/fbdev.c > +++ b/arch/x86/video/video.c > @@ -10,7 +10,8 @@ > #include <linux/module.h> > #include <linux/pci.h> > #include <linux/vgaarb.h> > -#include <asm/fb.h> > + > +#include <asm/video.h> > > pgprot_t pgprot_framebuffer(pgprot_t prot, > unsigned long vm_start, unsigned long vm_end, > diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild > index d436bee4d129d..b20fa25a7e8d8 100644 > --- a/include/asm-generic/Kbuild > +++ b/include/asm-generic/Kbuild > @@ -22,7 +22,6 @@ mandatory-y += dma-mapping.h > mandatory-y += dma.h > mandatory-y += emergency-restart.h > mandatory-y += exec.h > -mandatory-y += fb.h > mandatory-y += ftrace.h > mandatory-y += futex.h > mandatory-y += hardirq.h > @@ -62,5 +61,6 @@ mandatory-y += uaccess.h > mandatory-y += unaligned.h > mandatory-y += vermagic.h > mandatory-y += vga.h > +mandatory-y += video.h > mandatory-y += word-at-a-time.h > mandatory-y += xor.h > diff --git a/include/asm-generic/fb.h b/include/asm-generic/video.h > similarity index 96% > rename from include/asm-generic/fb.h > rename to include/asm-generic/video.h > index 4788c1e1c6bc0..b1da2309d9434 100644 > --- a/include/asm-generic/fb.h > +++ b/include/asm-generic/video.h > @@ -1,7 +1,7 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > > -#ifndef __ASM_GENERIC_FB_H_ > -#define __ASM_GENERIC_FB_H_ > +#ifndef __ASM_GENERIC_VIDEO_H_ > +#define __ASM_GENERIC_VIDEO_H_ > > /* > * Only include this header file from your architecture's <asm/fb.h>. > @@ -133,4 +133,4 @@ static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n) > #define fb_memset fb_memset_io > #endif > > -#endif /* __ASM_GENERIC_FB_H_ */ > +#endif /* __ASM_GENERIC_VIDEO_H_ */ > diff --git a/include/linux/fb.h b/include/linux/fb.h > index 708e6a177b1be..1f23e0c505424 100644 > --- a/include/linux/fb.h > +++ b/include/linux/fb.h > @@ -12,7 +12,7 @@ > #include <linux/types.h> > #include <linux/workqueue.h> > > -#include <asm/fb.h> > +#include <asm/video.h> > > struct backlight_device; > struct device; > -- > 2.44.0 >
On 3/27/24 21:41, Thomas Zimmermann wrote: > 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. > > Further update all includes statements, includ guards, and Makefiles. > Also update a few strings and comments to refer to video instead of > fbdev. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > 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> > --- > arch/arc/include/asm/fb.h | 8 -------- > arch/arc/include/asm/video.h | 8 ++++++++ > arch/arm/include/asm/fb.h | 6 ------ > arch/arm/include/asm/video.h | 6 ++++++ > arch/arm64/include/asm/fb.h | 10 ---------- > arch/arm64/include/asm/video.h | 10 ++++++++++ > arch/loongarch/include/asm/{fb.h => video.h} | 8 ++++---- > arch/m68k/include/asm/{fb.h => video.h} | 8 ++++---- > arch/mips/include/asm/{fb.h => video.h} | 12 ++++++------ > arch/parisc/include/asm/{fb.h => video.h} | 8 ++++---- > arch/parisc/video/Makefile | 2 +- > arch/parisc/video/{fbdev.c => video-sti.c} | 2 +- > arch/powerpc/include/asm/{fb.h => video.h} | 8 ++++---- > arch/powerpc/kernel/pci-common.c | 2 +- > arch/sh/include/asm/fb.h | 7 ------- > arch/sh/include/asm/video.h | 7 +++++++ > arch/sparc/include/asm/{fb.h => video.h} | 8 ++++---- > arch/sparc/video/Makefile | 2 +- > arch/sparc/video/{fbdev.c => video.c} | 4 ++-- > arch/x86/include/asm/{fb.h => video.h} | 8 ++++---- > arch/x86/video/Makefile | 2 +- > arch/x86/video/{fbdev.c => video.c} | 3 ++- > include/asm-generic/Kbuild | 2 +- > include/asm-generic/{fb.h => video.h} | 6 +++--- > include/linux/fb.h | 2 +- > 25 files changed, 75 insertions(+), 74 deletions(-) > delete mode 100644 arch/arc/include/asm/fb.h > create mode 100644 arch/arc/include/asm/video.h > delete mode 100644 arch/arm/include/asm/fb.h > create mode 100644 arch/arm/include/asm/video.h > delete mode 100644 arch/arm64/include/asm/fb.h > create mode 100644 arch/arm64/include/asm/video.h > rename arch/loongarch/include/asm/{fb.h => video.h} (86%) > rename arch/m68k/include/asm/{fb.h => video.h} (86%) > rename arch/mips/include/asm/{fb.h => video.h} (76%) > rename arch/parisc/include/asm/{fb.h => video.h} (68%) > rename arch/parisc/video/{fbdev.c => video-sti.c} (96%) > rename arch/powerpc/include/asm/{fb.h => video.h} (76%) > delete mode 100644 arch/sh/include/asm/fb.h > create mode 100644 arch/sh/include/asm/video.h > rename arch/sparc/include/asm/{fb.h => video.h} (89%) > rename arch/sparc/video/{fbdev.c => video.c} (86%) > rename arch/x86/include/asm/{fb.h => video.h} (77%) > rename arch/x86/video/{fbdev.c => video.c} (97%) > rename include/asm-generic/{fb.h => video.h} (96%) > > diff --git a/arch/arc/include/asm/fb.h b/arch/arc/include/asm/fb.h > deleted file mode 100644 > index 9c2383d29cbb9..0000000000000 > --- a/arch/arc/include/asm/fb.h > +++ /dev/null > @@ -1,8 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > - > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > - > -#include <asm-generic/fb.h> > - > -#endif /* _ASM_FB_H_ */ > diff --git a/arch/arc/include/asm/video.h b/arch/arc/include/asm/video.h > new file mode 100644 > index 0000000000000..8ff7263727fe7 > --- /dev/null > +++ b/arch/arc/include/asm/video.h > @@ -0,0 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > + > +#include <asm-generic/video.h> > + > +#endif /* _ASM_VIDEO_H_ */ I wonder, since that file simply #includes the generic version, wasn't there a possibility that kbuild could symlink the generic version for us? Does it need to be mandatory in include/asm-generic/Kbuild ? Same applies to a few other files below. Helge > diff --git a/arch/arm/include/asm/fb.h b/arch/arm/include/asm/fb.h > deleted file mode 100644 > index ce20a43c30339..0000000000000 > --- a/arch/arm/include/asm/fb.h > +++ /dev/null > @@ -1,6 +0,0 @@ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > - > -#include <asm-generic/fb.h> > - > -#endif /* _ASM_FB_H_ */ > diff --git a/arch/arm/include/asm/video.h b/arch/arm/include/asm/video.h > new file mode 100644 > index 0000000000000..f570565366e67 > --- /dev/null > +++ b/arch/arm/include/asm/video.h > @@ -0,0 +1,6 @@ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > + > +#include <asm-generic/video.h> > + > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/arm64/include/asm/fb.h b/arch/arm64/include/asm/fb.h > deleted file mode 100644 > index 1a495d8fb2ce0..0000000000000 > --- a/arch/arm64/include/asm/fb.h > +++ /dev/null > @@ -1,10 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0-only */ > -/* > - * Copyright (C) 2012 ARM Ltd. > - */ > -#ifndef __ASM_FB_H_ > -#define __ASM_FB_H_ > - > -#include <asm-generic/fb.h> > - > -#endif /* __ASM_FB_H_ */ > diff --git a/arch/arm64/include/asm/video.h b/arch/arm64/include/asm/video.h > new file mode 100644 > index 0000000000000..fe0e74983f4d9 > --- /dev/null > +++ b/arch/arm64/include/asm/video.h > @@ -0,0 +1,10 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright (C) 2012 ARM Ltd. > + */ > +#ifndef __ASM_VIDEO_H_ > +#define __ASM_VIDEO_H_ > + > +#include <asm-generic/video.h> > + > +#endif /* __ASM_VIDEO_H_ */ > diff --git a/arch/loongarch/include/asm/fb.h b/arch/loongarch/include/asm/video.h > similarity index 86% > rename from arch/loongarch/include/asm/fb.h > rename to arch/loongarch/include/asm/video.h > index 0b218b10a9ec3..9f76845f2d4fd 100644 > --- a/arch/loongarch/include/asm/fb.h > +++ b/arch/loongarch/include/asm/video.h > @@ -2,8 +2,8 @@ > /* > * Copyright (C) 2020-2022 Loongson Technology Corporation Limited > */ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > > #include <linux/compiler.h> > #include <linux/string.h> > @@ -26,6 +26,6 @@ static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n) > } > #define fb_memset fb_memset_io > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _ASM_FB_H_ */ > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/video.h > similarity index 86% > rename from arch/m68k/include/asm/fb.h > rename to arch/m68k/include/asm/video.h > index 9941b7434b696..6cf2194c413d8 100644 > --- a/arch/m68k/include/asm/fb.h > +++ b/arch/m68k/include/asm/video.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > > #include <asm/page.h> > #include <asm/setup.h> > @@ -27,6 +27,6 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, > } > #define pgprot_framebuffer pgprot_framebuffer > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _ASM_FB_H_ */ > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/mips/include/asm/fb.h b/arch/mips/include/asm/video.h > similarity index 76% > rename from arch/mips/include/asm/fb.h > rename to arch/mips/include/asm/video.h > index d98d6681d64ec..007c106d980fd 100644 > --- a/arch/mips/include/asm/fb.h > +++ b/arch/mips/include/asm/video.h > @@ -1,5 +1,5 @@ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > > #include <asm/page.h> > > @@ -13,8 +13,8 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, > > /* > * MIPS doesn't define __raw_ I/O macros, so the helpers > - * in <asm-generic/fb.h> don't generate fb_readq() and > - * fb_write(). We have to provide them here. > + * in <asm-generic/video.h> don't generate fb_readq() and > + * fb_writeq(). We have to provide them here. > * > * TODO: Convert MIPS to generic I/O. The helpers below can > * then be removed. > @@ -33,6 +33,6 @@ static inline void fb_writeq(u64 b, volatile void __iomem *addr) > #define fb_writeq fb_writeq > #endif > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _ASM_FB_H_ */ > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/parisc/include/asm/fb.h b/arch/parisc/include/asm/video.h > similarity index 68% > rename from arch/parisc/include/asm/fb.h > rename to arch/parisc/include/asm/video.h > index ed2a195a3e762..c5dff3223194a 100644 > --- a/arch/parisc/include/asm/fb.h > +++ b/arch/parisc/include/asm/video.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > > #include <linux/types.h> > > @@ -11,6 +11,6 @@ bool video_is_primary_device(struct device *dev); > #define video_is_primary_device video_is_primary_device > #endif > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _ASM_FB_H_ */ > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/parisc/video/Makefile b/arch/parisc/video/Makefile > index 16a73cce46612..b5db5b42880f8 100644 > --- a/arch/parisc/video/Makefile > +++ b/arch/parisc/video/Makefile > @@ -1,3 +1,3 @@ > # SPDX-License-Identifier: GPL-2.0-only > > -obj-$(CONFIG_STI_CORE) += fbdev.o > +obj-$(CONFIG_STI_CORE) += video-sti.o > diff --git a/arch/parisc/video/fbdev.c b/arch/parisc/video/video-sti.c > similarity index 96% > rename from arch/parisc/video/fbdev.c > rename to arch/parisc/video/video-sti.c > index 540fa0c919d59..564661e87093c 100644 > --- a/arch/parisc/video/fbdev.c > +++ b/arch/parisc/video/video-sti.c > @@ -9,7 +9,7 @@ > > #include <video/sticore.h> > > -#include <asm/fb.h> > +#include <asm/video.h> > > bool video_is_primary_device(struct device *dev) > { > diff --git a/arch/powerpc/include/asm/fb.h b/arch/powerpc/include/asm/video.h > similarity index 76% > rename from arch/powerpc/include/asm/fb.h > rename to arch/powerpc/include/asm/video.h > index c0c5d1df7ad1e..e1770114ffc36 100644 > --- a/arch/powerpc/include/asm/fb.h > +++ b/arch/powerpc/include/asm/video.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > > #include <asm/page.h> > > @@ -12,6 +12,6 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, > } > #define pgprot_framebuffer pgprot_framebuffer > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _ASM_FB_H_ */ > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c > index d95a48eff412e..eac84d687b53f 100644 > --- a/arch/powerpc/kernel/pci-common.c > +++ b/arch/powerpc/kernel/pci-common.c > @@ -517,7 +517,7 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, struct vm_area_struct *vma) > } > > /* > - * This one is used by /dev/mem and fbdev who have no clue about the > + * This one is used by /dev/mem and video who have no clue about the > * PCI device, it tries to find the PCI device first and calls the > * above routine > */ > diff --git a/arch/sh/include/asm/fb.h b/arch/sh/include/asm/fb.h > deleted file mode 100644 > index 19df13ee9ca73..0000000000000 > --- a/arch/sh/include/asm/fb.h > +++ /dev/null > @@ -1,7 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _ASM_FB_H_ > -#define _ASM_FB_H_ > - > -#include <asm-generic/fb.h> > - > -#endif /* _ASM_FB_H_ */ > diff --git a/arch/sh/include/asm/video.h b/arch/sh/include/asm/video.h > new file mode 100644 > index 0000000000000..14f49934a247a > --- /dev/null > +++ b/arch/sh/include/asm/video.h > @@ -0,0 +1,7 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#ifndef _ASM_VIDEO_H_ > +#define _ASM_VIDEO_H_ > + > +#include <asm-generic/video.h> > + > +#endif /* _ASM_VIDEO_H_ */ > diff --git a/arch/sparc/include/asm/fb.h b/arch/sparc/include/asm/video.h > similarity index 89% > rename from arch/sparc/include/asm/fb.h > rename to arch/sparc/include/asm/video.h > index 07f0325d6921c..a6f48f52db584 100644 > --- a/arch/sparc/include/asm/fb.h > +++ b/arch/sparc/include/asm/video.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _SPARC_FB_H_ > -#define _SPARC_FB_H_ > +#ifndef _SPARC_VIDEO_H_ > +#define _SPARC_VIDEO_H_ > > #include <linux/io.h> > #include <linux/types.h> > @@ -40,6 +40,6 @@ static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n) > } > #define fb_memset fb_memset_io > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _SPARC_FB_H_ */ > +#endif /* _SPARC_VIDEO_H_ */ > diff --git a/arch/sparc/video/Makefile b/arch/sparc/video/Makefile > index 9dd82880a027a..fdf83a408d750 100644 > --- a/arch/sparc/video/Makefile > +++ b/arch/sparc/video/Makefile > @@ -1,3 +1,3 @@ > # SPDX-License-Identifier: GPL-2.0-only > > -obj-y += fbdev.o > +obj-y += video.o > diff --git a/arch/sparc/video/fbdev.c b/arch/sparc/video/video.c > similarity index 86% > rename from arch/sparc/video/fbdev.c > rename to arch/sparc/video/video.c > index e46f0499c2774..2414380caadc9 100644 > --- a/arch/sparc/video/fbdev.c > +++ b/arch/sparc/video/video.c > @@ -4,8 +4,8 @@ > #include <linux/device.h> > #include <linux/module.h> > > -#include <asm/fb.h> > #include <asm/prom.h> > +#include <asm/video.h> > > bool video_is_primary_device(struct device *dev) > { > @@ -21,5 +21,5 @@ bool video_is_primary_device(struct device *dev) > } > EXPORT_SYMBOL(video_is_primary_device); > > -MODULE_DESCRIPTION("Sparc fbdev helpers"); > +MODULE_DESCRIPTION("Sparc video helpers"); > MODULE_LICENSE("GPL"); > diff --git a/arch/x86/include/asm/fb.h b/arch/x86/include/asm/video.h > similarity index 77% > rename from arch/x86/include/asm/fb.h > rename to arch/x86/include/asm/video.h > index 999db33792869..0950c9535fae9 100644 > --- a/arch/x86/include/asm/fb.h > +++ b/arch/x86/include/asm/video.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > -#ifndef _ASM_X86_FB_H > -#define _ASM_X86_FB_H > +#ifndef _ASM_X86_VIDEO_H > +#define _ASM_X86_VIDEO_H > > #include <linux/types.h> > > @@ -16,6 +16,6 @@ pgprot_t pgprot_framebuffer(pgprot_t prot, > bool video_is_primary_device(struct device *dev); > #define video_is_primary_device video_is_primary_device > > -#include <asm-generic/fb.h> > +#include <asm-generic/video.h> > > -#endif /* _ASM_X86_FB_H */ > +#endif /* _ASM_X86_VIDEO_H */ > diff --git a/arch/x86/video/Makefile b/arch/x86/video/Makefile > index 9dd82880a027a..fdf83a408d750 100644 > --- a/arch/x86/video/Makefile > +++ b/arch/x86/video/Makefile > @@ -1,3 +1,3 @@ > # SPDX-License-Identifier: GPL-2.0-only > > -obj-y += fbdev.o > +obj-y += video.o > diff --git a/arch/x86/video/fbdev.c b/arch/x86/video/video.c > similarity index 97% > rename from arch/x86/video/fbdev.c > rename to arch/x86/video/video.c > index 4d87ce8e257fe..81fc97a2a837a 100644 > --- a/arch/x86/video/fbdev.c > +++ b/arch/x86/video/video.c > @@ -10,7 +10,8 @@ > #include <linux/module.h> > #include <linux/pci.h> > #include <linux/vgaarb.h> > -#include <asm/fb.h> > + > +#include <asm/video.h> > > pgprot_t pgprot_framebuffer(pgprot_t prot, > unsigned long vm_start, unsigned long vm_end, > diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild > index d436bee4d129d..b20fa25a7e8d8 100644 > --- a/include/asm-generic/Kbuild > +++ b/include/asm-generic/Kbuild > @@ -22,7 +22,6 @@ mandatory-y += dma-mapping.h > mandatory-y += dma.h > mandatory-y += emergency-restart.h > mandatory-y += exec.h > -mandatory-y += fb.h > mandatory-y += ftrace.h > mandatory-y += futex.h > mandatory-y += hardirq.h > @@ -62,5 +61,6 @@ mandatory-y += uaccess.h > mandatory-y += unaligned.h > mandatory-y += vermagic.h > mandatory-y += vga.h > +mandatory-y += video.h > mandatory-y += word-at-a-time.h > mandatory-y += xor.h > diff --git a/include/asm-generic/fb.h b/include/asm-generic/video.h > similarity index 96% > rename from include/asm-generic/fb.h > rename to include/asm-generic/video.h > index 4788c1e1c6bc0..b1da2309d9434 100644 > --- a/include/asm-generic/fb.h > +++ b/include/asm-generic/video.h > @@ -1,7 +1,7 @@ > /* SPDX-License-Identifier: GPL-2.0 */ > > -#ifndef __ASM_GENERIC_FB_H_ > -#define __ASM_GENERIC_FB_H_ > +#ifndef __ASM_GENERIC_VIDEO_H_ > +#define __ASM_GENERIC_VIDEO_H_ > > /* > * Only include this header file from your architecture's <asm/fb.h>. > @@ -133,4 +133,4 @@ static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n) > #define fb_memset fb_memset_io > #endif > > -#endif /* __ASM_GENERIC_FB_H_ */ > +#endif /* __ASM_GENERIC_VIDEO_H_ */ > diff --git a/include/linux/fb.h b/include/linux/fb.h > index 708e6a177b1be..1f23e0c505424 100644 > --- a/include/linux/fb.h > +++ b/include/linux/fb.h > @@ -12,7 +12,7 @@ > #include <linux/types.h> > #include <linux/workqueue.h> > > -#include <asm/fb.h> > +#include <asm/video.h> > > struct backlight_device; > struct device;
On Thu, Mar 28, 2024, at 13:46, Helge Deller wrote: > On 3/27/24 21:41, Thomas Zimmermann wrote: >> +++ b/arch/arc/include/asm/video.h >> @@ -0,0 +1,8 @@ >> +/* SPDX-License-Identifier: GPL-2.0 */ >> + >> +#ifndef _ASM_VIDEO_H_ >> +#define _ASM_VIDEO_H_ >> + >> +#include <asm-generic/video.h> >> + >> +#endif /* _ASM_VIDEO_H_ */ > > I wonder, since that file simply #includes the generic version, > wasn't there a possibility that kbuild could symlink > the generic version for us? > Does it need to be mandatory in include/asm-generic/Kbuild ? > Same applies to a few other files below. It should be enough to just remove the files entirely, as kbuild will generate the same wrappers for mandatory files. Arnd
Hi Thomas,
kernel test robot noticed the following build errors:
[auto build test ERROR on linus/master]
[also build test ERROR on v6.9-rc1 next-20240328]
[cannot apply to tip/x86/core deller-parisc/for-next arnd-asm-generic/master]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Thomas-Zimmermann/arch-Select-fbdev-helpers-with-CONFIG_VIDEO/20240328-044735
base: linus/master
patch link: https://lore.kernel.org/r/20240327204450.14914-4-tzimmermann%40suse.de
patch subject: [PATCH v2 3/3] arch: Rename fbdev header and source files
config: um-randconfig-001-20240328 (https://download.01.org/0day-ci/archive/20240328/202403282102.OEKoBT3H-lkp@intel.com/config)
compiler: gcc-12 (Ubuntu 12.3.0-9ubuntu2) 12.3.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240328/202403282102.OEKoBT3H-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202403282102.OEKoBT3H-lkp@intel.com/
All errors (new ones prefixed by >>):
/usr/bin/ld: drivers/video/fbdev/core/fb_io_fops.o: in function `fb_io_mmap':
>> fb_io_fops.c:(.text+0x251): undefined reference to `pgprot_framebuffer'
collect2: error: ld returned 1 exit status
Hi Am 28.03.24 um 13:51 schrieb Arnd Bergmann: > On Thu, Mar 28, 2024, at 13:46, Helge Deller wrote: >> On 3/27/24 21:41, Thomas Zimmermann wrote: >>> +++ b/arch/arc/include/asm/video.h >>> @@ -0,0 +1,8 @@ >>> +/* SPDX-License-Identifier: GPL-2.0 */ >>> + >>> +#ifndef _ASM_VIDEO_H_ >>> +#define _ASM_VIDEO_H_ >>> + >>> +#include <asm-generic/video.h> >>> + >>> +#endif /* _ASM_VIDEO_H_ */ >> I wonder, since that file simply #includes the generic version, >> wasn't there a possibility that kbuild could symlink >> the generic version for us? >> Does it need to be mandatory in include/asm-generic/Kbuild ? >> Same applies to a few other files below. > It should be enough to just remove the files entirely, > as kbuild will generate the same wrappers for mandatory files. If that works, I'm happy to remove these wrapper files. Best regards Thomas > > Arnd
diff --git a/arch/arc/include/asm/fb.h b/arch/arc/include/asm/fb.h deleted file mode 100644 index 9c2383d29cbb9..0000000000000 --- a/arch/arc/include/asm/fb.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#ifndef _ASM_FB_H_ -#define _ASM_FB_H_ - -#include <asm-generic/fb.h> - -#endif /* _ASM_FB_H_ */ diff --git a/arch/arc/include/asm/video.h b/arch/arc/include/asm/video.h new file mode 100644 index 0000000000000..8ff7263727fe7 --- /dev/null +++ b/arch/arc/include/asm/video.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _ASM_VIDEO_H_ +#define _ASM_VIDEO_H_ + +#include <asm-generic/video.h> + +#endif /* _ASM_VIDEO_H_ */ diff --git a/arch/arm/include/asm/fb.h b/arch/arm/include/asm/fb.h deleted file mode 100644 index ce20a43c30339..0000000000000 --- a/arch/arm/include/asm/fb.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_FB_H_ -#define _ASM_FB_H_ - -#include <asm-generic/fb.h> - -#endif /* _ASM_FB_H_ */ diff --git a/arch/arm/include/asm/video.h b/arch/arm/include/asm/video.h new file mode 100644 index 0000000000000..f570565366e67 --- /dev/null +++ b/arch/arm/include/asm/video.h @@ -0,0 +1,6 @@ +#ifndef _ASM_VIDEO_H_ +#define _ASM_VIDEO_H_ + +#include <asm-generic/video.h> + +#endif /* _ASM_VIDEO_H_ */ diff --git a/arch/arm64/include/asm/fb.h b/arch/arm64/include/asm/fb.h deleted file mode 100644 index 1a495d8fb2ce0..0000000000000 --- a/arch/arm64/include/asm/fb.h +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2012 ARM Ltd. - */ -#ifndef __ASM_FB_H_ -#define __ASM_FB_H_ - -#include <asm-generic/fb.h> - -#endif /* __ASM_FB_H_ */ diff --git a/arch/arm64/include/asm/video.h b/arch/arm64/include/asm/video.h new file mode 100644 index 0000000000000..fe0e74983f4d9 --- /dev/null +++ b/arch/arm64/include/asm/video.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2012 ARM Ltd. + */ +#ifndef __ASM_VIDEO_H_ +#define __ASM_VIDEO_H_ + +#include <asm-generic/video.h> + +#endif /* __ASM_VIDEO_H_ */ diff --git a/arch/loongarch/include/asm/fb.h b/arch/loongarch/include/asm/video.h similarity index 86% rename from arch/loongarch/include/asm/fb.h rename to arch/loongarch/include/asm/video.h index 0b218b10a9ec3..9f76845f2d4fd 100644 --- a/arch/loongarch/include/asm/fb.h +++ b/arch/loongarch/include/asm/video.h @@ -2,8 +2,8 @@ /* * Copyright (C) 2020-2022 Loongson Technology Corporation Limited */ -#ifndef _ASM_FB_H_ -#define _ASM_FB_H_ +#ifndef _ASM_VIDEO_H_ +#define _ASM_VIDEO_H_ #include <linux/compiler.h> #include <linux/string.h> @@ -26,6 +26,6 @@ static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n) } #define fb_memset fb_memset_io -#include <asm-generic/fb.h> +#include <asm-generic/video.h> -#endif /* _ASM_FB_H_ */ +#endif /* _ASM_VIDEO_H_ */ diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/video.h similarity index 86% rename from arch/m68k/include/asm/fb.h rename to arch/m68k/include/asm/video.h index 9941b7434b696..6cf2194c413d8 100644 --- a/arch/m68k/include/asm/fb.h +++ b/arch/m68k/include/asm/video.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_FB_H_ -#define _ASM_FB_H_ +#ifndef _ASM_VIDEO_H_ +#define _ASM_VIDEO_H_ #include <asm/page.h> #include <asm/setup.h> @@ -27,6 +27,6 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, } #define pgprot_framebuffer pgprot_framebuffer -#include <asm-generic/fb.h> +#include <asm-generic/video.h> -#endif /* _ASM_FB_H_ */ +#endif /* _ASM_VIDEO_H_ */ diff --git a/arch/mips/include/asm/fb.h b/arch/mips/include/asm/video.h similarity index 76% rename from arch/mips/include/asm/fb.h rename to arch/mips/include/asm/video.h index d98d6681d64ec..007c106d980fd 100644 --- a/arch/mips/include/asm/fb.h +++ b/arch/mips/include/asm/video.h @@ -1,5 +1,5 @@ -#ifndef _ASM_FB_H_ -#define _ASM_FB_H_ +#ifndef _ASM_VIDEO_H_ +#define _ASM_VIDEO_H_ #include <asm/page.h> @@ -13,8 +13,8 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, /* * MIPS doesn't define __raw_ I/O macros, so the helpers - * in <asm-generic/fb.h> don't generate fb_readq() and - * fb_write(). We have to provide them here. + * in <asm-generic/video.h> don't generate fb_readq() and + * fb_writeq(). We have to provide them here. * * TODO: Convert MIPS to generic I/O. The helpers below can * then be removed. @@ -33,6 +33,6 @@ static inline void fb_writeq(u64 b, volatile void __iomem *addr) #define fb_writeq fb_writeq #endif -#include <asm-generic/fb.h> +#include <asm-generic/video.h> -#endif /* _ASM_FB_H_ */ +#endif /* _ASM_VIDEO_H_ */ diff --git a/arch/parisc/include/asm/fb.h b/arch/parisc/include/asm/video.h similarity index 68% rename from arch/parisc/include/asm/fb.h rename to arch/parisc/include/asm/video.h index ed2a195a3e762..c5dff3223194a 100644 --- a/arch/parisc/include/asm/fb.h +++ b/arch/parisc/include/asm/video.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_FB_H_ -#define _ASM_FB_H_ +#ifndef _ASM_VIDEO_H_ +#define _ASM_VIDEO_H_ #include <linux/types.h> @@ -11,6 +11,6 @@ bool video_is_primary_device(struct device *dev); #define video_is_primary_device video_is_primary_device #endif -#include <asm-generic/fb.h> +#include <asm-generic/video.h> -#endif /* _ASM_FB_H_ */ +#endif /* _ASM_VIDEO_H_ */ diff --git a/arch/parisc/video/Makefile b/arch/parisc/video/Makefile index 16a73cce46612..b5db5b42880f8 100644 --- a/arch/parisc/video/Makefile +++ b/arch/parisc/video/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_STI_CORE) += fbdev.o +obj-$(CONFIG_STI_CORE) += video-sti.o diff --git a/arch/parisc/video/fbdev.c b/arch/parisc/video/video-sti.c similarity index 96% rename from arch/parisc/video/fbdev.c rename to arch/parisc/video/video-sti.c index 540fa0c919d59..564661e87093c 100644 --- a/arch/parisc/video/fbdev.c +++ b/arch/parisc/video/video-sti.c @@ -9,7 +9,7 @@ #include <video/sticore.h> -#include <asm/fb.h> +#include <asm/video.h> bool video_is_primary_device(struct device *dev) { diff --git a/arch/powerpc/include/asm/fb.h b/arch/powerpc/include/asm/video.h similarity index 76% rename from arch/powerpc/include/asm/fb.h rename to arch/powerpc/include/asm/video.h index c0c5d1df7ad1e..e1770114ffc36 100644 --- a/arch/powerpc/include/asm/fb.h +++ b/arch/powerpc/include/asm/video.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_FB_H_ -#define _ASM_FB_H_ +#ifndef _ASM_VIDEO_H_ +#define _ASM_VIDEO_H_ #include <asm/page.h> @@ -12,6 +12,6 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, } #define pgprot_framebuffer pgprot_framebuffer -#include <asm-generic/fb.h> +#include <asm-generic/video.h> -#endif /* _ASM_FB_H_ */ +#endif /* _ASM_VIDEO_H_ */ diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index d95a48eff412e..eac84d687b53f 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -517,7 +517,7 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, struct vm_area_struct *vma) } /* - * This one is used by /dev/mem and fbdev who have no clue about the + * This one is used by /dev/mem and video who have no clue about the * PCI device, it tries to find the PCI device first and calls the * above routine */ diff --git a/arch/sh/include/asm/fb.h b/arch/sh/include/asm/fb.h deleted file mode 100644 index 19df13ee9ca73..0000000000000 --- a/arch/sh/include/asm/fb.h +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_FB_H_ -#define _ASM_FB_H_ - -#include <asm-generic/fb.h> - -#endif /* _ASM_FB_H_ */ diff --git a/arch/sh/include/asm/video.h b/arch/sh/include/asm/video.h new file mode 100644 index 0000000000000..14f49934a247a --- /dev/null +++ b/arch/sh/include/asm/video.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_VIDEO_H_ +#define _ASM_VIDEO_H_ + +#include <asm-generic/video.h> + +#endif /* _ASM_VIDEO_H_ */ diff --git a/arch/sparc/include/asm/fb.h b/arch/sparc/include/asm/video.h similarity index 89% rename from arch/sparc/include/asm/fb.h rename to arch/sparc/include/asm/video.h index 07f0325d6921c..a6f48f52db584 100644 --- a/arch/sparc/include/asm/fb.h +++ b/arch/sparc/include/asm/video.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _SPARC_FB_H_ -#define _SPARC_FB_H_ +#ifndef _SPARC_VIDEO_H_ +#define _SPARC_VIDEO_H_ #include <linux/io.h> #include <linux/types.h> @@ -40,6 +40,6 @@ static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n) } #define fb_memset fb_memset_io -#include <asm-generic/fb.h> +#include <asm-generic/video.h> -#endif /* _SPARC_FB_H_ */ +#endif /* _SPARC_VIDEO_H_ */ diff --git a/arch/sparc/video/Makefile b/arch/sparc/video/Makefile index 9dd82880a027a..fdf83a408d750 100644 --- a/arch/sparc/video/Makefile +++ b/arch/sparc/video/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += fbdev.o +obj-y += video.o diff --git a/arch/sparc/video/fbdev.c b/arch/sparc/video/video.c similarity index 86% rename from arch/sparc/video/fbdev.c rename to arch/sparc/video/video.c index e46f0499c2774..2414380caadc9 100644 --- a/arch/sparc/video/fbdev.c +++ b/arch/sparc/video/video.c @@ -4,8 +4,8 @@ #include <linux/device.h> #include <linux/module.h> -#include <asm/fb.h> #include <asm/prom.h> +#include <asm/video.h> bool video_is_primary_device(struct device *dev) { @@ -21,5 +21,5 @@ bool video_is_primary_device(struct device *dev) } EXPORT_SYMBOL(video_is_primary_device); -MODULE_DESCRIPTION("Sparc fbdev helpers"); +MODULE_DESCRIPTION("Sparc video helpers"); MODULE_LICENSE("GPL"); diff --git a/arch/x86/include/asm/fb.h b/arch/x86/include/asm/video.h similarity index 77% rename from arch/x86/include/asm/fb.h rename to arch/x86/include/asm/video.h index 999db33792869..0950c9535fae9 100644 --- a/arch/x86/include/asm/fb.h +++ b/arch/x86/include/asm/video.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _ASM_X86_FB_H -#define _ASM_X86_FB_H +#ifndef _ASM_X86_VIDEO_H +#define _ASM_X86_VIDEO_H #include <linux/types.h> @@ -16,6 +16,6 @@ pgprot_t pgprot_framebuffer(pgprot_t prot, bool video_is_primary_device(struct device *dev); #define video_is_primary_device video_is_primary_device -#include <asm-generic/fb.h> +#include <asm-generic/video.h> -#endif /* _ASM_X86_FB_H */ +#endif /* _ASM_X86_VIDEO_H */ diff --git a/arch/x86/video/Makefile b/arch/x86/video/Makefile index 9dd82880a027a..fdf83a408d750 100644 --- a/arch/x86/video/Makefile +++ b/arch/x86/video/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += fbdev.o +obj-y += video.o diff --git a/arch/x86/video/fbdev.c b/arch/x86/video/video.c similarity index 97% rename from arch/x86/video/fbdev.c rename to arch/x86/video/video.c index 4d87ce8e257fe..81fc97a2a837a 100644 --- a/arch/x86/video/fbdev.c +++ b/arch/x86/video/video.c @@ -10,7 +10,8 @@ #include <linux/module.h> #include <linux/pci.h> #include <linux/vgaarb.h> -#include <asm/fb.h> + +#include <asm/video.h> pgprot_t pgprot_framebuffer(pgprot_t prot, unsigned long vm_start, unsigned long vm_end, diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild index d436bee4d129d..b20fa25a7e8d8 100644 --- a/include/asm-generic/Kbuild +++ b/include/asm-generic/Kbuild @@ -22,7 +22,6 @@ mandatory-y += dma-mapping.h mandatory-y += dma.h mandatory-y += emergency-restart.h mandatory-y += exec.h -mandatory-y += fb.h mandatory-y += ftrace.h mandatory-y += futex.h mandatory-y += hardirq.h @@ -62,5 +61,6 @@ mandatory-y += uaccess.h mandatory-y += unaligned.h mandatory-y += vermagic.h mandatory-y += vga.h +mandatory-y += video.h mandatory-y += word-at-a-time.h mandatory-y += xor.h diff --git a/include/asm-generic/fb.h b/include/asm-generic/video.h similarity index 96% rename from include/asm-generic/fb.h rename to include/asm-generic/video.h index 4788c1e1c6bc0..b1da2309d9434 100644 --- a/include/asm-generic/fb.h +++ b/include/asm-generic/video.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_GENERIC_FB_H_ -#define __ASM_GENERIC_FB_H_ +#ifndef __ASM_GENERIC_VIDEO_H_ +#define __ASM_GENERIC_VIDEO_H_ /* * Only include this header file from your architecture's <asm/fb.h>. @@ -133,4 +133,4 @@ static inline void fb_memset_io(volatile void __iomem *addr, int c, size_t n) #define fb_memset fb_memset_io #endif -#endif /* __ASM_GENERIC_FB_H_ */ +#endif /* __ASM_GENERIC_VIDEO_H_ */ diff --git a/include/linux/fb.h b/include/linux/fb.h index 708e6a177b1be..1f23e0c505424 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -12,7 +12,7 @@ #include <linux/types.h> #include <linux/workqueue.h> -#include <asm/fb.h> +#include <asm/video.h> struct backlight_device; struct device;
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. Further update all includes statements, includ guards, and Makefiles. Also update a few strings and comments to refer to video instead of fbdev. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> 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> --- arch/arc/include/asm/fb.h | 8 -------- arch/arc/include/asm/video.h | 8 ++++++++ arch/arm/include/asm/fb.h | 6 ------ arch/arm/include/asm/video.h | 6 ++++++ arch/arm64/include/asm/fb.h | 10 ---------- arch/arm64/include/asm/video.h | 10 ++++++++++ arch/loongarch/include/asm/{fb.h => video.h} | 8 ++++---- arch/m68k/include/asm/{fb.h => video.h} | 8 ++++---- arch/mips/include/asm/{fb.h => video.h} | 12 ++++++------ arch/parisc/include/asm/{fb.h => video.h} | 8 ++++---- arch/parisc/video/Makefile | 2 +- arch/parisc/video/{fbdev.c => video-sti.c} | 2 +- arch/powerpc/include/asm/{fb.h => video.h} | 8 ++++---- arch/powerpc/kernel/pci-common.c | 2 +- arch/sh/include/asm/fb.h | 7 ------- arch/sh/include/asm/video.h | 7 +++++++ arch/sparc/include/asm/{fb.h => video.h} | 8 ++++---- arch/sparc/video/Makefile | 2 +- arch/sparc/video/{fbdev.c => video.c} | 4 ++-- arch/x86/include/asm/{fb.h => video.h} | 8 ++++---- arch/x86/video/Makefile | 2 +- arch/x86/video/{fbdev.c => video.c} | 3 ++- include/asm-generic/Kbuild | 2 +- include/asm-generic/{fb.h => video.h} | 6 +++--- include/linux/fb.h | 2 +- 25 files changed, 75 insertions(+), 74 deletions(-) delete mode 100644 arch/arc/include/asm/fb.h create mode 100644 arch/arc/include/asm/video.h delete mode 100644 arch/arm/include/asm/fb.h create mode 100644 arch/arm/include/asm/video.h delete mode 100644 arch/arm64/include/asm/fb.h create mode 100644 arch/arm64/include/asm/video.h rename arch/loongarch/include/asm/{fb.h => video.h} (86%) rename arch/m68k/include/asm/{fb.h => video.h} (86%) rename arch/mips/include/asm/{fb.h => video.h} (76%) rename arch/parisc/include/asm/{fb.h => video.h} (68%) rename arch/parisc/video/{fbdev.c => video-sti.c} (96%) rename arch/powerpc/include/asm/{fb.h => video.h} (76%) delete mode 100644 arch/sh/include/asm/fb.h create mode 100644 arch/sh/include/asm/video.h rename arch/sparc/include/asm/{fb.h => video.h} (89%) rename arch/sparc/video/{fbdev.c => video.c} (86%) rename arch/x86/include/asm/{fb.h => video.h} (77%) rename arch/x86/video/{fbdev.c => video.c} (97%) rename include/asm-generic/{fb.h => video.h} (96%)