Hi
Am 15.05.24 um 13:38 schrieb Borah, Chaitanya Kumar:
[...]
Sorry, I didn't notice the report before. The commit is not related to ACPI.
There's now asm/video.h and acpi/video.h. Maybe there's a conflict among
included files.
Do you have a kernel config to build with?
~Sorry my email client messed up my previous reply. So sending again~
I could not find a public link for the linux-next config we use but this should be close enough.
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14764/kconfig.txt
Builds without problems.
But I think there's a name collision between the video module in
drivers/acpi and the new video module in arch/*/video. The attached
patch renames the ACPI module. Could you please try it and report back
the results?
Best regards
Thomas
Regards
Chaitanya
Best regards
Thomas
Thank you.
Regards
Chaitanya
[1] https://intel-gfx-ci.01.org/tree/linux-next/combined-alt.html?
[2] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-
next.git/commit/?h=next-20240506
[3]
https://intel-gfx-ci.01.org/tree/linux-next/next-20240506/bat-mtlp-
9/igt@i915_selftest@live@gt_contexts.html
[4] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-
next.git/commit/?h=next-
20240506&id=2fd001cd36005846caa6456fff1008c6f5bae9d4
--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB
36809 (AG Nuernberg)
--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)
From c42f1e44fdc13358b220f27be0c3176e275eb188 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <tzimmermann@xxxxxxx>
Date: Wed, 15 May 2024 14:31:53 +0200
Subject: [PATCH] acpi/video: Fix name collision with architecture video module
Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
---
drivers/acpi/Makefile | 5 +++--
drivers/acpi/{acpi_video.c => acpi_video_core.c} | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
rename drivers/acpi/{acpi_video.c => acpi_video_core.c} (99%)
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 39ea5cfa83269..b2c2471ee935e 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -78,7 +78,9 @@ obj-$(CONFIG_ACPI_FAN) += fan.o
fan-objs := fan_core.o
fan-objs += fan_attr.o
-obj-$(CONFIG_ACPI_VIDEO) += video.o
+obj-$(CONFIG_ACPI_VIDEO) += acpi_video.o
+acpi_video-objs += acpi_video_core.o video_detect.o
+
obj-$(CONFIG_ACPI_TAD) += acpi_tad.o
obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o
obj-$(CONFIG_ACPI_PROCESSOR) += processor.o
@@ -119,7 +121,6 @@ obj-$(CONFIG_ACPI_CONFIGFS) += acpi_configfs.o
obj-y += pmic/
-video-objs += acpi_video.o video_detect.o
obj-y += dptf/
obj-$(CONFIG_ARM64) += arm64/
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video_core.c
similarity index 99%
rename from drivers/acpi/acpi_video.c
rename to drivers/acpi/acpi_video_core.c
index 1fda303882973..32bf81c5773a4 100644
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video_core.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * video.c - ACPI Video Driver
+ * acpi_video_core.c - ACPI Video Driver
*
* Copyright (C) 2004 Luming Yu <luming.yu@xxxxxxxxx>
* Copyright (C) 2004 Bruno Ducrot <ducrot@xxxxxxxxxxxx>
--
2.45.0
