summaryrefslogtreecommitdiff
path: root/linux-core/i915_gem_tiling.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2008-08-07 17:15:50 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-08-07 17:15:50 -0700
commit8074b2e83d18bbf85d1c3284f561d849c829dd4b (patch)
treee8f34c1779cb28336669296def5cad333b312914 /linux-core/i915_gem_tiling.c
parentc7fb19e9b074281f143b0e1c9d054ebcf5ff1091 (diff)
parent4585787bd1a1d782b9e7c06095f98d09165b8c23 (diff)
Make modesetting-gem build with recent kernels
Needed to merge in VM fault changes & pci_read_base API update.
Diffstat (limited to 'linux-core/i915_gem_tiling.c')
-rw-r--r--linux-core/i915_gem_tiling.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/i915_gem_tiling.c b/linux-core/i915_gem_tiling.c
index c5825fbb..3ac1f353 100644
--- a/linux-core/i915_gem_tiling.c
+++ b/linux-core/i915_gem_tiling.c
@@ -115,7 +115,8 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev)
* since the bridge would only ever use standard BARs 0-1 (though it
* doesn't anyway)
*/
- ret = pci_read_base(bridge, mchbar_offset, &bridge->resource[2]);
+ ret = pci_read_base(bridge, pci_bar_mem64, &bridge->resource[2],
+ mchbar_offset);
if (ret != 0) {
DRM_ERROR("pci_read_base failed: %d\n", ret);
return;