diff options
| author | Eric Anholt <eric@anholt.net> | 2009-06-21 22:14:55 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-21 22:33:15 -0700 |
| commit | be9f1c4f738a715abbd8ea742f3ec60a1ce73f4b (patch) | |
| tree | 0385b0a9af9a0996e3b8f01a317f3e1da8637ae8 /drivers/gpu/drm/i915/i915_gem_tiling.c | |
| parent | 8c52da503b7e4cf961807f11824e3258ef9f7f1c (diff) | |
| parent | fb0f8fbf97e8a25074c81c629500d94cafa9e366 (diff) | |
Merge commit 'keithp/drm-intel-next' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_tiling.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_tiling.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index 5c1ceec49f5..daeae62e1c2 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c @@ -114,11 +114,13 @@ intel_alloc_mchbar_resource(struct drm_device *dev) mchbar_addr = ((u64)temp_hi << 32) | temp_lo; /* If ACPI doesn't have it, assume we need to allocate it ourselves */ +#ifdef CONFIG_PNP if (mchbar_addr && pnp_range_reserved(mchbar_addr, mchbar_addr + MCHBAR_SIZE)) { ret = 0; goto out_put; } +#endif /* Get some space for it */ ret = pci_bus_alloc_resource(bridge_dev->bus, &dev_priv->mch_res, |