For TTM eviction we may need to retrieve the ww parameter, to ensure we can lock extra objects while evicting. Pass along the struct i915_gem_ww_ctx, so this can be done. Maarten Lankhorst (4): drm/i915: Add ww parameter to get_pages() callback drm/i915: Add ww context to prepare_(read/write) drm/i915: Pass ww ctx to pin_map, v2. drm/i915: Pass ww ctx to i915_gem_object_pin_pages, v2. drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 11 ++-- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 50 ++++++++++++------- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 18 ++++--- drivers/gpu/drm/i915/gem/i915_gem_internal.c | 3 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 21 +++++--- drivers/gpu/drm/i915/gem/i915_gem_object.h | 23 ++++++--- .../gpu/drm/i915/gem/i915_gem_object_blt.c | 4 +- .../gpu/drm/i915/gem/i915_gem_object_types.h | 3 +- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 38 ++++++++++---- drivers/gpu/drm/i915/gem/i915_gem_region.c | 3 +- drivers/gpu/drm/i915/gem/i915_gem_region.h | 4 +- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 5 +- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 7 +-- .../drm/i915/gem/selftests/huge_gem_object.c | 3 +- .../gpu/drm/i915/gem/selftests/huge_pages.c | 13 +++-- .../i915/gem/selftests/i915_gem_client_blt.c | 2 +- .../i915/gem/selftests/i915_gem_coherency.c | 14 +++--- .../drm/i915/gem/selftests/i915_gem_context.c | 16 +++--- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 2 +- .../drm/i915/gem/selftests/i915_gem_mman.c | 4 +- .../drm/i915/gem/selftests/i915_gem_phys.c | 2 +- drivers/gpu/drm/i915/gt/gen7_renderclear.c | 2 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 2 +- drivers/gpu/drm/i915/gt/intel_gtt.c | 2 +- drivers/gpu/drm/i915/gt/intel_lrc.c | 4 +- drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 +- drivers/gpu/drm/i915/gt/intel_ring.c | 2 +- .../gpu/drm/i915/gt/intel_ring_submission.c | 2 +- drivers/gpu/drm/i915/gt/intel_timeline.c | 7 +-- drivers/gpu/drm/i915/gt/intel_timeline.h | 3 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/gt/mock_engine.c | 2 +- drivers/gpu/drm/i915/gt/selftest_lrc.c | 2 +- drivers/gpu/drm/i915/gt/selftest_rps.c | 10 ++-- .../gpu/drm/i915/gt/selftest_workarounds.c | 8 +-- drivers/gpu/drm/i915/gvt/cmd_parser.c | 6 +-- drivers/gpu/drm/i915/gvt/dmabuf.c | 3 +- drivers/gpu/drm/i915/i915_gem.c | 12 ++--- drivers/gpu/drm/i915/i915_perf.c | 4 +- drivers/gpu/drm/i915/i915_vma.c | 7 +-- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 3 +- drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +- drivers/gpu/drm/i915/selftests/igt_spinner.c | 2 +- .../drm/i915/selftests/intel_memory_region.c | 2 +- 48 files changed, 205 insertions(+), 141 deletions(-) -- 2.31.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx