diff options
author | Dave Airlie <airlied@redhat.com> | 2009-08-03 21:43:41 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-09-07 21:45:15 -0400 |
commit | ec2a4c3fdc8e82fe82a25d800e85c1ea06b74372 (patch) | |
tree | b49f3ebe3e356fa8d17f15e9a5421851cb90024b /drivers/gpu/drm/i915/i915_gem_tiling.c | |
parent | f1938cd6e900a85de64184e46d841efc9efd3484 (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_gem_tiling.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_tiling.c | 65 |
1 files changed, 20 insertions, 45 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index e774a4a1a50..200e398453c 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c | |||
@@ -94,23 +94,15 @@ | |||
94 | static int | 94 | static int |
95 | intel_alloc_mchbar_resource(struct drm_device *dev) | 95 | intel_alloc_mchbar_resource(struct drm_device *dev) |
96 | { | 96 | { |
97 | struct pci_dev *bridge_dev; | ||
98 | drm_i915_private_t *dev_priv = dev->dev_private; | 97 | drm_i915_private_t *dev_priv = dev->dev_private; |
99 | int reg = IS_I965G(dev) ? MCHBAR_I965 : MCHBAR_I915; | 98 | int reg = IS_I965G(dev) ? MCHBAR_I965 : MCHBAR_I915; |
100 | u32 temp_lo, temp_hi = 0; | 99 | u32 temp_lo, temp_hi = 0; |
101 | u64 mchbar_addr; | 100 | u64 mchbar_addr; |
102 | int ret = 0; | 101 | int ret = 0; |
103 | 102 | ||
104 | bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0)); | ||
105 | if (!bridge_dev) { | ||
106 | DRM_DEBUG("no bridge dev?!\n"); | ||
107 | ret = -ENODEV; | ||
108 | goto out; | ||
109 | } | ||
110 | |||
111 | if (IS_I965G(dev)) | 103 | if (IS_I965G(dev)) |
112 | pci_read_config_dword(bridge_dev, reg + 4, &temp_hi); | 104 | pci_read_config_dword(dev_priv->bridge_dev, reg + 4, &temp_hi); |
113 | pci_read_config_dword(bridge_dev, reg, &temp_lo); | 105 | pci_read_config_dword(dev_priv->bridge_dev, reg, &temp_lo); |
114 | mchbar_addr = ((u64)temp_hi << 32) | temp_lo; | 106 | mchbar_addr = ((u64)temp_hi << 32) | temp_lo; |
115 | 107 | ||
116 | /* If ACPI doesn't have it, assume we need to allocate it ourselves */ | 108 | /* If ACPI doesn't have it, assume we need to allocate it ourselves */ |
@@ -118,30 +110,28 @@ intel_alloc_mchbar_resource(struct drm_device *dev) | |||
118 | if (mchbar_addr && | 110 | if (mchbar_addr && |
119 | pnp_range_reserved(mchbar_addr, mchbar_addr + MCHBAR_SIZE)) { | 111 | pnp_range_reserved(mchbar_addr, mchbar_addr + MCHBAR_SIZE)) { |
120 | ret = 0; | 112 | ret = 0; |
121 | goto out_put; | 113 | goto out; |
122 | } | 114 | } |
123 | #endif | 115 | #endif |
124 | 116 | ||
125 | /* Get some space for it */ | 117 | /* Get some space for it */ |
126 | ret = pci_bus_alloc_resource(bridge_dev->bus, &dev_priv->mch_res, | 118 | ret = pci_bus_alloc_resource(dev_priv->bridge_dev->bus, &dev_priv->mch_res, |
127 | MCHBAR_SIZE, MCHBAR_SIZE, | 119 | MCHBAR_SIZE, MCHBAR_SIZE, |
128 | PCIBIOS_MIN_MEM, | 120 | PCIBIOS_MIN_MEM, |
129 | 0, pcibios_align_resource, | 121 | 0, pcibios_align_resource, |
130 | bridge_dev); | 122 | dev_priv->bridge_dev); |
131 | if (ret) { | 123 | if (ret) { |
132 | DRM_DEBUG("failed bus alloc: %d\n", ret); | 124 | DRM_DEBUG("failed bus alloc: %d\n", ret); |
133 | dev_priv->mch_res.start = 0; | 125 | dev_priv->mch_res.start = 0; |
134 | goto out_put; | 126 | goto out; |
135 | } | 127 | } |
136 | 128 | ||
137 | if (IS_I965G(dev)) | 129 | if (IS_I965G(dev)) |
138 | pci_write_config_dword(bridge_dev, reg + 4, | 130 | pci_write_config_dword(dev_priv->bridge_dev, reg + 4, |
139 | upper_32_bits(dev_priv->mch_res.start)); | 131 | upper_32_bits(dev_priv->mch_res.start)); |
140 | 132 | ||
141 | pci_write_config_dword(bridge_dev, reg, | 133 | pci_write_config_dword(dev_priv->bridge_dev, reg, |
142 | lower_32_bits(dev_priv->mch_res.start)); | 134 | lower_32_bits(dev_priv->mch_res.start)); |
143 | out_put: | ||
144 | pci_dev_put(bridge_dev); | ||
145 | out: | 135 | out: |
146 | return ret; | 136 | return ret; |
147 | } | 137 | } |
@@ -150,44 +140,36 @@ out: | |||
150 | static bool | 140 | static bool |
151 | intel_setup_mchbar(struct drm_device *dev) | 141 | intel_setup_mchbar(struct drm_device *dev) |
152 | { | 142 | { |
153 | struct pci_dev *bridge_dev; | 143 | drm_i915_private_t *dev_priv = dev->dev_private; |
154 | int mchbar_reg = IS_I965G(dev) ? MCHBAR_I965 : MCHBAR_I915; | 144 | int mchbar_reg = IS_I965G(dev) ? MCHBAR_I965 : MCHBAR_I915; |
155 | u32 temp; | 145 | u32 temp; |
156 | bool need_disable = false, enabled; | 146 | bool need_disable = false, enabled; |
157 | 147 | ||
158 | bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0)); | ||
159 | if (!bridge_dev) { | ||
160 | DRM_DEBUG("no bridge dev?!\n"); | ||
161 | goto out; | ||
162 | } | ||
163 | |||
164 | if (IS_I915G(dev) || IS_I915GM(dev)) { | 148 | if (IS_I915G(dev) || IS_I915GM(dev)) { |
165 | pci_read_config_dword(bridge_dev, DEVEN_REG, &temp); | 149 | pci_read_config_dword(dev_priv->bridge_dev, DEVEN_REG, &temp); |
166 | enabled = !!(temp & DEVEN_MCHBAR_EN); | 150 | enabled = !!(temp & DEVEN_MCHBAR_EN); |
167 | } else { | 151 | } else { |
168 | pci_read_config_dword(bridge_dev, mchbar_reg, &temp); | 152 | pci_read_config_dword(dev_priv->bridge_dev, mchbar_reg, &temp); |
169 | enabled = temp & 1; | 153 | enabled = temp & 1; |
170 | } | 154 | } |
171 | 155 | ||
172 | /* If it's already enabled, don't have to do anything */ | 156 | /* If it's already enabled, don't have to do anything */ |
173 | if (enabled) | 157 | if (enabled) |
174 | goto out_put; | 158 | goto out; |
175 | 159 | ||
176 | if (intel_alloc_mchbar_resource(dev)) | 160 | if (intel_alloc_mchbar_resource(dev)) |
177 | goto out_put; | 161 | goto out; |
178 | 162 | ||
179 | need_disable = true; | 163 | need_disable = true; |
180 | 164 | ||
181 | /* Space is allocated or reserved, so enable it. */ | 165 | /* Space is allocated or reserved, so enable it. */ |
182 | if (IS_I915G(dev) || IS_I915GM(dev)) { | 166 | if (IS_I915G(dev) || IS_I915GM(dev)) { |
183 | pci_write_config_dword(bridge_dev, DEVEN_REG, | 167 | pci_write_config_dword(dev_priv->bridge_dev, DEVEN_REG, |
184 | temp | DEVEN_MCHBAR_EN); | 168 | temp | DEVEN_MCHBAR_EN); |
185 | } else { | 169 | } else { |
186 | pci_read_config_dword(bridge_dev, mchbar_reg, &temp); | 170 | pci_read_config_dword(dev_priv->bridge_dev, mchbar_reg, &temp); |
187 | pci_write_config_dword(bridge_dev, mchbar_reg, temp | 1); | 171 | pci_write_config_dword(dev_priv->bridge_dev, mchbar_reg, temp | 1); |
188 | } | 172 | } |
189 | out_put: | ||
190 | pci_dev_put(bridge_dev); | ||
191 | out: | 173 | out: |
192 | return need_disable; | 174 | return need_disable; |
193 | } | 175 | } |
@@ -196,25 +178,18 @@ static void | |||
196 | intel_teardown_mchbar(struct drm_device *dev, bool disable) | 178 | intel_teardown_mchbar(struct drm_device *dev, bool disable) |
197 | { | 179 | { |
198 | drm_i915_private_t *dev_priv = dev->dev_private; | 180 | drm_i915_private_t *dev_priv = dev->dev_private; |
199 | struct pci_dev *bridge_dev; | ||
200 | int mchbar_reg = IS_I965G(dev) ? MCHBAR_I965 : MCHBAR_I915; | 181 | int mchbar_reg = IS_I965G(dev) ? MCHBAR_I965 : MCHBAR_I915; |
201 | u32 temp; | 182 | u32 temp; |
202 | 183 | ||
203 | bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0)); | ||
204 | if (!bridge_dev) { | ||
205 | DRM_DEBUG("no bridge dev?!\n"); | ||
206 | return; | ||
207 | } | ||
208 | |||
209 | if (disable) { | 184 | if (disable) { |
210 | if (IS_I915G(dev) || IS_I915GM(dev)) { | 185 | if (IS_I915G(dev) || IS_I915GM(dev)) { |
211 | pci_read_config_dword(bridge_dev, DEVEN_REG, &temp); | 186 | pci_read_config_dword(dev_priv->bridge_dev, DEVEN_REG, &temp); |
212 | temp &= ~DEVEN_MCHBAR_EN; | 187 | temp &= ~DEVEN_MCHBAR_EN; |
213 | pci_write_config_dword(bridge_dev, DEVEN_REG, temp); | 188 | pci_write_config_dword(dev_priv->bridge_dev, DEVEN_REG, temp); |
214 | } else { | 189 | } else { |
215 | pci_read_config_dword(bridge_dev, mchbar_reg, &temp); | 190 | pci_read_config_dword(dev_priv->bridge_dev, mchbar_reg, &temp); |
216 | temp &= ~1; | 191 | temp &= ~1; |
217 | pci_write_config_dword(bridge_dev, mchbar_reg, temp); | 192 | pci_write_config_dword(dev_priv->bridge_dev, mchbar_reg, temp); |
218 | } | 193 | } |
219 | } | 194 | } |
220 | 195 | ||