diff options
| author | Sinan Kaya <okaya@codeaurora.org> | 2017-12-19 06:37:45 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-01-12 00:28:14 +0100 |
| commit | 2fa6d6cdaf283c05ae23842b2a04aeb223203c13 (patch) | |
| tree | 0e41ff51bfb47edf2443be521e4d36506aa1ca1c /drivers/gpu/drm/nouveau/nvkm/subdev/fb | |
| parent | drm/gma500: Deprecate pci_get_bus_and_slot() (diff) | |
| download | linux-2fa6d6cdaf283c05ae23842b2a04aeb223203c13.tar.xz linux-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/nvkm/subdev/fb')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c index 4c07d10bb976..18241c6ba5fa 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c @@ -28,8 +28,16 @@ nv1a_ram_new(struct nvkm_fb *fb, struct nvkm_ram **pram) { struct pci_dev *bridge; u32 mem, mib; + int domain = 0; + struct pci_dev *pdev = NULL; - bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 1)); + if (dev_is_pci(fb->subdev.device->dev)) + pdev = to_pci_dev(fb->subdev.device->dev); + + if (pdev) + domain = pci_domain_nr(pdev->bus); + + bridge = pci_get_domain_bus_and_slot(domain, 0, PCI_DEVFN(0, 1)); if (!bridge) { nvkm_error(&fb->subdev, "no bridge device\n"); return -ENODEV; |