[PATCH 54/84] drm/i915/display: Drop object lock from intel_unpin_fb_vma

Chris Wilson chris at chris-wilson.co.uk
Wed Jul 29 21:12:26 UTC 2020


The obj->resv->lock does not serialisation anything within
intel_unpin_fb_vma(), so remove the redundant contention point.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/display/intel_display.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index db2a5a1a9b35..ba9fb655700c 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -2311,12 +2311,9 @@ intel_pin_and_fence_fb_obj(struct drm_framebuffer *fb,
 
 void intel_unpin_fb_vma(struct i915_vma *vma, unsigned long flags)
 {
-	i915_gem_object_lock(vma->obj);
 	if (flags & PLANE_HAS_FENCE)
 		i915_vma_unpin_fence(vma);
 	i915_gem_object_unpin_from_display_plane(vma);
-	i915_gem_object_unlock(vma->obj);
-
 	i915_vma_put(vma);
 }
 
-- 
2.20.1



More information about the Intel-gfx-trybot mailing list