Skip to contentSkip to conversation

nouveau build regression, undefined reference to `acpi_video_get_edid'

PATCH Superseded Phil Turmel 2 participants 5 messages Sep 10, 2010 – Sep 17, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nouveau build regression, undefined reference to `acpi_video_get_edid'

Hi all,

I've got a build breakage on my laptop:

drivers/built-in.o: In function `nouveau_acpi_edid':
(.text+0x13404e): undefined reference to `acpi_video_get_edid'
make: *** [.tmp_vmlinux1] Error 1

Introduced by:

a6ed76d7ffc62ffa474b41d31b011b6853c5de32 is the first bad commit commit a6ed76d7ffc62ffa474b41d31b011b6853c5de32

Author: Ben Skeggs <[email protected]>
Date:   Mon Jul 12 15:33:07 2010 +1000

drm/nouveau: support fetching LVDS EDID from ACPI

Based on a patch from Matthew Garrett.

:040000 040000 2fbe9b4d9778329908107e72c11b100c2f5a460b 97dcf06923bb576298746584c45d17d3be9edcf8 M drivers

It doesn't seem to revert cleanly, but I believe the problem lies in these two config entries:

CONFIG_ACPI=y
CONFIG_ACPI_VIDEO=m

Having the nouveau ACPI features depend on CONFIG_ACPI_VIDEO instead of bare CONFIG_ACPI builds, boots, and works for me.

---

Presumably, this could also be solved by adding "select ACPI_VIDEO if ACPI" to the nouveau Kconfig. I'd be happy to try that, if this approach is flawed.

drivers/gpu/drm/nouveau/Makefile +1 -1
index e9b06e4..4e295b5 100644
@@ -28,6 +28,6 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \
 nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o
 nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
 nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
-nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
+nouveau-$(CONFIG_ACPI_VIDEO) += nouveau_acpi.o
 
 obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
drivers/gpu/drm/nouveau/nouveau_drv.h +1 -1
index b1be617..bd995b4 100644
@@ -842,7 +842,7 @@ extern int  nouveau_dma_wait(struct nouveau_channel *, int slots, int size);
 
 /* nouveau_acpi.c */
 #define ROM_BIOS_PAGE 4096
-#if defined(CONFIG_ACPI)
+#if defined(CONFIG_ACPI_VIDEO)
 void nouveau_register_dsm_handler(void);
 void nouveau_unregister_dsm_handler(void);
 int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
#1 lore raw
Quoted 24 lines · Phil Turmel

Hi all,

I've got a build breakage on my laptop:

drivers/built-in.o: In function `nouveau_acpi_edid':
(.text+0x13404e): undefined reference to `acpi_video_get_edid'
make: *** [.tmp_vmlinux1] Error 1

Introduced by:

a6ed76d7ffc62ffa474b41d31b011b6853c5de32 is the first bad commit commit a6ed76d7ffc62ffa474b41d31b011b6853c5de32

Author: Ben Skeggs <[email protected]>
Date:   Mon Jul 12 15:33:07 2010 +1000

drm/nouveau: support fetching LVDS EDID from ACPI

Based on a patch from Matthew Garrett.

:040000 040000 2fbe9b4d9778329908107e72c11b100c2f5a460b 97dcf06923bb576298746584c45d17d3be9edcf8 M drivers

Quoted 9 lines

It doesn't seem to revert cleanly, but I believe the problem lies in these two config entries:

CONFIG_ACPI=y
CONFIG_ACPI_VIDEO=m

Having the nouveau ACPI features depend on CONFIG_ACPI_VIDEO instead of bare CONFIG_ACPI builds, boots, and works for me.

nouveau_acpi_edid() is the only function that depends on ACPI_VIDEO, ifdef'ing out the rest of the ACPI stuff in that case doesn't make much sense to me.

Quoted 32 lines

---

Presumably, this could also be solved by adding "select ACPI_VIDEO if ACPI" to the nouveau Kconfig. I'd be happy to try that, if this approach is flawed.

drivers/gpu/drm/nouveau/Makefile +1 -1
index e9b06e4..4e295b5 100644
@@ -28,6 +28,6 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \
 nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o
 nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
 nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
-nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
+nouveau-$(CONFIG_ACPI_VIDEO) += nouveau_acpi.o
 
 obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
drivers/gpu/drm/nouveau/nouveau_drv.h +1 -1
index b1be617..bd995b4 100644
@@ -842,7 +842,7 @@ extern int  nouveau_dma_wait(struct nouveau_channel *, int slots, int size);
 
 /* nouveau_acpi.c */
 #define ROM_BIOS_PAGE 4096
-#if defined(CONFIG_ACPI)
+#if defined(CONFIG_ACPI_VIDEO)
 void nouveau_register_dsm_handler(void);
 void nouveau_unregister_dsm_handler(void);
 int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
#2 lore raw
Quoted 1 line · Francisco Jerez

Phil Turmel <[email protected]> writes:

[snip /]

Quoted 6 lines
Quoted 2 lines

Having the nouveau ACPI features depend on CONFIG_ACPI_VIDEO instead of bare CONFIG_ACPI builds, boots, and works for me.

nouveau_acpi_edid() is the only function that depends on ACPI_VIDEO, ifdef'ing out the rest of the ACPI stuff in that case doesn't make much sense to me.

Understood. I noticed that DRM_I915 does a "select ACPI_VIDEO if ACPI", which is why I mentioned that alternative below. I don't recall how I got the y+m combination above (I tend to build stuff in), but a randconfig could certainly hit this. I intend to leave it y+y when I'm done.

Quoted 3 lines
Quoted 3 lines

Presumably, this could also be solved by adding "select ACPI_VIDEO if ACPI" to the nouveau Kconfig. I'd be happy to try that, if this approach is flawed.

I'll test the Kconfig approach later today.

Regards,

Phil Turmel

#3 lore raw

PATCH v2 1/1 nouveau build regression, undefined reference to `acpi_video_get_edid'

Build breakage:

drivers/built-in.o: In function `nouveau_acpi_edid':
(.text+0x13404e): undefined reference to `acpi_video_get_edid'
make: *** [.tmp_vmlinux1] Error 1

Introduced by:

a6ed76d7ffc62ffa474b41d31b011b6853c5de32 is the first bad commit commit a6ed76d7ffc62ffa474b41d31b011b6853c5de32

Author: Ben Skeggs <[email protected]>
Date:   Mon Jul 12 15:33:07 2010 +1000

drm/nouveau: support fetching LVDS EDID from ACPI

Based on a patch from Matthew Garrett.

:040000 040000 2fbe9b4d9778329908107e72c11b100c2f5a460b 97dcf06923bb576298746584c45d17d3be9edcf8 M drivers

It doesn't seem to revert cleanly, but the problem lies in these two config entries:

CONFIG_ACPI=y
CONFIG_ACPI_VIDEO=m

Adding a select for ACPI_VIDEO appears to be the best solution, and is comparable to what is done in DRM_I915. Builds, boots, and appears to work correctly.

---

The first version disabled all ACPI functions in the nouveau driver if ACPI_VIDEO wasn't set. Francisco Jerez <[email protected]> pointed out that this didn't make much sense.

drivers/gpu/drm/nouveau/Kconfig +1 -0
index d2d2804..72730e9 100644
@@ -10,6 +10,7 @@ config DRM_NOUVEAU
 	select FB
 	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
+	select ACPI_VIDEO if ACPI
 	help
 	  Choose this option for open-source nVidia support.
#4 lore raw
Quoted 44 lines · Phil Turmel

Build breakage:

drivers/built-in.o: In function `nouveau_acpi_edid':
(.text+0x13404e): undefined reference to `acpi_video_get_edid'
make: *** [.tmp_vmlinux1] Error 1

Introduced by:

a6ed76d7ffc62ffa474b41d31b011b6853c5de32 is the first bad commit commit a6ed76d7ffc62ffa474b41d31b011b6853c5de32

Author: Ben Skeggs <[email protected]>
Date:   Mon Jul 12 15:33:07 2010 +1000

drm/nouveau: support fetching LVDS EDID from ACPI

Based on a patch from Matthew Garrett.

:040000 040000 2fbe9b4d9778329908107e72c11b100c2f5a460b 97dcf06923bb576298746584c45d17d3be9edcf8 M drivers

It doesn't seem to revert cleanly, but the problem lies in these two config entries:

CONFIG_ACPI=y
CONFIG_ACPI_VIDEO=m

Adding a select for ACPI_VIDEO appears to be the best solution, and is comparable to what is done in DRM_I915. Builds, boots, and appears to work correctly.

---

The first version disabled all ACPI functions in the nouveau driver if ACPI_VIDEO wasn't set. Francisco Jerez <[email protected]> pointed out that this didn't make much sense.

drivers/gpu/drm/nouveau/Kconfig +0 -0
index d2d2804..72730e9 100644

drivers/gpu/drm/nouveau/Kconfig config DRM_NOUVEAU · line 15

Quoted 6 lines
drivers/gpu/drm/nouveau/Kconfig +1 -0
@@ -10,6 +10,7 @@ config DRM_NOUVEAU
 	select FB
 	select FRAMEBUFFER_CONSOLE if !EMBEDDED
 	select FB_BACKLIGHT if DRM_NOUVEAU_BACKLIGHT
+	select ACPI_VIDEO if ACPI
 	help
 	  Choose this option for open-source nVidia support.

Thanks, pushed to the nouveau tree.

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel