summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_panel.c
diff options
context:
space:
mode:
authorWilliams, Dan J <dan.j.williams@intel.com>2015-10-12 21:12:57 +0000
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-10-13 10:22:45 +0200
commit115719fceaa733d646e39cdce83cc32ddb891a49 (patch)
treede16a97ec73b5bc060ed6dedb5275bc492c41385 /drivers/gpu/drm/i915/intel_panel.c
parentadfb46721e4a4ef373dee8b773b424c40a176fc2 (diff)
downloadop-kernel-dev-115719fceaa733d646e39cdce83cc32ddb891a49.zip
op-kernel-dev-115719fceaa733d646e39cdce83cc32ddb891a49.tar.gz
i915: switch from acpi_os_ioremap to memremap
i915 expects the OpRegion to be cached (i.e. not __iomem), so explicitly map it with memremap rather than the implied cache setting of acpi_os_ioremap(). Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: intel-gfx@lists.freedesktop.org Cc: David Airlie <airlied@linux.ie> Cc: dri-devel@lists.freedesktop.org Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_panel.c')
-rw-r--r--drivers/gpu/drm/i915/intel_panel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index f30c996..b05c6d9 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -381,7 +381,7 @@ intel_panel_detect(struct drm_device *dev)
/* Assume that the BIOS does not lie through the OpRegion... */
if (!i915.panel_ignore_lid && dev_priv->opregion.lid_state) {
- return ioread32(dev_priv->opregion.lid_state) & 0x1 ?
+ return *dev_priv->opregion.lid_state & 0x1 ?
connector_status_connected :
connector_status_disconnected;
}
OpenPOWER on IntegriCloud