[v7,00/33] Implicit dev_priv removal and GT compartmentalization
mbox series

Message ID 20190619132459.25351-1-tvrtko.ursulin@linux.intel.com
Headers show
Series
  • Implicit dev_priv removal and GT compartmentalization
Related show

Message

Tvrtko Ursulin June 19, 2019, 1:24 p.m. UTC
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Rebase + a couple fixes for mock tests.

Some patches need r-b and/or r-b upgrades.

Tvrtko Ursulin (33):
  drm/i915: Convert intel_vgt_(de)balloon to uncore
  drm/i915: Introduce struct intel_gt as replacement for anonymous
    i915->gt
  drm/i915: Move intel_gt initialization to a separate file
  drm/i915: Store some backpointers in struct intel_gt
  drm/i915: Move intel_gt_pm_init under intel_gt_init_early
  drm/i915: Make i915_check_and_clear_faults take intel_gt
  drm/i915: Convert i915_gem_init_swizzling to intel_gt
  drm/i915: Use intel_uncore_rmw in intel_gt_init_swizzling
  drm/i915: Convert init_unused_rings to intel_gt
  drm/i915: Convert gt workarounds to intel_gt
  drm/i915: Store backpointer to intel_gt in the engine
  drm/i915: Convert intel_mocs_init_l3cc_table to intel_gt
  drm/i915: Convert i915_ppgtt_init_hw to intel_gt
  drm/i915: Consolidate some open coded mmio rmw
  drm/i915: Convert i915_gem_init_hw to intel_gt
  drm/i915: Move intel_engines_resume into common init
  drm/i915: Stop using I915_READ/WRITE in intel_wopcm_init_hw
  drm/i915: Compartmentalize i915_ggtt_probe_hw
  drm/i915: Compartmentalize i915_ggtt_init_hw
  drm/i915: Make ggtt invalidation work on ggtt
  drm/i915: Store intel_gt backpointer in vm
  drm/i915: Compartmentalize i915_gem_suspend/restore_gtt_mappings
  drm/i915: Convert i915_gem_flush_ggtt_writes to intel_gt
  drm/i915: Move i915_gem_chipset_flush to intel_gt
  drm/i915: Compartmentalize timeline_init/park/fini
  drm/i915: Compartmentalize i915_ggtt_cleanup_hw
  drm/i915: Compartmentalize i915_gem_init_ggtt
  drm/i915: Store ggtt pointer in intel_gt
  drm/i915: Compartmentalize ring buffer creation
  drm/i915: Save trip via top-level i915 in a few more places
  drm/i915: Make timelines gt centric
  drm/i915: Rename i915_timeline to intel_timeline and move under gt
  drm/i915: Eliminate dual personality of i915_scratch_offset

 drivers/gpu/drm/i915/Makefile                 |   3 +-
 drivers/gpu/drm/i915/Makefile.header-test     |   1 -
 drivers/gpu/drm/i915/gem/i915_gem_context.c   |  10 +-
 .../gpu/drm/i915/gem/i915_gem_context_types.h |   4 +-
 .../gpu/drm/i915/gem/i915_gem_execbuffer.c    |   5 +-
 drivers/gpu/drm/i915/gem/i915_gem_object.c    |   7 +-
 drivers/gpu/drm/i915/gem/i915_gem_phys.c      |   3 +-
 drivers/gpu/drm/i915/gem/i915_gem_pm.c        |   2 +-
 .../gpu/drm/i915/gem/selftests/huge_pages.c   |   7 +-
 .../drm/i915/gem/selftests/i915_gem_context.c |   3 +-
 .../drm/i915/gem/selftests/i915_gem_mman.c    |   3 +-
 drivers/gpu/drm/i915/gt/intel_engine.h        |   4 +-
 drivers/gpu/drm/i915/gt/intel_engine_cs.c     |  23 +-
 drivers/gpu/drm/i915/gt/intel_engine_types.h  |   6 +-
 drivers/gpu/drm/i915/gt/intel_gt.c            | 243 ++++++++++++
 drivers/gpu/drm/i915/gt/intel_gt.h            |  33 ++
 drivers/gpu/drm/i915/gt/intel_gt_pm.c         |   6 +-
 drivers/gpu/drm/i915/gt/intel_gt_pm.h         |   3 +-
 drivers/gpu/drm/i915/gt/intel_gt_types.h      |  61 +++
 drivers/gpu/drm/i915/gt/intel_lrc.c           |  26 +-
 drivers/gpu/drm/i915/gt/intel_mocs.c          |  52 ++-
 drivers/gpu/drm/i915/gt/intel_mocs.h          |   3 +-
 drivers/gpu/drm/i915/gt/intel_reset.c         | 128 +-----
 drivers/gpu/drm/i915/gt/intel_reset.h         |   2 -
 drivers/gpu/drm/i915/gt/intel_ringbuffer.c    |  64 +--
 .../{i915_timeline.c => gt/intel_timeline.c}  | 204 +++++-----
 drivers/gpu/drm/i915/gt/intel_timeline.h      |  93 +++++
 .../intel_timeline_types.h}                   |   8 +-
 drivers/gpu/drm/i915/gt/intel_workarounds.c   |  12 +-
 drivers/gpu/drm/i915/gt/intel_workarounds.h   |   6 +-
 drivers/gpu/drm/i915/gt/mock_engine.c         |  11 +-
 drivers/gpu/drm/i915/gt/selftest_hangcheck.c  |  22 +-
 .../selftest_timeline.c}                      | 124 +++---
 .../gpu/drm/i915/gt/selftest_workarounds.c    |   7 +-
 .../i915/{ => gt}/selftests/mock_timeline.c   |   8 +-
 .../i915/{ => gt}/selftests/mock_timeline.h   |   6 +-
 drivers/gpu/drm/i915/i915_drv.c               |  11 +-
 drivers/gpu/drm/i915/i915_drv.h               |  52 +--
 drivers/gpu/drm/i915/i915_gem.c               | 238 +++++------
 drivers/gpu/drm/i915/i915_gem_fence_reg.c     |  32 ++
 drivers/gpu/drm/i915/i915_gem_fence_reg.h     |   3 +
 drivers/gpu/drm/i915/i915_gem_gtt.c           | 371 +++++++++++-------
 drivers/gpu/drm/i915/i915_gem_gtt.h           |  10 +-
 drivers/gpu/drm/i915/i915_gem_render_state.c  |   2 +-
 drivers/gpu/drm/i915/i915_gpu_error.c         |   4 +-
 drivers/gpu/drm/i915/i915_request.c           |  14 +-
 drivers/gpu/drm/i915/i915_request.h           |   8 +-
 drivers/gpu/drm/i915/i915_timeline.h          |  94 -----
 drivers/gpu/drm/i915/i915_vgpu.c              |  24 +-
 drivers/gpu/drm/i915/i915_vgpu.h              |   4 +-
 drivers/gpu/drm/i915/i915_vma.c               |   3 +-
 drivers/gpu/drm/i915/intel_wopcm.c            |  31 +-
 drivers/gpu/drm/i915/intel_wopcm.h            |   4 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |   3 +-
 .../drm/i915/selftests/i915_live_selftests.h  |   2 +-
 .../drm/i915/selftests/i915_mock_selftests.h  |   2 +-
 drivers/gpu/drm/i915/selftests/i915_request.c |  10 +-
 drivers/gpu/drm/i915/selftests/i915_vma.c     |   1 +
 drivers/gpu/drm/i915/selftests/igt_spinner.c  |   7 +-
 drivers/gpu/drm/i915/selftests/igt_spinner.h  |   3 +
 .../gpu/drm/i915/selftests/mock_gem_device.c  |  15 +-
 drivers/gpu/drm/i915/selftests/mock_gtt.c     |   1 +
 62 files changed, 1229 insertions(+), 923 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.c
 create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.h
 create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_types.h
 rename drivers/gpu/drm/i915/{i915_timeline.c => gt/intel_timeline.c} (72%)
 create mode 100644 drivers/gpu/drm/i915/gt/intel_timeline.h
 rename drivers/gpu/drm/i915/{i915_timeline_types.h => gt/intel_timeline_types.h} (92%)
 rename drivers/gpu/drm/i915/{selftests/i915_timeline.c => gt/selftest_timeline.c} (86%)
 rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.c (68%)
 rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.h (53%)
 delete mode 100644 drivers/gpu/drm/i915/i915_timeline.h

Comments

Rodrigo Vivi June 19, 2019, 5:57 p.m. UTC | #1
On Wed, Jun 19, 2019 at 02:24:26PM +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> Rebase + a couple fixes for mock tests.
> 
> Some patches need r-b and/or r-b upgrades.

I updated my 2 rv-b and I quickly glanced through the rest and didn't
find anything else, so I believe we are ready

yeap, but it is better to update the SDPX headers indeed :/

Thanks a lot for this,
Rodrigo.

> 
> Tvrtko Ursulin (33):
>   drm/i915: Convert intel_vgt_(de)balloon to uncore
>   drm/i915: Introduce struct intel_gt as replacement for anonymous
>     i915->gt
>   drm/i915: Move intel_gt initialization to a separate file
>   drm/i915: Store some backpointers in struct intel_gt
>   drm/i915: Move intel_gt_pm_init under intel_gt_init_early
>   drm/i915: Make i915_check_and_clear_faults take intel_gt
>   drm/i915: Convert i915_gem_init_swizzling to intel_gt
>   drm/i915: Use intel_uncore_rmw in intel_gt_init_swizzling
>   drm/i915: Convert init_unused_rings to intel_gt
>   drm/i915: Convert gt workarounds to intel_gt
>   drm/i915: Store backpointer to intel_gt in the engine
>   drm/i915: Convert intel_mocs_init_l3cc_table to intel_gt
>   drm/i915: Convert i915_ppgtt_init_hw to intel_gt
>   drm/i915: Consolidate some open coded mmio rmw
>   drm/i915: Convert i915_gem_init_hw to intel_gt
>   drm/i915: Move intel_engines_resume into common init
>   drm/i915: Stop using I915_READ/WRITE in intel_wopcm_init_hw
>   drm/i915: Compartmentalize i915_ggtt_probe_hw
>   drm/i915: Compartmentalize i915_ggtt_init_hw
>   drm/i915: Make ggtt invalidation work on ggtt
>   drm/i915: Store intel_gt backpointer in vm
>   drm/i915: Compartmentalize i915_gem_suspend/restore_gtt_mappings
>   drm/i915: Convert i915_gem_flush_ggtt_writes to intel_gt
>   drm/i915: Move i915_gem_chipset_flush to intel_gt
>   drm/i915: Compartmentalize timeline_init/park/fini
>   drm/i915: Compartmentalize i915_ggtt_cleanup_hw
>   drm/i915: Compartmentalize i915_gem_init_ggtt
>   drm/i915: Store ggtt pointer in intel_gt
>   drm/i915: Compartmentalize ring buffer creation
>   drm/i915: Save trip via top-level i915 in a few more places
>   drm/i915: Make timelines gt centric
>   drm/i915: Rename i915_timeline to intel_timeline and move under gt
>   drm/i915: Eliminate dual personality of i915_scratch_offset
> 
>  drivers/gpu/drm/i915/Makefile                 |   3 +-
>  drivers/gpu/drm/i915/Makefile.header-test     |   1 -
>  drivers/gpu/drm/i915/gem/i915_gem_context.c   |  10 +-
>  .../gpu/drm/i915/gem/i915_gem_context_types.h |   4 +-
>  .../gpu/drm/i915/gem/i915_gem_execbuffer.c    |   5 +-
>  drivers/gpu/drm/i915/gem/i915_gem_object.c    |   7 +-
>  drivers/gpu/drm/i915/gem/i915_gem_phys.c      |   3 +-
>  drivers/gpu/drm/i915/gem/i915_gem_pm.c        |   2 +-
>  .../gpu/drm/i915/gem/selftests/huge_pages.c   |   7 +-
>  .../drm/i915/gem/selftests/i915_gem_context.c |   3 +-
>  .../drm/i915/gem/selftests/i915_gem_mman.c    |   3 +-
>  drivers/gpu/drm/i915/gt/intel_engine.h        |   4 +-
>  drivers/gpu/drm/i915/gt/intel_engine_cs.c     |  23 +-
>  drivers/gpu/drm/i915/gt/intel_engine_types.h  |   6 +-
>  drivers/gpu/drm/i915/gt/intel_gt.c            | 243 ++++++++++++
>  drivers/gpu/drm/i915/gt/intel_gt.h            |  33 ++
>  drivers/gpu/drm/i915/gt/intel_gt_pm.c         |   6 +-
>  drivers/gpu/drm/i915/gt/intel_gt_pm.h         |   3 +-
>  drivers/gpu/drm/i915/gt/intel_gt_types.h      |  61 +++
>  drivers/gpu/drm/i915/gt/intel_lrc.c           |  26 +-
>  drivers/gpu/drm/i915/gt/intel_mocs.c          |  52 ++-
>  drivers/gpu/drm/i915/gt/intel_mocs.h          |   3 +-
>  drivers/gpu/drm/i915/gt/intel_reset.c         | 128 +-----
>  drivers/gpu/drm/i915/gt/intel_reset.h         |   2 -
>  drivers/gpu/drm/i915/gt/intel_ringbuffer.c    |  64 +--
>  .../{i915_timeline.c => gt/intel_timeline.c}  | 204 +++++-----
>  drivers/gpu/drm/i915/gt/intel_timeline.h      |  93 +++++
>  .../intel_timeline_types.h}                   |   8 +-
>  drivers/gpu/drm/i915/gt/intel_workarounds.c   |  12 +-
>  drivers/gpu/drm/i915/gt/intel_workarounds.h   |   6 +-
>  drivers/gpu/drm/i915/gt/mock_engine.c         |  11 +-
>  drivers/gpu/drm/i915/gt/selftest_hangcheck.c  |  22 +-
>  .../selftest_timeline.c}                      | 124 +++---
>  .../gpu/drm/i915/gt/selftest_workarounds.c    |   7 +-
>  .../i915/{ => gt}/selftests/mock_timeline.c   |   8 +-
>  .../i915/{ => gt}/selftests/mock_timeline.h   |   6 +-
>  drivers/gpu/drm/i915/i915_drv.c               |  11 +-
>  drivers/gpu/drm/i915/i915_drv.h               |  52 +--
>  drivers/gpu/drm/i915/i915_gem.c               | 238 +++++------
>  drivers/gpu/drm/i915/i915_gem_fence_reg.c     |  32 ++
>  drivers/gpu/drm/i915/i915_gem_fence_reg.h     |   3 +
>  drivers/gpu/drm/i915/i915_gem_gtt.c           | 371 +++++++++++-------
>  drivers/gpu/drm/i915/i915_gem_gtt.h           |  10 +-
>  drivers/gpu/drm/i915/i915_gem_render_state.c  |   2 +-
>  drivers/gpu/drm/i915/i915_gpu_error.c         |   4 +-
>  drivers/gpu/drm/i915/i915_request.c           |  14 +-
>  drivers/gpu/drm/i915/i915_request.h           |   8 +-
>  drivers/gpu/drm/i915/i915_timeline.h          |  94 -----
>  drivers/gpu/drm/i915/i915_vgpu.c              |  24 +-
>  drivers/gpu/drm/i915/i915_vgpu.h              |   4 +-
>  drivers/gpu/drm/i915/i915_vma.c               |   3 +-
>  drivers/gpu/drm/i915/intel_wopcm.c            |  31 +-
>  drivers/gpu/drm/i915/intel_wopcm.h            |   4 +-
>  drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |   3 +-
>  .../drm/i915/selftests/i915_live_selftests.h  |   2 +-
>  .../drm/i915/selftests/i915_mock_selftests.h  |   2 +-
>  drivers/gpu/drm/i915/selftests/i915_request.c |  10 +-
>  drivers/gpu/drm/i915/selftests/i915_vma.c     |   1 +
>  drivers/gpu/drm/i915/selftests/igt_spinner.c  |   7 +-
>  drivers/gpu/drm/i915/selftests/igt_spinner.h  |   3 +
>  .../gpu/drm/i915/selftests/mock_gem_device.c  |  15 +-
>  drivers/gpu/drm/i915/selftests/mock_gtt.c     |   1 +
>  62 files changed, 1229 insertions(+), 923 deletions(-)
>  create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.c
>  create mode 100644 drivers/gpu/drm/i915/gt/intel_gt.h
>  create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_types.h
>  rename drivers/gpu/drm/i915/{i915_timeline.c => gt/intel_timeline.c} (72%)
>  create mode 100644 drivers/gpu/drm/i915/gt/intel_timeline.h
>  rename drivers/gpu/drm/i915/{i915_timeline_types.h => gt/intel_timeline_types.h} (92%)
>  rename drivers/gpu/drm/i915/{selftests/i915_timeline.c => gt/selftest_timeline.c} (86%)
>  rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.c (68%)
>  rename drivers/gpu/drm/i915/{ => gt}/selftests/mock_timeline.h (53%)
>  delete mode 100644 drivers/gpu/drm/i915/i915_timeline.h
> 
> -- 
> 2.20.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx