diff options
author | Eric Anholt <eric@anholt.net> | 2008-06-11 16:19:23 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2008-06-11 16:19:23 -0700 |
commit | b2606e325ac02782297def5ce27028c7fe2287c8 (patch) | |
tree | a263ce59974aacbff791b3d170b5ca76ef95ea12 /linux-core/i915_gem.c | |
parent | 57b4c4c32d3b474939775042bb8a17423def446d (diff) |
[gem] Remove the drm_client_lock_take in set_domain.
We no longer need to use it to protect against shared ringbuffer access.
Diffstat (limited to 'linux-core/i915_gem.c')
-rw-r--r-- | linux-core/i915_gem.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/linux-core/i915_gem.c b/linux-core/i915_gem.c index d608cb03..030ecf1d 100644 --- a/linux-core/i915_gem.c +++ b/linux-core/i915_gem.c @@ -1930,14 +1930,11 @@ i915_gem_set_domain(struct drm_gem_object *obj, BUG_ON(!mutex_is_locked(&dev->struct_mutex)); - drm_client_lock_take(dev, file_priv); ret = i915_gem_object_set_domain(obj, read_domains, write_domain); - if (ret) { - drm_client_lock_release(dev); + if (ret) return ret; - } i915_gem_dev_set_domain(obj->dev); - drm_client_lock_release(dev); + return 0; } |