* drm: fix building on non-PCI platforms
@ 2010-09-08 15:15 Arnd Bergmann
2010-09-08 16:07 ` Jesse Barnes
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2010-09-08 15:15 UTC (permalink / raw)
To: Dave Airlie; +Cc: dri-devel
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@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: drm: fix building on non-PCI platforms
2010-09-08 15:15 drm: fix building on non-PCI platforms Arnd Bergmann
@ 2010-09-08 16:07 ` Jesse Barnes
0 siblings, 0 replies; 2+ messages in thread
From: Jesse Barnes @ 2010-09-08 16:07 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Dave Airlie, dri-devel
On Wed, 8 Sep 2010 17:15:02 +0200
Arnd Bergmann <arnd@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@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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-08 16:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-08 15:15 drm: fix building on non-PCI platforms Arnd Bergmann
2010-09-08 16:07 ` Jesse Barnes
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.