diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-08-04 14:34:24 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-05 08:48:53 +1000 |
| commit | fca3ec01e0b40cab82cac7745e154b01969e6219 (patch) | |
| tree | 731d6cdc321c8c1f8b2c4e8f0fdb0df59b5abbc9 /drivers/gpu/drm/i915/intel_overlay.c | |
| parent | 430f70d59da643f1aa7c9cf3493423a76550b110 (diff) | |
| download | talos-obmc-linux-fca3ec01e0b40cab82cac7745e154b01969e6219.tar.gz talos-obmc-linux-fca3ec01e0b40cab82cac7745e154b01969e6219.zip | |
drm,io-mapping: Specify slot to use for atomic mappings
This is required should we ever attempt to use an io-mapping where
KM_USER0 is verboten, such as inside an IRQ context.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_overlay.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_overlay.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index f26ec2f27d36..d39aea24eabe 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c @@ -185,7 +185,8 @@ static struct overlay_registers *intel_overlay_map_regs_atomic(struct intel_over if (OVERLAY_NONPHYSICAL(overlay->dev)) { regs = io_mapping_map_atomic_wc(dev_priv->mm.gtt_mapping, - overlay->reg_bo->gtt_offset); + overlay->reg_bo->gtt_offset, + KM_USER0); if (!regs) { DRM_ERROR("failed to map overlay regs in GTT\n"); @@ -200,7 +201,7 @@ static struct overlay_registers *intel_overlay_map_regs_atomic(struct intel_over static void intel_overlay_unmap_regs_atomic(struct intel_overlay *overlay) { if (OVERLAY_NONPHYSICAL(overlay->dev)) - io_mapping_unmap_atomic(overlay->virt_addr); + io_mapping_unmap_atomic(overlay->virt_addr, KM_USER0); overlay->virt_addr = NULL; |
