Skip to content

Commit

Permalink
drm/i915: Use consistent mappings for OpRegion between ACPI and i915
Browse files Browse the repository at this point in the history
The opregion is a shared memory region between ACPI and the graphics
driver. As the ACPI mapping has been changed to cachable in commit
6d5bbf0, 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>
  • Loading branch information
Michael Karcher authored and Chris Wilson committed Jan 24, 2011
1 parent 8a327f2 commit b705120
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/i915/intel_opregion.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
*/

#include <linux/acpi.h>
#include <linux/acpi_io.h>
#include <acpi/video.h>

#include "drmP.h"
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit b705120

Please sign in to comment.