drm: fix building on non-PCI platforms

Jesse Barnes jbarnes at virtuousgeek.org
Wed Sep 8 09:07:38 PDT 2010


On Wed, 8 Sep 2010 17:15:02 +0200
Arnd Bergmann <arnd at arndb.de> wrote:

> BenH's fix to correct building on multi-domain systems broke
> building DRM for platforms without PCI support. This makes
> the call to pci_domain_nr conditional in order to fix compilation.
> 
> Signed-off-by: Arnd Bergmann <arnd at arndb.de>
> 
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index 7809d23..5ff5819 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -1099,7 +1099,11 @@ static inline int drm_get_pci_domain(struct drm_device *dev)
>  		return 0;
>  #endif /* __alpha__ */
>  
> +#ifdef CONFIG_PCI
>  	return pci_domain_nr(dev->pdev->bus);
> +#else
> +	return 0;
> +#endif
>  }
>  
>  #if __OS_HAS_AGP

I think we fixed this, but I guess Linus hasn't pulled my tree yet...

-- 
Jesse Barnes, Intel Open Source Technology Center


More information about the dri-devel mailing list