Re: [PATCH 3/3] arch: Rename fbdev header and source files
Hi Thomas, kernel test robot noticed the following build errors: [auto build test ERROR on tip/x86/core] [also build test ERROR on deller-parisc/for-next arnd-asm-generic/master linus/master v6.8-rc5] [cannot apply to next-20240222] [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/20240222-001622 base: tip/x86/core patch link: https://lore.kernel.org/r/20240221161431.8245-4-tzimmermann%40suse.de patch subject: [PATCH 3/3] arch: Rename fbdev header and source files config: um-randconfig-002-20240222 (https://download.01.org/0day-ci/archive/20240223/202402230737.e7gwpgup-...@intel.com/config) compiler: clang version 19.0.0git (https://github.com/llvm/llvm-project edd4aee4dd9b5b98b2576a6f783e4086173d902a) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240223/202402230737.e7gwpgup-...@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 | Closes: https://lore.kernel.org/oe-kbuild-all/202402230737.e7gwpgup-...@intel.com/ All errors (new ones prefixed by >>): /usr/bin/ld: warning: .tmp_vmlinux.kallsyms1 has a LOAD segment with RWX permissions /usr/bin/ld: drivers/video/fbdev/core/fb_io_fops.o: in function `fb_io_mmap': >> drivers/video/fbdev/core/fb_io_fops.c:164: undefined reference to >> `pgprot_framebuffer' clang: error: linker command failed with exit code 1 (use -v to see invocation) vim +164 drivers/video/fbdev/core/fb_io_fops.c 6b180f66c0dd62 Thomas Zimmermann 2023-09-27 140 33253d9e01d405 Thomas Zimmermann 2023-11-27 141 int fb_io_mmap(struct fb_info *info, struct vm_area_struct *vma) 33253d9e01d405 Thomas Zimmermann 2023-11-27 142 { 33253d9e01d405 Thomas Zimmermann 2023-11-27 143unsigned long start = info->fix.smem_start; 33253d9e01d405 Thomas Zimmermann 2023-11-27 144u32 len = info->fix.smem_len; 33253d9e01d405 Thomas Zimmermann 2023-11-27 145unsigned long mmio_pgoff = PAGE_ALIGN((start & ~PAGE_MASK) + len) >> PAGE_SHIFT; 33253d9e01d405 Thomas Zimmermann 2023-11-27 146 b3e8813773c568 Thomas Zimmermann 2023-11-27 147if (info->flags & FBINFO_VIRTFB) b3e8813773c568 Thomas Zimmermann 2023-11-27 148 fb_warn_once(info, "Framebuffer is not in I/O address space."); b3e8813773c568 Thomas Zimmermann 2023-11-27 149 33253d9e01d405 Thomas Zimmermann 2023-11-27 150/* 33253d9e01d405 Thomas Zimmermann 2023-11-27 151 * This can be either the framebuffer mapping, or if pgoff points 33253d9e01d405 Thomas Zimmermann 2023-11-27 152 * past it, the mmio mapping. 33253d9e01d405 Thomas Zimmermann 2023-11-27 153 */ 33253d9e01d405 Thomas Zimmermann 2023-11-27 154if (vma->vm_pgoff >= mmio_pgoff) { 33253d9e01d405 Thomas Zimmermann 2023-11-27 155if (info->var.accel_flags) 33253d9e01d405 Thomas Zimmermann 2023-11-27 156return -EINVAL; 33253d9e01d405 Thomas Zimmermann 2023-11-27 157 33253d9e01d405 Thomas Zimmermann 2023-11-27 158vma->vm_pgoff -= mmio_pgoff; 33253d9e01d405 Thomas Zimmermann 2023-11-27 159start = info->fix.mmio_start; 33253d9e01d405 Thomas Zimmermann 2023-11-27 160len = info->fix.mmio_len; 33253d9e01d405 Thomas Zimmermann 2023-11-27 161} 33253d9e01d405 Thomas Zimmermann 2023-11-27 162 33253d9e01d405 Thomas Zimmermann 2023-11-27 163vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 33253d9e01d405 Thomas Zimmermann 2023-11-27 @164vma->vm_page_prot = pgprot_framebuffer(vma->vm_page_prot, vma->vm_start, 33253d9e01d405 Thomas Zimmermann 2023-11-27 165 vma->vm_end, start); 33253d9e01d405 Thomas Zimmermann 2023-11-27 166 33253d9e01d405 Thomas Zimmermann 2023-11-27 167return vm_iomap_memory(vma, start, len); 33253d9e01d405 Thomas Zimmermann 2023-11-27 168 } 33253d9e01d405 Thomas Zimmermann 2023-11-27 169 EXPORT_SYMBOL(fb_io_mmap); 33253d9e01d405 Thomas Zimmermann 2023-11-27 170 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [PATCH 3/3] arch: Rename fbdev header and source files
Hi Thomas, kernel test robot noticed the following build errors: [auto build test ERROR on tip/x86/core] [also build test ERROR on deller-parisc/for-next arnd-asm-generic/master linus/master v6.8-rc5 next-20240221] [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/20240222-001622 base: tip/x86/core patch link: https://lore.kernel.org/r/20240221161431.8245-4-tzimmermann%40suse.de patch subject: [PATCH 3/3] arch: Rename fbdev header and source files config: um-randconfig-r052-20240222 (https://download.01.org/0day-ci/archive/20240223/202402230023.xa2jjwui-...@intel.com/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240223/202402230023.xa2jjwui-...@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 | Closes: https://lore.kernel.org/oe-kbuild-all/202402230023.xa2jjwui-...@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+0x591): undefined reference to `pgprot_framebuffer' collect2: error: ld returned 1 exit status -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
[PATCH 3/3] arch: Rename fbdev header and source files
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 Cc: Vineet Gupta Cc: Catalin Marinas Cc: Will Deacon Cc: Huacai Chen Cc: WANG Xuerui Cc: Geert Uytterhoeven Cc: Thomas Bogendoerfer Cc: "James E.J. Bottomley" Cc: Helge Deller Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Yoshinori Sato Cc: Rich Felker Cc: John Paul Adrian Glaubitz Cc: "David S. Miller" Cc: Andreas Larsson Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x...@kernel.org Cc: "H. Peter Anvin" --- 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..0 --- 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 - -#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 0..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 + +#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..0 --- a/arch/arm/include/asm/fb.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_FB_H_ -#define _ASM_FB_H_ - -#include - -#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 0..f570565366e67 --- /dev/null +++ b/arch/arm/include/asm/video.h @@ -0,0 +1,6 @@ +#ifndef _ASM_VIDEO_H_ +#define _ASM_VIDEO_H_ + +#include + +#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..0 --- 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 - -#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