diff options
| author |   Sinan Kaya <okaya@codeaurora.org> | 2017-12-19 00:37:45 -0500 |
|---|---|---|
| committer |   Bjorn Helgaas <helgaas@kernel.org> | 2018-01-11 17:28:14 -0600 |
| commit | 2fa6d6cdaf283c05ae23842b2a04aeb223203c13 (patch) | |
| tree | 0e41ff51bfb47edf2443be521e4d36506aa1ca1c /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | drm/gma500: Deprecate pci_get_bus_and_slot() (diff) | |
| download | linux-dev-2fa6d6cdaf283c05ae23842b2a04aeb223203c13.tar.xz linux-dev-2fa6d6cdaf283c05ae23842b2a04aeb223203c13.zip | |
drm/nouveau: deprecate pci_get_bus_and_slot()
pci_get_bus_and_slot() is restrictive such that it assumes domain=0 as
where a PCI device is present. This restricts the device drivers to be
reused for other domain numbers.
Getting ready to remove pci_get_bus_and_slot() function in favor of
pci_get_domain_bus_and_slot().
Replace pci_get_bus_and_slot() with pci_get_domain_bus_and_slot()
and extract the domain number from
1. struct pci_dev
2. struct pci_dev through drm_device->pdev
3. struct pci_dev through fb->subdev->drm_device->pdev
Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Signed-off-by: Bjorn Helgaas <helgaas@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 8d4a5be3b913..33b6139c1bf1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -524,7 +524,8 @@ nouveau_get_hdmi_dev(struct nouveau_drm *drm) } /* subfunction one is a hdmi audio device? */ - drm->hdmi_device = pci_get_bus_and_slot((unsigned int)pdev->bus->number, + drm->hdmi_device = pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus), + (unsigned int)pdev->bus->number, PCI_DEVFN(PCI_SLOT(pdev->devfn), 1)); if (!drm->hdmi_device) { |