diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-12-09 10:23:43 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-12-09 10:23:43 -0800 |
| commit | 6656db10551bbb8770dd945b6d81d5138521f208 (patch) | |
| tree | 68e457660c174ee2e16353691126ddd754c79398 /linux-core/i915_gem_tiling.c | |
| parent | c99566fb810c9d8cae5e9cd39d1772b55e2f514c (diff) | |
| parent | 12e68f8059485fb4f02a15f74ab2fa3bdff38c81 (diff) | |
Merge branch 'modesetting-gem'
Diffstat (limited to 'linux-core/i915_gem_tiling.c')
| -rw-r--r-- | linux-core/i915_gem_tiling.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linux-core/i915_gem_tiling.c b/linux-core/i915_gem_tiling.c index a4ff736f..3ac1f353 100644 --- a/linux-core/i915_gem_tiling.c +++ b/linux-core/i915_gem_tiling.c @@ -86,7 +86,7 @@ void i915_gem_detect_bit_6_swizzle(struct drm_device *dev) { - drm_i915_private_t *dev_priv = dev->dev_private; + struct drm_i915_private *dev_priv = dev->dev_private; struct pci_dev *bridge; uint32_t swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN; uint32_t swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN; @@ -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; @@ -233,7 +234,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_i915_gem_set_tiling *args = data; - drm_i915_private_t *dev_priv = dev->dev_private; + struct drm_i915_private *dev_priv = dev->dev_private; struct drm_gem_object *obj; struct drm_i915_gem_object *obj_priv; @@ -275,7 +276,7 @@ i915_gem_get_tiling(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_i915_gem_get_tiling *args = data; - drm_i915_private_t *dev_priv = dev->dev_private; + struct drm_i915_private *dev_priv = dev->dev_private; struct drm_gem_object *obj; struct drm_i915_gem_object *obj_priv; |