From: Thomas Hellström Date: Thu, 3 Sep 2020 13:07:17 +0000 (+0200) Subject: drm/i915: Unlock the shared hwsp_gtt object after pinning X-Git-Tag: v5.10-rc1~123^2~21^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0ee152fce25dc9269c7ea5280c98aa4b3682759;p=thirdparty%2Flinux.git drm/i915: Unlock the shared hwsp_gtt object after pinning The hwsp_gtt object is used for sub-allocation and could therefore be shared by many contexts causing unnecessary contention during concurrent context pinning. However since we're currently locking it only for pinning, it remains resident until we unpin it, and therefore it's safe to drop the lock early, allowing for concurrent thread access. Signed-off-by: Thomas Hellström Reviewed-by: Chris Wilson Signed-off-by: Joonas Lahtinen --- diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c index 61b05cd4c47ae..d301dda1b2617 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.c +++ b/drivers/gpu/drm/i915/gt/intel_context.c @@ -271,6 +271,15 @@ err_release: i915_active_release(&ce->active); err_ctx_unpin: intel_context_post_unpin(ce); + + /* + * Unlock the hwsp_ggtt object since it's shared. + * In principle we can unlock all the global state locked above + * since it's pinned and doesn't need fencing, and will + * thus remain resident until it is explicitly unpinned. + */ + i915_gem_ww_unlock_single(ce->timeline->hwsp_ggtt->obj); + return err; }