Skip to content

L
linux-davinci
Commit b99e228d authored by Keith Packard's avatar Keith Packard
Browse files
Options

drm/i915: check for CONFIG_PNP before using pnp function 

Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent 98acd46f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
drivers/gpu/drm/i915/i915_gem_tiling.c
View file @ b99e228d
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment