diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-05-28 10:29:56 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-05-28 12:45:29 +0100 |
| commit | c017cf6b1a5c7a218f7171bb8061132d9a23a918 (patch) | |
| tree | d737d3da7177c8e68bf3b68e8b5372ce1b5bd97e /drivers/gpu/drm/i915/i915_gem_render_state.c | |
| parent | 754f7a0b2a13fa601c4ea494f726214c07b81e08 (diff) | |
| download | lwn-c017cf6b1a5c7a218f7171bb8061132d9a23a918.tar.gz lwn-c017cf6b1a5c7a218f7171bb8061132d9a23a918.zip | |
drm/i915: Drop the deferred active reference
An old optimisation to reduce the number of atomics per batch sadly
relies on struct_mutex for coordination. In order to remove struct_mutex
from serialising object/context closing, always taking and releasing an
active reference on first use / last use greatly simplifies the locking.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190528092956.14910-15-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_render_state.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_render_state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c index 706ed71468e8..4ee032072d4f 100644 --- a/drivers/gpu/drm/i915/i915_gem_render_state.c +++ b/drivers/gpu/drm/i915/i915_gem_render_state.c @@ -230,6 +230,6 @@ err_unpin: err_vma: i915_vma_close(so.vma); err_obj: - __i915_gem_object_release_unless_active(so.obj); + i915_gem_object_put(so.obj); return err; } |