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 <chaitanya.kumar.borah@intel.com>
Closes: https://lore.kernel.org/intel-gfx/9dcac6e9-a3bf-4ace-bbdc-f697f767f9e0@suse.de/T/#t
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Fixes: 2fd001cd3600 ("arch: Rename fbdev header and source files")
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arch@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/sparc/video/Makefile b/arch/sparc/video/Makefile
index fdf83a408d7509f94164414dceed2b6c8f698f6f..dcfbe7a5912c017c4d3cddcaefd79bc0b9e2b9bc 100644 (file)
--- 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 (file)
index 0000000..2414380
--- /dev/null
+++ b/arch/sparc/video/video-common.c
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/console.h>
+#include <linux/device.h>
+#include <linux/module.h>
+
+#include <asm/prom.h>
+#include <asm/video.h>
+
+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 (file)
index 2414380..0000000
--- a/arch/sparc/video/video.c
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <linux/console.h>
-#include <linux/device.h>
-#include <linux/module.h>
-
-#include <asm/prom.h>
-#include <asm/video.h>
-
-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 fdf83a408d7509f94164414dceed2b6c8f698f6f..dcfbe7a5912c017c4d3cddcaefd79bc0b9e2b9bc 100644 (file)
--- 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 (file)
index 0000000..81fc97a
--- /dev/null
+++ b/arch/x86/video/video-common.c
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2007 Antonino Daplas <adaplas@gmail.com>
+ *
+ * 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 <linux/module.h>
+#include <linux/pci.h>
+#include <linux/vgaarb.h>
+
+#include <asm/video.h>
+
+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 (file)
index 81fc97a..0000000
--- a/arch/x86/video/video.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2007 Antonino Daplas <adaplas@gmail.com>
- *
- * 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 <linux/module.h>
-#include <linux/pci.h>
-#include <linux/vgaarb.h>
-
-#include <asm/video.h>
-
-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");