[PATCH v2] nouveau build regression, undefined reference to `acpi_video_get_edid'

[Francisco Jerez]

Phil Turmel <philip at turmel.org> writes:

> 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 <bskeggs at redhat.com>
> Date:   Mon Jul 12 15:33:07 2010 +1000
>
>     drm/nouveau: support fetching LVDS EDID from ACPI
>
>     Based on a patch from Matthew Garrett.
>
>     Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
>     Acked-by: Matthew Garrett <mjg at redhat.com>
>
> :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.
>
> Signed-off-by: Philip J. Turmel <philip at turmel.org>
> ---
>
> The first version disabled all ACPI functions in the nouveau driver if
> ACPI_VIDEO wasn't set.  Francisco Jerez <currojerez at riseup.net> pointed out
> that this didn't make much sense.
>
> diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
> index d2d2804..72730e9 100644
> --- a/drivers/gpu/drm/nouveau/Kconfig
> +++ b/drivers/gpu/drm/nouveau/Kconfig
> @@ -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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 229 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20100917/9056e4ec/attachment.pgp>