aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-08-03 21:43:41 -0400
committerDave Airlie <airlied@redhat.com>2009-09-07 21:45:15 -0400
commitec2a4c3fdc8e82fe82a25d800e85c1ea06b74372 (patch)
treeb49f3ebe3e356fa8d17f15e9a5421851cb90024b /drivers/gpu/drm/i915/i915_drv.h
parentf1938cd6e900a85de64184e46d841efc9efd3484 (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 2d5bce643e6a..77ed060b4292 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -155,6 +155,7 @@ typedef struct drm_i915_private {
155 155
156 void __iomem *regs; 156 void __iomem *regs;
157 157
158 struct pci_dev *bridge_dev;
158 drm_i915_ring_buffer_t ring; 159 drm_i915_ring_buffer_t ring;
159 160
160 drm_dma_handle_t *status_page_dmah; 161 drm_dma_handle_t *status_page_dmah;