diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-08-07 12:23:42 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-09-21 21:32:30 +0200 |
| commit | 332296016ee2e808b362de66bf6bec49c396e5bf (patch) | |
| tree | 4bf9c5794f851f1a54e8468b4da9c0531795e004 /drivers/char/drm/drmP.h | |
| parent | drm: remove local copies of pci bus/slot/func (diff) | |
| download | linux-332296016ee2e808b362de66bf6bec49c396e5bf.tar.xz linux-332296016ee2e808b362de66bf6bec49c396e5bf.zip | |
drm: remove the DRM pci domain
This patch removes the pci_domain from the DRM device structure, and
gets it via a macro that either asks the platform or does the alpha special
case. jgarzik asked for this to just use the platform magic, but I've no
alpha experience and I'd rather not just break it and wait for someone to
give out.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drmP.h')
| -rw-r--r-- | drivers/char/drm/drmP.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 9838e8ce6ff2..4f0de974c191 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h @@ -699,7 +699,6 @@ typedef struct drm_device { drm_agp_head_t *agp; /**< AGP data */ struct pci_dev *pdev; /**< PCI device structure */ - int pci_domain; /**< PCI bus domain number */ #ifdef __alpha__ struct pci_controller *hose; #endif @@ -721,6 +720,12 @@ static __inline__ int drm_core_check_feature(struct drm_device *dev, return ((dev->driver->driver_features & feature) ? 1 : 0); } +#ifdef __alpha__ +#define drm_get_pci_domain(dev) dev->hose->bus->number +#else +#define drm_get_pci_domain(dev) pci_domain_nr(dev->pdev->bus) +#endif + #if __OS_HAS_AGP static inline int drm_core_has_AGP(struct drm_device *dev) { |