drm/i915: get the bridge device once.

The driver gets the bridge device in a number of places, upcoming
vga arb code paths need the bridge device, however they need it in
under a lock, and the pci lookup can allocate memory. So clean
this code up before then and get the bridge once for the driver lifetime.

Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 23 insertions, 10 deletions

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 91ef4c150193..9909505d070a 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -898,6 +898,18 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
         return 0;
 }
 
+static int i915_get_bridge_dev(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+
+        dev_priv->bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
+        if (!dev_priv->bridge_dev) {
+                DRM_ERROR("bridge device not found\n");
+                return -1;
+        }
+        return 0;
+}
+
 /**
  * i915_probe_agp - get AGP bootup configuration
  * @pdev: PCI device
@@ -911,20 +923,13 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
 static int i915_probe_agp(struct drm_device *dev, uint32_t *aperture_size,
                           uint32_t *preallocated_size)
 {
-        struct pci_dev *bridge_dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
         u16 tmp = 0;
         unsigned long overhead;
         unsigned long stolen;
 
-        bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
-        if (!bridge_dev) {
-                DRM_ERROR("bridge device not found\n");
-                return -1;
-        }
-
         /* Get the fb aperture size and "stolen" memory amount. */
-        pci_read_config_word(bridge_dev, INTEL_GMCH_CTRL, &tmp);
-        pci_dev_put(bridge_dev);
+        pci_read_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, &tmp);
 
         *aperture_size = 1024 * 1024;
         *preallocated_size = 1024 * 1024;
@@ -1176,11 +1181,16 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
         base = drm_get_resource_start(dev, mmio_bar);
         size = drm_get_resource_len(dev, mmio_bar);
 
+        if (i915_get_bridge_dev(dev)) {
+                ret = -EIO;
+                goto free_priv;
+        }
+
         dev_priv->regs = ioremap(base, size);
         if (!dev_priv->regs) {
                 DRM_ERROR("failed to map registers\n");
                 ret = -EIO;
-                goto free_priv;
+                goto put_bridge;
         }
 
         dev_priv->mm.gtt_mapping =
@@ -1292,6 +1302,8 @@ out_iomapfree:
         io_mapping_free(dev_priv->mm.gtt_mapping);
 out_rmmap:
         iounmap(dev_priv->regs);
+put_bridge:
+        pci_dev_put(dev_priv->bridge_dev);
 free_priv:
         kfree(dev_priv);
         return ret;
@@ -1335,6 +1347,7 @@ int i915_driver_unload(struct drm_device *dev)
                 i915_gem_lastclose(dev);
         }
 
+        pci_dev_put(dev_priv->bridge_dev);
         kfree(dev->dev_private);
 
         return 0;