Skip to content

RFC Another take on PAT/object cache mode refactoring

Tvrtko Ursulin dri-devel intel-gfx 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 RFC Latest8 patches 20 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8drm/i915: Skip clflush after GPU writes on Meteorlakedrivers/gpu/drm/i915/gem/i915_gem_domain.c+13 -02 replies
2/8drm/i915: Split PTE encode between Gen12 and Meteorlakedrivers/gpu/drm/i915/gt/gen8_ppgtt.c+26 -03 replies
3/8drm/i915: Cache PAT index used by the driverdrivers/gpu/drm/i915/Makefile drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c drivers/gpu/drm/i915/gem/i915_gem_stolen.c +21 more+89 -912 replies
4/8drm/i915: Refactor PAT/object cache handlingdrivers/gpu/drm/i915/gem/i915_gem_domain.c drivers/gpu/drm/i915/gem/i915_gem_domain.h drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +33 more+391 -3678 replies
5/8drm/i915: Improve the vm_fault_gtt user PAT index restrictiondrivers/gpu/drm/i915/gem/i915_gem_mman.c+3 -112 replies
6/8drm/i915: Lift the user PAT restriction from gpu_write_needs_clflushdrivers/gpu/drm/i915/gem/i915_gem_domain.c+0 -61 reply
7/8drm/i915: Lift the user PAT restriction from use_cpu_relocdrivers/gpu/drm/i915/gem/i915_gem_execbuffer.c+1 -82 replies
8/8drm/i915: Refine the caching check in i915_gem_object_can_bypass_llcdrivers/gpu/drm/i915/gem/i915_gem_object.c+11 -70 replies

Reviews trailers per patch

2 of 8 patches have a Reviewed-by or Acked-by.

PatchMatt RoperFei Yang
1/8R-b R-b
2/8
3/8
4/8
5/8
6/8R-b
7/8
8/8

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [RFC 0/8] Another take on PAT/object cache mode refactoring

From: Tvrtko Ursulin <[email protected]>

Good news is that I realized series can be split after all. Bad news is that it is still a lot to go through.

drm/i915: Skip clflush after GPU writes on Meteorlake

This is based on what Fei found out from hardware architects. If we agree the the function this helper should achieve follow up is checking if other snoopable platforms are the same.

drm/i915: Split PTE encode between Gen12 and Meteorlake

Not that much related but I feel we don't need to run impossible code on platforms before Meteorlake. Shouldn't be controversial.

drm/i915: Cache PAT index used by the driver

This one shouldn't be controversial either. Just eliminates a pile of calls to i915_gem_get_pat_index().

drm/i915: Refactor PAT/object cache handling

This is most code and the "table reversal" logic which makes i915 understands caching modes behind PAT indices.

Review for taste and general "does it make sense" is needed here. Oh and extra care about boolean logic conversion as I was pulling out obj->user_pat_set from inside i915_gem_object_has_cache_level to the call sites.

All magic "if user PAT is set assume the worst" are still left in with this patch.

drm/i915: Improve the vm_fault_gtt user PAT index restriction drm/i915: Lift the user PAT restriction from gpu_write_needs_clflush drm/i915: Lift the user PAT restriction from use_cpu_reloc drm/i915: Refine the caching check in i915_gem_object_can_bypass_llc

This bunch is what removes the "user PAT set special casing".

Each of them probably have different reasons why the original cache level check was in them so as many extra pair of eyes as possible are needed to verify both that I have correctly understood what the underlying reasons why each were there, and that I haven't fumbled the logic on the rudimentary level. Or perhaps that it is possible to simplify this further. By maybe using more of I915_BO_CACHE_COHERENT_FOR_... flags, or something.

Overall, a lot of scrutiny is needed for most of the series since it is complicated and I am juggling multiple things.

Cc Fei Yang <[email protected]>
Cc Matt Roper <[email protected]>

Tvrtko Ursulin (8):
drm/i915: Skip clflush after GPU writes on Meteorlake drm/i915: Split PTE encode between Gen12 and Meteorlake drm/i915: Cache PAT index used by the driver
drm/i915: Refactor PAT/object cache handling
drm/i915: Improve the vm_fault_gtt user PAT index restriction drm/i915: Lift the user PAT restriction from gpu_write_needs_clflush drm/i915: Lift the user PAT restriction from use_cpu_reloc drm/i915: Refine the caching check in i915_gem_object_can_bypass_llc

 drivers/gpu/drm/i915/Makefile                 |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_domain.c    |  67 ++++++---
 drivers/gpu/drm/i915/gem/i915_gem_domain.h    |   5 +-
 .../gpu/drm/i915/gem/i915_gem_execbuffer.c    |  11 +-
 drivers/gpu/drm/i915/gem/i915_gem_internal.c  |   2 +-
 drivers/gpu/drm/i915/gem/i915_gem_mman.c      |  12 +-
 drivers/gpu/drm/i915/gem/i915_gem_object.c    | 135 ++++++++++--------
 drivers/gpu/drm/i915/gem/i915_gem_object.h    |  11 +-
 .../gpu/drm/i915/gem/i915_gem_object_types.h  | 116 +--------------
 drivers/gpu/drm/i915/gem/i915_gem_shmem.c     |   8 +-
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c    |   9 +-
 drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c  |  46 +++---
 drivers/gpu/drm/i915/gem/i915_gem_userptr.c   |   2 +-
 .../drm/i915/gem/selftests/huge_gem_object.c  |   2 +-
 .../gpu/drm/i915/gem/selftests/huge_pages.c   |   5 +-
 drivers/gpu/drm/i915/gt/gen6_ppgtt.c          |   4 +-
 drivers/gpu/drm/i915/gt/gen8_ppgtt.c          |  40 ++++--
 drivers/gpu/drm/i915/gt/intel_engine_cs.c     |   2 +-
 drivers/gpu/drm/i915/gt/intel_ggtt.c          |  33 ++---
 drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c     |   4 +-
 drivers/gpu/drm/i915/gt/intel_gtt.c           |   2 +-
 drivers/gpu/drm/i915/gt/intel_gtt.h           |   3 +-
 drivers/gpu/drm/i915/gt/intel_migrate.c       |  11 +-
 drivers/gpu/drm/i915/gt/intel_ppgtt.c         |   6 +-
 .../gpu/drm/i915/gt/intel_ring_submission.c   |   4 +-
 drivers/gpu/drm/i915/gt/intel_timeline.c      |   2 +-
 drivers/gpu/drm/i915/gt/selftest_hangcheck.c  |   2 +-
 drivers/gpu/drm/i915/gt/selftest_migrate.c    |   9 +-
 drivers/gpu/drm/i915/gt/selftest_reset.c      |  14 +-
 drivers/gpu/drm/i915/gt/selftest_tlb.c        |   5 +-
 .../gpu/drm/i915/gt/selftest_workarounds.c    |   2 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c      |   8 +-
 drivers/gpu/drm/i915/i915_cache.c             |  93 ++++++++++++
 drivers/gpu/drm/i915/i915_cache.h             |  81 +++++++++++
 drivers/gpu/drm/i915/i915_debugfs.c           |  53 +------
 drivers/gpu/drm/i915/i915_driver.c            |   5 +
 drivers/gpu/drm/i915/i915_drv.h               |   2 +
 drivers/gpu/drm/i915/i915_gem.c               |  21 +--
 drivers/gpu/drm/i915/i915_gpu_error.c         |   8 +-
 drivers/gpu/drm/i915/i915_pci.c               |  84 ++++++-----
 drivers/gpu/drm/i915/i915_perf.c              |   2 +-
 drivers/gpu/drm/i915/intel_device_info.h      |   6 +-
 drivers/gpu/drm/i915/selftests/i915_gem.c     |   5 +-
 .../gpu/drm/i915/selftests/i915_gem_evict.c   |   8 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |  11 +-
 drivers/gpu/drm/i915/selftests/igt_spinner.c  |   2 +-
 .../drm/i915/selftests/intel_memory_region.c  |   4 +-
 .../gpu/drm/i915/selftests/mock_gem_device.c  |  14 +-
 48 files changed, 513 insertions(+), 469 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_cache.c
 create mode 100644 drivers/gpu/drm/i915/i915_cache.h
Signature · 1 line
2.39.2