drm/i915: use kref_put_mutex in i915_gem_request_unreference__unlocked
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 4fd38f2..d5b2115 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2148,14 +2148,14 @@
static inline void
i915_gem_request_unreference__unlocked(struct drm_i915_gem_request *req)
{
- if (req && !atomic_add_unless(&req->ref.refcount, -1, 1)) {
- struct drm_device *dev = req->ring->dev;
+ struct drm_device *dev;
- mutex_lock(&dev->struct_mutex);
- if (likely(atomic_dec_and_test(&req->ref.refcount)))
- i915_gem_request_free(&req->ref);
+ if (!req)
+ return;
+
+ dev = req->ring->dev;
+ if (kref_put_mutex(&req->ref, i915_gem_request_free, &dev->struct_mutex))
mutex_unlock(&dev->struct_mutex);
- }
}
static inline void i915_gem_request_assign(struct drm_i915_gem_request **pdst,