Re: drm/agp linux-next build broken for non-AGP platform

[David Herrmann]

Hi

On Thu, Aug 8, 2013 at 12:01 PM, Vincent Stehlé
<vincent.stehle@xxxxxxxxxxxxx> wrote:
> Hi,
>
> Linux next-20130808 link breaks for me with ARM config multi_v7defconfig.
>
> It seems this is due to the following commit:
>
>   28ec711 drm/agp: move AGP cleanup paths to drm_agpsupport.c
>
> ...which calls drm_agp_clear() without "gating" it with __OS_HAS_AGP.
> As the code of drm_agpsupport.c is only "emited" when __OS_HAS_AGP,
> which is not the case for me, link breaks.
>
> As a "hint", see the patch below, which "repairs" the link for me. This is
> probably not functional; please DO NOT APPLY.
>
> Best regards,
>
> V.
>

Yepp, I missed that, sorry. There is already a patch pending on dri-devel:
  http://lists.freedesktop.org/archives/dri-devel/2013-August/043077.html

Thanks
David

> ---
>  drivers/gpu/drm/drm_drv.c |    2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index dddd799..58f7f39 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -195,7 +195,9 @@ int drm_lastclose(struct drm_device * dev)
>
>         mutex_lock(&dev->struct_mutex);
>
> +#if __OS_HAS_AGP
>         drm_agp_clear(dev);
> +#endif
>
>         if (drm_core_check_feature(dev, DRIVER_SG) && dev->sg &&
>             !drm_core_check_feature(dev, DRIVER_MODESET)) {
> --
> 1.7.10.4
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/