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>

diff --git a/drivers/gpu/drm/nouveau/dispnv04/arb.c b/drivers/gpu/drm/nouveau/dispnv04/arb.c
index 90075b676256f7f335f3816385837cc4f99a2708..c79160c37f847784f2a35b451fc05c8441f1b0e2 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/arb.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/arb.c
@@ -213,8 +213,10 @@ nv04_update_arb(struct drm_device *dev, int VClk, int bpp,
        if ((dev->pdev->device & 0xffff) == 0x01a0 /*CHIPSET_NFORCE*/ ||
            (dev->pdev->device & 0xffff) == 0x01f0 /*CHIPSET_NFORCE2*/) {
                uint32_t type;
+               int domain = pci_domain_nr(dev->pdev->bus);
 
-               pci_read_config_dword(pci_get_bus_and_slot(0, 1), 0x7c, &type);
+               pci_read_config_dword(pci_get_domain_bus_and_slot(domain, 0, 1),
+                                     0x7c, &type);
 
                sim_data.memory_type = (type >> 12) & 1;
                sim_data.memory_width = 64;

diff --git a/drivers/gpu/drm/nouveau/dispnv04/hw.c b/drivers/gpu/drm/nouveau/dispnv04/hw.c
index b9859900283185738fbff21af4f3f4039d00d439..0c9bdf023f5b559059479232075d612172971905 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/hw.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/hw.c
@@ -216,12 +216,15 @@ nouveau_hw_get_clock(struct drm_device *dev, enum nvbios_pll_type plltype)
 {
        struct nvkm_pll_vals pllvals;
        int ret;
+       int domain;
+
+       domain = pci_domain_nr(dev->pdev->bus);
 
        if (plltype == PLL_MEMORY &&
            (dev->pdev->device & 0x0ff0) == CHIPSET_NFORCE) {
                uint32_t mpllP;
-
-               pci_read_config_dword(pci_get_bus_and_slot(0, 3), 0x6c, &mpllP);
+               pci_read_config_dword(pci_get_domain_bus_and_slot(domain, 0, 3),
+                                     0x6c, &mpllP);
                mpllP = (mpllP >> 8) & 0xf;
                if (!mpllP)
                        mpllP = 4;
@@ -232,7 +235,8 @@ nouveau_hw_get_clock(struct drm_device *dev, enum nvbios_pll_type plltype)
            (dev->pdev->device & 0xff0) == CHIPSET_NFORCE2) {
                uint32_t clock;
 
-               pci_read_config_dword(pci_get_bus_and_slot(0, 5), 0x4c, &clock);
+               pci_read_config_dword(pci_get_domain_bus_and_slot(domain, 0, 5),
+                                     0x4c, &clock);
                return clock / 1000;
        }
 

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 8d4a5be3b913016c410c8226ad5b05b0bf75299b..33b6139c1bf1bad80d1457c083598d9970d7e44a 100644 (file)
--- 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) {

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c
index 4c07d10bb9760f7560985238b887c7b01414932e..18241c6ba5fa3609b82a3b10ef995fd4b6eb5f7f 100644 (file)
--- 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;