Recent change to nouveau breaks PPC on F-13

[Ben Skeggs]

On Thu, 2010-04-15 at 10:28 -0400, Josh Boyer wrote:
> Sigh,
> 
> The drm-nouveau-acpi-edid-fallback.patch recently had some code added to
> nouveau_connector.c to do some fallback to ACPI.  It looks like this:
Thank you for the report!  Didn't catch this as Fedora doesn't build on
non-x86 these days.

I've submitted a new build with a fix for this, and another issue I
uncovered while looking at it.

Thank you again!
Ben.
> 
> @@ -718,6 +718,14 @@ nouveau_connector_create_lvds(struct drm
>                 }
>         }
> 
> +       /* Let's try ACPI */
> +       if (!nv_connector->edid && !nv_connector->native_mode &&
> +           !dev_priv->vbios.fp_no_ddc &&
> +           !nouveau_acpi_get_edid(dev,connector)) {
> +                   nv_connector->edid =
> +                           (struct edid *)&nv_connector->acpi_edid;
> +       }
> +
>         if (!nv_connector->edid)
>                 goto out;
> 
> However, there is no ACPI on PPC/PPC64, so the build fails with this:
> 
> 
> drivers/gpu/drm/nouveau/nouveau_connector.c: In function 'nouveau_connector_create_lvds':
> drivers/gpu/drm/nouveau/nouveau_connector.c:726: error: 'struct nouveau_connector' has no member named 'acpi_edid'
> make[4]: *** [drivers/gpu/drm/nouveau/nouveau_connector.o] Error 1
> make[3]: *** [drivers/gpu/drm/nouveau] Error 2
> make[2]: *** [drivers/gpu/drm] Error 2
> make[1]: *** [drivers/gpu] Error 2
> make: *** [drivers] Error 2
> make: *** Waiting for unfinished jobs....
> 
> I'm pretty sure the above code should be wrapped with #ifdef CONFIG_ACPI or
> something similar.  The structure add in nouveau_connector.h is at least.
> 
> josh
> _______________________________________________
> kernel mailing list
> kernel at lists.fedoraproject.org
> https://admin.fedoraproject.org/mailman/listinfo/kernel