Sorry... messed up with git-send-email and the series is not threaded. I'm going to resend it. Andi On Sun, Dec 12, 2021 at 05:10:55PM +0200, Andi Shyti wrote: > Hi, > > the first patch concludes the first stage of refactoring which > makes the use of intel_gt on the different subsystem. It's taken > from Matt's series and it has alread been reviewed. The patch has > just been replaced before any multitile patches and I think it > can be already pushed. > > Patch 2-10 hides i915->gt behind the to_gt() wrapper proposed by > Michał. Finally i915->gt changes to i915->gt0. > > Until here all patches have been review and they can be already > pushed. Thank you Matt for the reviews. > > The last two abstract the ggtt reference. It moves, indeed, in > the gt as a structure instead of a pointer. > > Andi > > Changelog: > ========== > Patchwork: https://patchwork.freedesktop.org/series/97020/ > > v6 -> v7: > - Patch 1: add a note about the double presence of > __intel_gt_init_early() and intel_gt_init_early(). > - Added all Matt's r-b's for patches 2-10. > - Added a patch 12 that moves the i915->ggtt into gt->ggtt. > > v5 -> v6: > - fixed the assignement of i915->gt->ggtt = ggtt in the mock gem > device that was making use of it before. > > v4 -> v5: > - use to_gt() instead of to_root_gt() and use Michał work done > previously. > - split the /i915->gt/to_gt()/ patch in smaller chunks in order > to make review easier. (Thanks Lucas) > > v3 -> v4: > - the intel_gt_init_early() has been split as it was causing > some headaches for the order of the early initialization. The > split has been done keeping in mind the coming next patch in > the series that wil make this a static function. > > v2 -> v3: > - sed -i ... took too much freedom and changed more than it was > supposed to. > - fix a compile error which did not appear in my local build > > v1 -> v2: > - patch 2: do not use anymore the reference i915->gt but use > to_root_gt(), coming from Matt Roper's patch. > - fix some comments from Chris. > > Andi Shyti (4): > drm/i915/selftests: Use to_gt() helper > drm/i915/pxp: Use to_gt() helper > drm/i915: Rename i915->gt to i915->gt0 > drm/i915: Move the GGTT from i915 private data to the GT > > Michał Winiarski (8): > drm/i915: Store backpointer to GT in uncore > drm/i915: Introduce to_gt() helper > drm/i915/display: Use to_gt() helper > drm/i915/gt: Use to_gt() helper > drm/i915/gem: Use to_gt() helper > drm/i915/gvt: Use to_gt() helper > drm/i915: Use to_gt() helper > drm/i915: Use to_gt() helper for GGTT accesses > > .../gpu/drm/i915/display/intel_atomic_plane.c | 4 +- > drivers/gpu/drm/i915/display/intel_display.c | 18 +++--- > drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- > drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- > drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- > drivers/gpu/drm/i915/display/intel_overlay.c | 2 +- > .../drm/i915/display/intel_plane_initial.c | 2 +- > .../drm/i915/display/skl_universal_plane.c | 2 +- > drivers/gpu/drm/i915/gem/i915_gem_context.c | 22 ++++---- > drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 +- > drivers/gpu/drm/i915/gem/i915_gem_create.c | 2 +- > .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 8 +-- > drivers/gpu/drm/i915/gem/i915_gem_mman.c | 21 +++---- > drivers/gpu/drm/i915/gem/i915_gem_phys.c | 6 +- > drivers/gpu/drm/i915/gem/i915_gem_pm.c | 8 +-- > drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 8 +-- > drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 8 ++- > drivers/gpu/drm/i915/gem/i915_gem_throttle.c | 3 +- > drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 17 +++--- > drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 12 ++-- > drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- > .../gpu/drm/i915/gem/selftests/huge_pages.c | 4 +- > .../i915/gem/selftests/i915_gem_client_blt.c | 8 +-- > .../i915/gem/selftests/i915_gem_coherency.c | 2 +- > .../drm/i915/gem/selftests/i915_gem_context.c | 14 ++--- > .../drm/i915/gem/selftests/i915_gem_migrate.c | 2 +- > .../drm/i915/gem/selftests/i915_gem_mman.c | 47 ++++++++-------- > .../drm/i915/gem/selftests/i915_gem_object.c | 2 +- > drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 6 +- > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 +- > drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +- > drivers/gpu/drm/i915/gt/intel_ggtt.c | 14 ++--- > drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 6 +- > drivers/gpu/drm/i915/gt/intel_gt.c | 20 +++---- > drivers/gpu/drm/i915/gt/intel_gt.h | 2 +- > .../gpu/drm/i915/gt/intel_gt_buffer_pool.c | 7 +-- > drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +- > drivers/gpu/drm/i915/gt/intel_gt_types.h | 2 +- > drivers/gpu/drm/i915/gt/intel_lrc.c | 4 +- > drivers/gpu/drm/i915/gt/intel_region_lmem.c | 4 +- > drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 +- > drivers/gpu/drm/i915/gt/intel_reset.c | 8 +-- > drivers/gpu/drm/i915/gt/intel_ring.c | 2 +- > .../gpu/drm/i915/gt/intel_ring_submission.c | 2 +- > drivers/gpu/drm/i915/gt/intel_rps.c | 12 ++-- > drivers/gpu/drm/i915/gt/intel_timeline.c | 2 +- > drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +- > drivers/gpu/drm/i915/gt/mock_engine.c | 12 ++-- > drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- > drivers/gpu/drm/i915/gt/selftest_engine.c | 2 +- > drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 4 +- > .../drm/i915/gt/selftest_engine_heartbeat.c | 4 +- > drivers/gpu/drm/i915/gt/selftest_execlists.c | 16 +++--- > drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 8 +-- > drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 8 +-- > drivers/gpu/drm/i915/gt/selftest_lrc.c | 4 +- > drivers/gpu/drm/i915/gt/selftest_migrate.c | 4 +- > drivers/gpu/drm/i915/gt/selftest_mocs.c | 4 +- > drivers/gpu/drm/i915/gt/selftest_reset.c | 4 +- > .../drm/i915/gt/selftest_ring_submission.c | 4 +- > drivers/gpu/drm/i915/gt/selftest_slpc.c | 6 +- > drivers/gpu/drm/i915/gt/selftest_timeline.c | 6 +- > .../gpu/drm/i915/gt/selftest_workarounds.c | 6 +- > drivers/gpu/drm/i915/gt/uc/intel_guc.c | 6 +- > drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 +- > drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 6 +- > drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 2 +- > .../drm/i915/gt/uc/selftest_guc_multi_lrc.c | 2 +- > drivers/gpu/drm/i915/gvt/aperture_gm.c | 26 ++++----- > drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- > drivers/gpu/drm/i915/gvt/gvt.c | 2 +- > drivers/gpu/drm/i915/gvt/gvt.h | 2 +- > drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- > drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- > drivers/gpu/drm/i915/i915_debugfs.c | 42 +++++++------- > drivers/gpu/drm/i915/i915_debugfs_params.c | 4 +- > drivers/gpu/drm/i915/i915_driver.c | 35 ++++++------ > drivers/gpu/drm/i915/i915_drv.h | 13 +++-- > drivers/gpu/drm/i915/i915_gem.c | 39 ++++++------- > drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +- > drivers/gpu/drm/i915/i915_getparam.c | 12 ++-- > drivers/gpu/drm/i915/i915_gpu_error.c | 14 ++--- > drivers/gpu/drm/i915/i915_gpu_error.h | 4 +- > drivers/gpu/drm/i915/i915_irq.c | 56 +++++++++---------- > drivers/gpu/drm/i915/i915_perf.c | 8 +-- > drivers/gpu/drm/i915/i915_pmu.c | 14 ++--- > drivers/gpu/drm/i915/i915_query.c | 2 +- > drivers/gpu/drm/i915/i915_request.c | 2 +- > drivers/gpu/drm/i915/i915_sysfs.c | 22 ++++---- > drivers/gpu/drm/i915/i915_vma.c | 2 +- > drivers/gpu/drm/i915/intel_gvt.c | 2 +- > drivers/gpu/drm/i915/intel_uncore.c | 9 +-- > drivers/gpu/drm/i915/intel_uncore.h | 3 +- > drivers/gpu/drm/i915/intel_wopcm.c | 2 +- > drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 4 +- > drivers/gpu/drm/i915/selftests/i915_active.c | 2 +- > drivers/gpu/drm/i915/selftests/i915_gem.c | 10 ++-- > .../gpu/drm/i915/selftests/i915_gem_evict.c | 18 +++--- > drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 12 ++-- > drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- > drivers/gpu/drm/i915/selftests/i915_request.c | 12 ++-- > .../gpu/drm/i915/selftests/i915_selftest.c | 4 +- > drivers/gpu/drm/i915/selftests/i915_vma.c | 4 +- > .../gpu/drm/i915/selftests/igt_flush_test.c | 2 +- > .../gpu/drm/i915/selftests/igt_live_test.c | 4 +- > .../drm/i915/selftests/intel_memory_region.c | 4 +- > drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +- > .../gpu/drm/i915/selftests/mock_gem_device.c | 36 ++++++------ > drivers/gpu/drm/i915/selftests/mock_gtt.c | 5 +- > drivers/gpu/drm/i915/selftests/mock_uncore.c | 2 +- > 110 files changed, 455 insertions(+), 444 deletions(-) > > -- > 2.34.1
