drm/i915: Remove pages_mutex and intel_gtt->vma_ops.set/clear_pages members, v3.

Browse source

Big delta, but boils down to moving set_pages to i915_vma.c, and removing
the special handling, all callers use the defaults anyway. We only remap
in ggtt, so default case will fall through.

Because we still don't require locking in i915_vma_unpin(), handle this by
using xchg in get_pages(), as it's locked with obj->mutex, and cmpxchg in
unpin, which only fails if we race a against a new pin.

Changes since v1:
- aliasing gtt sets ZERO_SIZE_PTR, not -ENODEV, remove special case
  from __i915_vma_get_pages(). (Matt)
Changes since v2:
- Free correct old pages in __i915_vma_get_pages(). (Matt)
  Remove race of clearing vma->pages accidentally from put,
  free it but leave it set, as only get has the lock.

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

...

This commit is contained in:

Maarten Lankhorst 2021-12-16 15:27:35 +01:00

parent e4e8062530

commit 0b4d1f0e93

11 changed files with 374 additions and 439 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_dpt.c

View file

15

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

View file

348

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

View file

13

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

View file

7

drivers/gpu/drm/i915/gt/intel_gtt.h

View file

12

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

View file

394

drivers/gpu/drm/i915/i915_vma.c

View file

3

drivers/gpu/drm/i915/i915_vma.h

View file

1

drivers/gpu/drm/i915/i915_vma_types.h

View file

14

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

View file

4

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

View file