diff options
| author | Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de> | 2011-01-23 19:17:17 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-01-24 19:28:08 +0100 |
| commit | b705120e4198315f4ae043de06c62f65e0851fd3 (patch) | |
| tree | d10bd8c952fa5ab18c9aacafeda37c72eb675c44 /drivers/gpu/drm/i915/intel_opregion.c | |
| parent | Merge remote branch 'linus/master' into drm-intel-fixes (diff) | |
| download | linux-b705120e4198315f4ae043de06c62f65e0851fd3.tar.xz linux-b705120e4198315f4ae043de06c62f65e0851fd3.zip | |
drm/i915: Use consistent mappings for OpRegion between ACPI and i915
The opregion is a shared memory region between ACPI and the graphics
driver. As the ACPI mapping has been changed to cachable in commit
6d5bbf00d251cc73223a71422d69e069dc2e0b8d, mapping the intel opregion
non-cachable now fails. As no bus-master hardware is involved in the
opregion, cachable map should do no harm.
Tested on a Fujitsu Lifebook P8010.
Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
[ickle: convert to acpi_os_ioremap for consistency]
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_opregion.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_opregion.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index f295a7aaadf9..64fd64443ca6 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -26,6 +26,7 @@ */ #include <linux/acpi.h> +#include <linux/acpi_io.h> #include <acpi/video.h> #include "drmP.h" @@ -476,7 +477,7 @@ int intel_opregion_setup(struct drm_device *dev) return -ENOTSUPP; } - base = ioremap(asls, OPREGION_SIZE); + base = acpi_os_ioremap(asls, OPREGION_SIZE); if (!base) return -ENOMEM; |