drm/i915: Take reservation lock around i915_vma_pin.

Browse source

We previously complained when ww == NULL.

This function is now only used in selftests to pin an object,
and ww locking is now fixed.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
[danvet: Resolve conflict because we don't have a set-domain refactor,
see
https://lore.kernel.org/intel-gfx/20210203090205.25818-8-chris@chris-wilson.co.uk/

The really worrying thing here is that the above patch had a change in
arguments for i915_gem_object_set_to_gtt_domain(), without any
explanation. I decided to just faithfully apply Maarten's change but
not the argument change which was in Maarten's context diff.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-26-maarten.lankhorst@linux.intel.com

...

This commit is contained in:

Maarten Lankhorst 2021-03-23 16:50:14 +01:00 • committed by Daniel Vetter

parent 2a66596838

commit 7d1c2618ea

4 changed files with 26 additions and 14 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

10

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

View file

6

drivers/gpu/drm/i915/i915_gem.c

View file

4

drivers/gpu/drm/i915/i915_vma.c

View file

20

drivers/gpu/drm/i915/i915_vma.h

View file