diff options
authorDaniel Vetter <>2013-08-08 09:10:37 +0200
committerDave Airlie <>2013-08-19 13:24:54 +1000
commiteb91626ac4b9af3d5602a7db888b8bc4cb23eb3b (patch)
parentd2b2c08456d12a9914c87cef479b2ec2ab30337f (diff)
drm/i915: unpin backing storage in dmabuf_unmap
This fixes a WARN in i915_gem_free_object when the obj->pages_pin_count isn't 0. v2: Add locking to unmap, noticed by Chris Wilson. Note that even though we call unmap with our own dev->struct_mutex held that won't result in an immediate deadlock since we never go through the dma_buf interfaces for our own, reimported buffers. But it's still easy to blow up and anger lockdep, but that's already the case with our ->map implementation. Fixing this for real will involve per dma-buf ww mutex locking by the callers. And lots of fun. So go with the duct-tape approach for now. Cc: Chris Wilson <> Reported-by: Maarten Lankhorst <> Cc: Maarten Lankhorst <> Tested-by: Armin K. <> (v1) Tested-by: Dave Airlie <> Acked-by: Maarten Lankhorst <> Signed-off-by: Daniel Vetter <> Signed-off-by: Dave Airlie <>
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
index dc53a527126b..9e6578330801 100644
--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
@@ -85,9 +85,17 @@ static void i915_gem_unmap_dma_buf(struct dma_buf_attachment *attachment,
struct sg_table *sg,
enum dma_data_direction dir)
+ struct drm_i915_gem_object *obj = attachment->dmabuf->priv;
+ mutex_lock(&obj->>struct_mutex);
dma_unmap_sg(attachment->dev, sg->sgl, sg->nents, dir);
+ i915_gem_object_unpin_pages(obj);
+ mutex_unlock(&obj->>struct_mutex);
static void i915_gem_dmabuf_release(struct dma_buf *dma_buf)