From: Thomas Zimmermann Date: Fri, 17 May 2024 09:14:33 +0000 (+0200) Subject: arch: Fix name collision with ACPI's video.o X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=34cda5ab89d4f30bc8d8f8d28980a7b8c68db6ec;p=linux.git arch: Fix name collision with ACPI's video.o Commit 2fd001cd3600 ("arch: Rename fbdev header and source files") renames the video source files under arch/ such that they do not refer to fbdev any longer. The new files named video.o conflict with ACPI's video.ko module. Modprobing the ACPI module can then fail with warnings about missing symbols, as shown below. (i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol acpi_video_unregister (err -2) (i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol acpi_video_register_backlight (err -2) (i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol __acpi_video_get_backlight_type (err -2) (i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol acpi_video_register (err -2) Fix the issue by renaming the architecture's video.o to video-common.o. Reported-by: Chaitanya Kumar Borah Closes: https://lore.kernel.org/intel-gfx/9dcac6e9-a3bf-4ace-bbdc-f697f767f9e0@suse.de/T/#t Signed-off-by: Thomas Zimmermann Fixes: 2fd001cd3600 ("arch: Rename fbdev header and source files") Reviewed-by: Hans de Goede Cc: Arnd Bergmann Cc: linux-arch@vger.kernel.org Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Arnd Bergmann --- diff --git a/arch/sparc/video/Makefile b/arch/sparc/video/Makefile index fdf83a408d750..dcfbe7a5912c0 100644 --- a/arch/sparc/video/Makefile +++ b/arch/sparc/video/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += video.o +obj-y += video-common.o diff --git a/arch/sparc/video/video-common.c b/arch/sparc/video/video-common.c new file mode 100644 index 0000000000000..2414380caadc9 --- /dev/null +++ b/arch/sparc/video/video-common.c @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include + +#include +#include + +bool video_is_primary_device(struct device *dev) +{ + struct device_node *node = dev->of_node; + + if (console_set_on_cmdline) + return false; + + if (node && node == of_console_device) + return true; + + return false; +} +EXPORT_SYMBOL(video_is_primary_device); + +MODULE_DESCRIPTION("Sparc video helpers"); +MODULE_LICENSE("GPL"); diff --git a/arch/sparc/video/video.c b/arch/sparc/video/video.c deleted file mode 100644 index 2414380caadc9..0000000000000 --- a/arch/sparc/video/video.c +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -#include -#include -#include - -#include -#include - -bool video_is_primary_device(struct device *dev) -{ - struct device_node *node = dev->of_node; - - if (console_set_on_cmdline) - return false; - - if (node && node == of_console_device) - return true; - - return false; -} -EXPORT_SYMBOL(video_is_primary_device); - -MODULE_DESCRIPTION("Sparc video helpers"); -MODULE_LICENSE("GPL"); diff --git a/arch/x86/video/Makefile b/arch/x86/video/Makefile index fdf83a408d750..dcfbe7a5912c0 100644 --- a/arch/x86/video/Makefile +++ b/arch/x86/video/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += video.o +obj-y += video-common.o diff --git a/arch/x86/video/video-common.c b/arch/x86/video/video-common.c new file mode 100644 index 0000000000000..81fc97a2a837a --- /dev/null +++ b/arch/x86/video/video-common.c @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2007 Antonino Daplas + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive + * for more details. + * + */ + +#include +#include +#include + +#include + +pgprot_t pgprot_framebuffer(pgprot_t prot, + unsigned long vm_start, unsigned long vm_end, + unsigned long offset) +{ + pgprot_val(prot) &= ~_PAGE_CACHE_MASK; + if (boot_cpu_data.x86 > 3) + pgprot_val(prot) |= cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS); + + return prot; +} +EXPORT_SYMBOL(pgprot_framebuffer); + +bool video_is_primary_device(struct device *dev) +{ + struct pci_dev *pdev; + + if (!dev_is_pci(dev)) + return false; + + pdev = to_pci_dev(dev); + + return (pdev == vga_default_device()); +} +EXPORT_SYMBOL(video_is_primary_device); + +MODULE_LICENSE("GPL"); diff --git a/arch/x86/video/video.c b/arch/x86/video/video.c deleted file mode 100644 index 81fc97a2a837a..0000000000000 --- a/arch/x86/video/video.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2007 Antonino Daplas - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive - * for more details. - * - */ - -#include -#include -#include - -#include - -pgprot_t pgprot_framebuffer(pgprot_t prot, - unsigned long vm_start, unsigned long vm_end, - unsigned long offset) -{ - pgprot_val(prot) &= ~_PAGE_CACHE_MASK; - if (boot_cpu_data.x86 > 3) - pgprot_val(prot) |= cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS); - - return prot; -} -EXPORT_SYMBOL(pgprot_framebuffer); - -bool video_is_primary_device(struct device *dev) -{ - struct pci_dev *pdev; - - if (!dev_is_pci(dev)) - return false; - - pdev = to_pci_dev(dev); - - return (pdev == vga_default_device()); -} -EXPORT_SYMBOL(video_is_primary_device); - -MODULE_LICENSE("GPL");