Skip to content

i915: Add "standalone media" support for MTL

Matt Roper dri-devel intel-gfx 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest14 patches 14 repliesIn review
  2. v212 patches 6 repliesSuperseded
  3. v18 patches 8 repliesSuperseded

Changes in v3 from the cover letter

- Move intel_gt_definition struct to intel_gt_types.h. (Jani)
- Drop gtdef->setup() and just switch() on type. (Jani)
- Honor GSI offset during AUX table invalidation. (Aravind)
- Drop intel_gt_tile_cleanup() through more intelligent use of DRM-managed actions. This also fixes the fault-injection failures reported by CI.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/14drm/i915: Move locking and unclaimed check into mmio_debug_{suspend, resume}drivers/gpu/drm/i915/intel_uncore.c+21 -200 replies
2/14drm/i915: Only hook up uncore->debug for primary uncoredrivers/gpu/drm/i915/gt/intel_gt.c drivers/gpu/drm/i915/i915_driver.c drivers/gpu/drm/i915/intel_uncore.c +1 more+20 -170 replies
3/14drm/i915: Use managed allocations for extra uncore objectsdrivers/gpu/drm/i915/gt/intel_gt.c+2 -40 replies
4/14drm/i915: Drop intel_gt_tile_cleanup()drivers/gpu/drm/i915/gt/intel_gt.c drivers/gpu/drm/i915/intel_uncore.c+8 -181 reply
5/14drm/i915: Prepare more multi-GT initializationdrivers/gpu/drm/i915/gt/intel_engine_cs.c drivers/gpu/drm/i915/gt/intel_gt.c drivers/gpu/drm/i915/gt/intel_gt.h +4 more+80 -31 reply
6/14drm/i915: Rename and expose common GT early init routinedrivers/gpu/drm/i915/gt/intel_gt.c drivers/gpu/drm/i915/gt/intel_gt.h+4 -30 replies
7/14drm/i915: Use a DRM-managed action to release the PCI bridge devicedrivers/gpu/drm/i915/i915_driver.c+9 -31 reply
8/14drm/i915: Initialize MMIO access for each GTdrivers/gpu/drm/i915/i915_driver.c drivers/gpu/drm/i915/intel_uncore.c drivers/gpu/drm/i915/intel_uncore.h+24 -111 reply
9/14drm/i915: Handle each GT on init/release and suspend/resumedrivers/gpu/drm/i915/i915_driver.c+42 -171 reply
10/14drm/i915/uncore: Add GSI offset to uncoredrivers/gpu/drm/i915/gt/intel_gt_types.h drivers/gpu/drm/i915/intel_uncore.c drivers/gpu/drm/i915/intel_uncore.h+29 -42 replies
10/14drm/i915/uncore: Add GSI offset to uncoredrivers/gpu/drm/i915/gt/intel_gt_types.h drivers/gpu/drm/i915/intel_uncore.c drivers/gpu/drm/i915/intel_uncore.h+41 -41 reply
11/14drm/i915/mtl: Add gsi_offset when emitting aux table invalidationdrivers/gpu/drm/i915/gt/gen8_engine_cs.c drivers/gpu/drm/i915/gt/gen8_engine_cs.h drivers/gpu/drm/i915/gt/intel_lrc.c+18 -91 reply
12/14drm/i915/xelpmp: Expose media as another GTdrivers/gpu/drm/i915/Makefile drivers/gpu/drm/i915/gt/intel_gt.c drivers/gpu/drm/i915/gt/intel_gt_regs.h +4 more+84 -01 reply
13/14drm/i915/mtl: Use primary GT's irq lock for media GTdrivers/gpu/drm/i915/gt/intel_engine_cs.c drivers/gpu/drm/i915/gt/intel_gt.c drivers/gpu/drm/i915/gt/intel_gt.h +14 more+80 -651 reply
14/14drm/i915/mtl: Hook up interrupts for standalone mediadrivers/gpu/drm/i915/gt/intel_gt_irq.c drivers/gpu/drm/i915/gt/intel_gt_regs.h drivers/gpu/drm/i915/gt/intel_sa_media.c +1 more+31 -00 replies

Reviews trailers per patch

All 15 patches have a Reviewed-by or Acked-by.

PatchRadhakrishna SripadaAravind IddamsettyDaniele Ceraolo SpurioLucas De Marchi
1/14R-b
2/14R-b
3/14R-b
4/14R-b
5/14R-b R-b
6/14R-b
7/14R-b
8/14R-b
9/14R-b
10/14R-b
10/14R-b
11/14R-b
12/14R-b A-b
13/14R-b
14/14R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v3 thread

Cover letter [PATCH v3 00/14] i915: Add "standalone media" support for MTL

Starting with MTL, media functionality has moved into a new, second GT at the hardware level. This new GT, referred to as "standalone media" in the spec, has its own GuC, power management/forcewake, etc. The general non-engine GT registers for standalone media start at 0x380000, but otherwise use the same MMIO offsets as the primary GT.

Standalone media has a lot of similarity to the remote tiles present on platforms like xehpsdv and pvc, and our i915 implementation can share much of the general "multi GT" infrastructure between the two types of platforms. However there are a few notable differences we must deal with:
- The 0x380000 offset only applies to the non-engine GT registers (which the specs refer to as "GSI" registers). The engine registers remain at their usual locations (e.g., 0x1C0000 for VCS0).
- Unlike platforms with remote tiles, all interrupt handling for standalone media still happens via the primary GT.

v2:
- Added new patches to ensure each GT, not just the primary, is handled properly during various init/suspend/resume/teardown flows. (Daniele)
- Simplified GSI offset handling and split it into its own patch.
- Correct gt->irq_lock assignment for media GT. (Daniele)
- Fix jump target for intel_root_gt_init_early() errors. (Daniele)

v3:
- Move intel_gt_definition struct to intel_gt_types.h. (Jani)
- Drop gtdef->setup() and just switch() on type. (Jani)
- Honor GSI offset during AUX table invalidation. (Aravind)
- Drop intel_gt_tile_cleanup() through more intelligent use of DRM-managed actions. This also fixes the fault-injection failures reported by CI.

Cc Radhakrishna Sripada <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Aravind Iddamsetty <[email protected]>
Cc Jani Nikula <[email protected]>

Matt Roper (12):
drm/i915: Move locking and unclaimed check into

    mmio_debug_{suspend,resume}

drm/i915: Only hook up uncore->debug for primary uncore drm/i915: Use managed allocations for extra uncore objects drm/i915: Drop intel_gt_tile_cleanup()
drm/i915: Prepare more multi-GT initialization
drm/i915: Rename and expose common GT early init routine drm/i915: Use a DRM-managed action to release the PCI bridge device drm/i915: Initialize MMIO access for each GT
drm/i915: Handle each GT on init/release and suspend/resume drm/i915/uncore: Add GSI offset to uncore
drm/i915/mtl: Add gsi_offset when emitting aux table invalidation drm/i915/xelpmp: Expose media as another GT drm/i915/mtl: Use primary GT's irq lock for media GT drm/i915/mtl: Hook up interrupts for standalone media

 drivers/gpu/drm/i915/Makefile                 |   1 +
 drivers/gpu/drm/i915/gt/gen8_engine_cs.c      |  15 ++-
 drivers/gpu/drm/i915/gt/gen8_engine_cs.h      |   3 +-
 drivers/gpu/drm/i915/gt/intel_engine_cs.c     |  10 +-
 drivers/gpu/drm/i915/gt/intel_gt.c            | 108 +++++++++++++-----
 drivers/gpu/drm/i915/gt/intel_gt.h            |   4 +-
 drivers/gpu/drm/i915/gt/intel_gt_irq.c        |  35 ++++--
 drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c     |   8 +-
 drivers/gpu/drm/i915/gt/intel_gt_regs.h       |  10 ++
 drivers/gpu/drm/i915/gt/intel_gt_types.h      |  19 ++-
 drivers/gpu/drm/i915/gt/intel_lrc.c           |   9 +-
 drivers/gpu/drm/i915/gt/intel_rps.c           |  26 ++---
 drivers/gpu/drm/i915/gt/intel_sa_media.c      |  47 ++++++++
 drivers/gpu/drm/i915/gt/intel_sa_media.h      |  15 +++
 drivers/gpu/drm/i915/gt/uc/intel_guc.c        |  24 ++--
 .../gpu/drm/i915/gt/uc/intel_guc_submission.c |   4 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc.c         |   4 +-
 drivers/gpu/drm/i915/i915_driver.c            | 105 ++++++++++++-----
 drivers/gpu/drm/i915/i915_drv.h               |   5 +
 drivers/gpu/drm/i915/i915_irq.c               |   4 +-
 drivers/gpu/drm/i915/i915_pci.c               |  14 +++
 drivers/gpu/drm/i915/intel_device_info.h      |   3 +
 drivers/gpu/drm/i915/intel_uncore.c           |  92 +++++++++------
 drivers/gpu/drm/i915/intel_uncore.h           |  28 ++++-
 drivers/gpu/drm/i915/pxp/intel_pxp.c          |   4 +-
 drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c  |   4 +-
 drivers/gpu/drm/i915/pxp/intel_pxp_irq.c      |  14 +--
 drivers/gpu/drm/i915/pxp/intel_pxp_session.c  |   4 +-
 .../gpu/drm/i915/selftests/mock_gem_device.c  |   1 +
 29 files changed, 449 insertions(+), 171 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gt/intel_sa_media.c
 create mode 100644 drivers/gpu/drm/i915/gt/intel_sa_media.h
Signature · 1 line
2.37.2