diff options
author | Dave Airlie <airlied@linux.ie> | 2006-08-07 06:23:42 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-09-21 15:32:30 -0400 |
commit | 332296016ee2e808b362de66bf6bec49c396e5bf (patch) | |
tree | 4bf9c5794f851f1a54e8468b4da9c0531795e004 /drivers/char/drm/drm_ioctl.c | |
parent | 242ef0e1e7e5bb7e80c3620c1aa55168819d6fb8 (diff) |
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/drm_ioctl.c')
-rw-r--r-- | drivers/char/drm/drm_ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c index 9f20c2b5a366..e15899830581 100644 --- a/drivers/char/drm/drm_ioctl.c +++ b/drivers/char/drm/drm_ioctl.c | |||
@@ -127,7 +127,7 @@ int drm_setunique(struct inode *inode, struct file *filp, | |||
127 | domain = bus >> 8; | 127 | domain = bus >> 8; |
128 | bus &= 0xff; | 128 | bus &= 0xff; |
129 | 129 | ||
130 | if ((domain != dev->pci_domain) || | 130 | if ((domain != drm_get_pci_domain(dev)) || |
131 | (bus != dev->pdev->bus->number) || | 131 | (bus != dev->pdev->bus->number) || |
132 | (slot != PCI_SLOT(dev->pdev->devfn)) || | 132 | (slot != PCI_SLOT(dev->pdev->devfn)) || |
133 | (func != PCI_FUNC(dev->pdev->devfn))) | 133 | (func != PCI_FUNC(dev->pdev->devfn))) |
@@ -149,7 +149,7 @@ static int drm_set_busid(drm_device_t * dev) | |||
149 | return ENOMEM; | 149 | return ENOMEM; |
150 | 150 | ||
151 | len = snprintf(dev->unique, dev->unique_len, "pci:%04x:%02x:%02x.%d", | 151 | len = snprintf(dev->unique, dev->unique_len, "pci:%04x:%02x:%02x.%d", |
152 | dev->pci_domain, dev->pdev->bus->number, | 152 | drm_get_pci_domain(dev), dev->pdev->bus->number, |
153 | PCI_SLOT(dev->pdev->devfn), | 153 | PCI_SLOT(dev->pdev->devfn), |
154 | PCI_FUNC(dev->pdev->devfn)); | 154 | PCI_FUNC(dev->pdev->devfn)); |
155 | 155 | ||