drm/i915: Add i915_vma_unbind_unlocked, and take obj lock for i915_vma_unbind, v2.

Browse source

We want to remove more members of i915_vma, which requires the locking to
be held more often.

Start requiring gem object lock for i915_vma_unbind, as it's one of the
callers that may unpin pages.

Some special care is needed when evicting, because the last reference to
the object may be held by the VMA, so after __i915_vma_unbind, vma may be
garbage, and we need to cache vma->obj before unlocking.

Changes since v1:
- Make trylock failing a WARN. (Matt)
- Remove double i915_vma_wait_for_bind() (Matt)
- Move atomic_set to right before mutex_unlock(), to make it more clear
  they belong together. (Matt)

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.william.auld@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220114132320.109030-5-maarten.lankhorst@linux.intel.com

...

This commit is contained in:

Maarten Lankhorst 2022-01-14 14:23:18 +01:00

parent 7e00897be8

commit 0f341974cb

10 changed files with 94 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/gpu/drm/i915/display/intel_fb_pin.c

View file

2

drivers/gpu/drm/i915/gem/selftests/huge_pages.c

View file

2

drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c

View file

6

drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c

View file

47

drivers/gpu/drm/i915/gt/intel_ggtt.c

View file

2

drivers/gpu/drm/i915/i915_gem.c

View file

27

drivers/gpu/drm/i915/i915_vma.c

View file

1

drivers/gpu/drm/i915/i915_vma.h

View file

22

drivers/gpu/drm/i915/selftests/i915_gem_gtt.c

View file

8

drivers/gpu/drm/i915/selftests/i915_vma.c

View file