diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-06 13:55:10 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-10 08:20:20 +1000 |
| commit | c17c2f892e23a3c70281a4e79bd7c2c226b1a561 (patch) | |
| tree | 73e048ae853103479e3ba747809fc8c38f6b7de8 /include/drm | |
| parent | c3b6ef8633e75bdcde8e845548e3b95e9a21cdf6 (diff) | |
| download | op-kernel-dev-c17c2f892e23a3c70281a4e79bd7c2c226b1a561.zip op-kernel-dev-c17c2f892e23a3c70281a4e79bd7c2c226b1a561.tar.gz | |
drm: Fix support for PCI domains
(For some reason I thought that went in ages ago ...)
This fixes support for PCI domains in what should hopefully be a backward
compatible way along with a change to libdrm.
When the interface version is set to 1.4, we assume userspace understands
domains and the world is at peace. We thus pass proper domain numbers
instead of 0 to userspace.
The newer libdrm will then try 1.4 first, and fallback to 1.1, along with
ignoring domains in the later case (well, except on alpha of course)
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 22 | ||||
| -rw-r--r-- | include/drm/drm_core.h | 2 |
2 files changed, 17 insertions, 7 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index e2a4da7..2a512bc 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1075,7 +1075,6 @@ static __inline__ int drm_core_check_feature(struct drm_device *dev, return ((dev->driver->driver_features & feature) ? 1 : 0); } - static inline int drm_dev_to_irq(struct drm_device *dev) { if (drm_core_check_feature(dev, DRIVER_USE_PLATFORM_DEVICE)) @@ -1084,11 +1083,22 @@ static inline int drm_dev_to_irq(struct drm_device *dev) return dev->pdev->irq; } -#ifdef __alpha__ -#define drm_get_pci_domain(dev) dev->hose->index -#else -#define drm_get_pci_domain(dev) 0 -#endif +static inline int drm_get_pci_domain(struct drm_device *dev) +{ + if (drm_core_check_feature(dev, DRIVER_USE_PLATFORM_DEVICE)) + return 0; + +#ifndef __alpha__ + /* For historical reasons, drm_get_pci_domain() is busticated + * on most archs and has to remain so for userspace interface + * < 1.4, except on alpha which was right from the beginning + */ + if (dev->if_version < 0x10004) + return 0; +#endif /* __alpha__ */ + + return pci_domain_nr(dev->pdev->bus); +} #if __OS_HAS_AGP static inline int drm_core_has_AGP(struct drm_device *dev) diff --git a/include/drm/drm_core.h b/include/drm/drm_core.h index 3167390..4e75238 100644 --- a/include/drm/drm_core.h +++ b/include/drm/drm_core.h @@ -27,7 +27,7 @@ #define CORE_DATE "20060810" #define DRM_IF_MAJOR 1 -#define DRM_IF_MINOR 3 +#define DRM_IF_MINOR 4 #define CORE_MAJOR 1 #define CORE_MINOR 1 |
