Hi Dave & Daniel,
Here goes first drm-intel-gt-next pull req towards 6.2.
We have a fix for #6222 (kernel memory corruption issue) and fix for
display regression after resume. A missing W/A for Gen12 iGPUs and
extension of compute pre-emption timeout to 7.5 seconds to account for
compute corner cases. Improvements to GuC compute error capture,
scheduling hysteresis and SLPC. Fixes to EHL MOCS tables. Better docs
for I915_PARAM_HUC_STATUS and pre-emption control policy. Extending the
grace period for full GPU reset timeout to 60 seconds to better capture
logs or recover, as opposed to just giving up on whole device in 5 seconds.
We're starting to add HWMON metrics for recent devices. More MTL
enabling, DG2 workarounds, DG2 HuC support, OA for DG2 is enabled. Small
bar enabling, PS64 support added for DG2 page tables. ptrace support for
local memory objects, local-memory migration for display surfaces.
Note that there is drm/drm-next backmerge and then MEI subsystem patches
around GSC/PXP which are intertwined with i915 change so merged here as
agreed with Tomas and Greg.
Additionally the usual amount of refactoring, cleanups, debugging
improvements and static checker fixes.
Regards, Joonas
PS. Once you have pulled this, I will backmerge drm-next to bring in
more dependencies for upcoming patches.
***
drm-intel-gt-next-2022-10-31:
- Start adding HWMON metrics (Dale, Ashutosh, Riana, Badal)
See Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
Cross-subsystem Changes:
- MEI subsystem patches for GSC/PXP (Vitaly, Tomas)
* R-b'd by Greg, agreed to merge via drm-intel-gt-next
- Backmerge of drm/drm-next to pull misc/mei changes for DG2 HuC
Driver Changes:
- Fix for #6222: Kernel memory corruption when running piglit with OA
enabled (Chris)
- Add Wa_1806527549 for Gen12 iGPU (Gustavo)
- Fix display problems after resume regression (Thomas)
- Extend pre-emption timeout to 7.5 seconds on compute capable engines
on Gen12 (John)
- Add error compute registers to GuC error capture list (Alan)
- Delay disabling guc_id scheduling for better hysteresis (Matt B)
- Use platform min/max frequency with GuC SLPC (Vinay)
- Meteorlake (MTL) enabling (Ashutosh, Matt R, Aravind)
- Add more DG2 workarounds (Matt A)
- DG2 HuC loading (Daniele)
- Enable OA support for DG2 (Umesh, Vinay, Lionel)
- Better document I915_PARAM_HUC_STATUS error codes (Daniele)
- Enable compute scheduling on DG2 (John)
- Small bar enabling for dGPU (Matt A)
- Enable PS64 support for DG2 (Matt A)
- Handle migration to local-memory for display surfaces (Matt A)
- Update MOCS table for EHL (Tejas)
- Limit GuC scheduling properties to avoid overflow (John)
- Update forcewake domain for CCS register ranges for PVC (Matt R)
- Implement access_memory for local memory to enable ptrace (Matt A)
- Document and future-proof preemption control policy (Matt R)
- Restrict forced preemption to the active context (Chris)
- Move scratch page into system memory on all platforms (Chris)
- Flush to global observation point before breadcrumb write (Prathap, Nirmoy)
- Bump the reset-failure timeout to 60s (Chris)
- Codebase restructuring for more clarity (Lucas, Jani, Vinay, Nirmoy,
Ville, Andrzej)
- Stop abusing swiotlb_max_segment (Robert, Christoph)
- Fix a potential UAF at device unload (Nirmoy, Chris)
- Fix revocation of non-persistent contexts with GuC (Tvrtko)
- Fix GuC error capture sizing estimation and reporting (Alan)
- Make failure to setup stolen non-fatal on dGPU (Lucas)
- Fixes to perf_limit_reasons and add to debugfs (Ashutosh, Tilak)
- Release build fix for GuC log size removal (John)
- Cleanup partial engine discovery failures (Chris)
- Do not cleanup obj with NULL bo->resource (Nirmoy)
- Split GAM and MSLICE steering (Matt R)
- Flush GEM contexts on driver release (Janusz, Chris)
- Multi GT suspend and resume enabling (Tvrtko)
- Use i915_vm_put on ppgtt_create error paths (Chris)
- Remove leftover code from previous cleanups (Niranjana, Nirmoy,
Gwan-gyeong, Matt A, Andi, Alan, Karolina)
- Selftest and debugging improvements (Tvrtko, Nirmoy, Riana, Vinay)
- Static checker fixups (Colin, Nathan)
- Documentation improvements (Lucas)
The following changes since commit 7860d720a84c74b2761c6b7995392a798ab0a3cb:
drm/msm: Fix build break with recent mm tree (2022-09-30 10:13:49 +1000)
are available in the Git repository at:
git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-gt-next-2022-10-31
for you to fetch changes up to 876e9047a91839ee5be0ba099036d19883e52ca2:
drm/i915/mtl: Add missing steering table terminators (2022-10-28 17:36:56 -0700)
----------------------------------------------------------------
- Start adding HWMON metrics (Dale, Ashutosh, Riana, Badal)
See Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
Cross-subsystem Changes:
- MEI subsystem patches for GSC/PXP (Vitaly, Tomas)
* R-b'd by Greg, agreed to merge via drm-intel-gt-next
- Backmerge of drm/drm-next to pull misc/mei changes for DG2 HuC
Driver Changes:
- Fix for #6222: Kernel memory corruption when running piglit with OA
enabled (Chris)
- Add Wa_1806527549 for Gen12 iGPU (Gustavo)
- Fix display problems after resume regression (Thomas)
- Extend pre-emption timeout to 7.5 seconds on compute capable engines
on Gen12 (John)
- Add error compute registers to GuC error capture list (Alan)
- Delay disabling guc_id scheduling for better hysteresis (Matt B)
- Use platform min/max frequency with GuC SLPC (Vinay)
- Meteorlake (MTL) enabling (Ashutosh, Matt R, Aravind)
- Add more DG2 workarounds (Matt A)
- DG2 HuC loading (Daniele)
- Enable OA support for DG2 (Umesh, Vinay, Lionel)
- Better document I915_PARAM_HUC_STATUS error codes (Daniele)
- Enable compute scheduling on DG2 (John)
- Small bar enabling for dGPU (Matt A)
- Enable PS64 support for DG2 (Matt A)
- Handle migration to local-memory for display surfaces (Matt A)
- Update MOCS table for EHL (Tejas)
- Limit GuC scheduling properties to avoid overflow (John)
- Update forcewake domain for CCS register ranges for PVC (Matt R)
- Implement access_memory for local memory to enable ptrace (Matt A)
- Document and future-proof preemption control policy (Matt R)
- Restrict forced preemption to the active context (Chris)
- Move scratch page into system memory on all platforms (Chris)
- Flush to global observation point before breadcrumb write (Prathap, Nirmoy)
- Bump the reset-failure timeout to 60s (Chris)
- Codebase restructuring for more clarity (Lucas, Jani, Vinay, Nirmoy,
Ville, Andrzej)
- Stop abusing swiotlb_max_segment (Robert, Christoph)
- Fix a potential UAF at device unload (Nirmoy, Chris)
- Fix revocation of non-persistent contexts with GuC (Tvrtko)
- Fix GuC error capture sizing estimation and reporting (Alan)
- Make failure to setup stolen non-fatal on dGPU (Lucas)
- Fixes to perf_limit_reasons and add to debugfs (Ashutosh, Tilak)
- Release build fix for GuC log size removal (John)
- Cleanup partial engine discovery failures (Chris)
- Do not cleanup obj with NULL bo->resource (Nirmoy)
- Split GAM and MSLICE steering (Matt R)
- Flush GEM contexts on driver release (Janusz, Chris)
- Multi GT suspend and resume enabling (Tvrtko)
- Use i915_vm_put on ppgtt_create error paths (Chris)
- Remove leftover code from previous cleanups (Niranjana, Nirmoy,
Gwan-gyeong, Matt A, Andi, Alan, Karolina)
- Selftest and debugging improvements (Tvrtko, Nirmoy, Riana, Vinay)
- Static checker fixups (Colin, Nathan)
- Documentation improvements (Lucas)
----------------------------------------------------------------
Alan Previn (4):
drm/i915/guc: Add error-capture init warnings when needed
drm/i915/guc: Add compute reglist for guc err capture
drm/i915/guc: Fix GuC error capture sizing estimation and reporting
drm/i915/guc: Remove intel_context:number_committed_requests counter
Andi Shyti (1):
drm/i915/trace: Remove unused frequency trace
Andrzej Hajda (2):
drm/i915: use intel_uncore_rmw when appropriate
drm/i915/gt: use intel_uncore_rmw when appropriate
Aravind Iddamsetty (1):
drm/i915/mtl: enable local stolen memory
Ashutosh Dixit (5):
drm/i915/mtl: PERF_LIMIT_REASONS changes for MTL
drm/i915/rps: Freq caps for MTL
drm/i915: Perf_limit_reasons are only available for Gen11+
drm/i915/hwmon: Expose card reactive critical power
drm/i915/hwmon: Expose power1_max_interval
Chris Wilson (6):
drm/i915/gt: Cleanup partial engine discovery failures
drm/i915/gem: Really move i915_gem_context.link under ref protection
drm/i915/gt: Restrict forced preemption to the active context
drm/i915/gt: Use i915_vm_put on ppgtt_create error paths
drm/i915/gt: Move scratch page into system memory on all platforms
drm/i915/gt: Bump the reset-failure timeout to 60s
Colin Ian King (2):
drm/i915/gem: remove redundant assignments to variable ret
drm/i915/perf: remove redundant variable 'taken'
Dale B Stimson (4):
drm/i915/hwmon: Add HWMON infrastructure
drm/i915/hwmon: Power PL1 limit and TDP setting
drm/i915/hwmon: Show device level energy usage
drm/i915/hwmon: Extend power/energy for XEHPSDV
Daniele Ceraolo Spurio (7):
drm/i915/pxp: load the pxp module when we have a gsc-loaded huc
drm/i915/dg2: setup HuC loading via GSC
drm/i915/huc: track delayed HuC load with a fence
drm/i915/huc: stall media submission until HuC is loaded
drm/i915/huc: better define HuC status getparam possible return values.
drm/i915/huc: define gsc-compatible HuC fw for DG2
drm/i915/huc: bump timeout for delayed load and reduce print verbosity
Gustavo Sousa (1):
drm/i915/xelp: Add Wa_1806527549
Gwan-gyeong Mun (1):
drm/i915/gt: Remove unused function prototype
Jani Nikula (1):
drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline
Janusz Krzysztofik (1):
drm/i915/gem: Flush contexts on driver release
John Harrison (6):
drm/i915/guc: Fix release build bug in 'remove log size module parameters'
drm/i915/guc: Enable compute scheduling on DG2
drm/i915/guc: Limit scheduling properties to avoid overflow
drm/i915: Fix compute pre-emption w/a to apply to compute engines
drm/i915: Make the heartbeat play nice with long pre-emption timeouts
drm/i915: Improve long running compute w/a for GuC submission
Karolina Drobnik (1):
i915/i915_gem_context: Remove debug message in i915_gem_context_create_ioctl
Lionel Landwerlin (1):
drm/i915/perf: complete programming whitelisting for XEHPSDV
Lucas De Marchi (7):
drm/i915: Add missing mask when reading GEN12_DSMBASE
drm/i915: Split i915_gem_init_stolen()
drm/i915/dgfx: Make failure to setup stolen non-fatal
drm/i915: Noop lrc_init_wa_ctx() on recent/future platforms
drm/i915: Fix __gen125_emit_bb_start() without WA
drm/i915/gt: Document function to decode register state context
drm/i915/gt: Fix platform prefix
Matt Atwood (1):
drm/i915/dg2: introduce Wa_22015475538
Matt Roper (21):
drm/i915/mtl: Add MTL forcewake support
drm/i915: Split GAM and MSLICE steering
drm/i915/mtl: Define engine context layouts
drm/i915: Document and future-proof preemption control policy
drm/i915/gen8: Create separate reg definitions for new MCR registers
drm/i915/xehp: Create separate reg definitions for new MCR registers
drm/i915/gt: Drop a few unused register definitions
drm/i915/gt: Correct prefix on a few registers
drm/i915/gt: Add intel_gt_mcr_multicast_rmw() operation
drm/i915/xehp: Check for faults on primary GAM
drm/i915/gt: Add intel_gt_mcr_wait_for_reg_fw()
drm/i915: Define MCR registers explicitly
drm/i915/gt: Always use MCR functions on multicast registers
drm/i915/guc: Handle save/restore of MCR registers explicitly
drm/i915/gt: Add MCR-specific workaround initializers
drm/i915: Define multicast registers as a new type
drm/i915/xelpg: Add multicast steering
drm/i915/xelpmp: Add multicast steering for media GT
drm/i915/pvc: Update forcewake domain for CCS register ranges
drm/i915/xelpg: Fix write to MTL_MCR_SELECTOR
drm/i915/mtl: Add missing steering table terminators
Matthew Auld (11):
drm/i915/ttm: implement access_memory
drm/i915: remove the TODO in pin_and_fence_fb_obj
drm/i915/display: handle migration for dpt
drm/i915: allow control over the flags when migrating
drm/i915/display: consider DG2_RC_CCS_CC when migrating buffers
drm/i915: check memory is mappable in read_from_page
drm/i915: add back GEN12_BDSM_MASK
drm/i915: restore stolen memory behaviour for DG2
drm/i915: enable PS64 support for DG2
drm/i915/uapi: expose GTT alignment
Revert "drm/i915/uapi: expose GTT alignment"
Matthew Brost (1):
drm/i915/guc: Delay disabling guc_id scheduling for better hysteresis
Nathan Chancellor (1):
drm/i915: Fix CFI violations in gt_sysfs
Niranjana Vishwanathapura (1):
drm/i915: Remove unwanted pointer unpacking
Nirmoy Das (5):
drm/i915: Do not cleanup obj with NULL bo->resource
drm/i915: Improve debug print in vm_fault_ttm
drm/i915: Fix a potential UAF at device unload
drm/i915: remove excessive i915_gem_drain_freed_objects
drm/i915: Refactor ttm ghost obj detection
Prathap Kumar Valsan (1):
drm/i915/gt: Flush to global observation point before breadcrumb write
Riana Tauro (4):
drm/i915/guc/slpc: Run SLPC selftests on all tiles
drm/i915/selftests: Add helper function measure_power
drm/i915/guc/slpc: Add SLPC selftest live_slpc_power
drm/i915/hwmon: Add HWMON current voltage support
Robert Beckett (1):
drm/i915: stop abusing swiotlb_max_segment
Tejas Upadhyay (1):
drm/i915/ehl: Update MOCS table for EHL
Thomas Hellström (1):
drm/i915: Fix display problems after resume
Tilak Tangudu (1):
drm/i915/debugfs: Add perf_limit_reasons in debugfs
Tomas Winkler (5):
mei: add support to GSC extended header
mei: bus: enable sending gsc commands
mei: adjust extended header kdocs
mei: pxp: support matching with a gfx discrete card
drm/i915/pxp: add huc authentication and loading command
Tvrtko Ursulin (7):
drm/i915: Make GEM resume all engines
drm/i915: Make GEM suspend all GTs
drm/i915: Handle all GTs on driver (un)load paths
drm/i915/selftests: Remove flush_scheduled_work() from live_execlists
Merge drm/drm-next into drm-intel-gt-next
drm/i915/guc: Fix revocation of non-persistent contexts
drm/i915/selftests: Stop using kthread_stop()
Umesh Nerlige Ramappa (14):
drm/i915/perf: Fix OA filtering logic for GuC mode
drm/i915/perf: Add 32-bit OAG and OAR formats for DG2
drm/i915/perf: Fix noa wait predication for DG2
drm/i915/perf: Determine gen12 oa ctx offset at runtime
drm/i915/perf: Enable bytes per clock reporting in OA
drm/i915/perf: Simply use stream->ctx
drm/i915/perf: Move gt-specific data from i915->perf to gt->perf
drm/i915/perf: Replace gt->perf.lock with stream->lock for file ops
drm/i915/perf: Use gt-specific ggtt for OA and noa-wait buffers
drm/i915/perf: Store a pointer to oa_format in oa_buffer
drm/i915/perf: Add Wa_1508761755:dg2
drm/i915/perf: Apply Wa_18013179988
drm/i915/perf: Save/restore EU flex counters across reset
drm/i915/perf: Enable OA for DG2
Ville Syrjälä (3):
drm/i915: Extract intel_mmio_bar()
drm/i915: Name our BARs based on the spec
drm/i915: s/HAS_BAR2_SMEM_STOLEN/HAS_LMEMBAR_SMEM_STOLEN/
Vinay Belgaumkar (5):
drm/i915: Add a wrapper for frequency debugfs
drm/i915/slpc: Update the frequency debugfs
drm/i915/slpc: Optmize waitboost for SLPC
drm/i915/slpc: Use platform limits for min/max frequency
drm/i915/guc: Support OA when Wa_16011777198 is enabled
Vitaly Lubart (3):
mei: bus: extend bus API to support command streamer API
mei: pxp: add command streamer API to the PXP driver
drm/i915/pxp: implement function for sending tee stream command
.../ABI/testing/sysfs-driver-intel-i915-hwmon | 75 +++
MAINTAINERS | 1 +
drivers/gpu/drm/i915/Kconfig.profile | 26 +-
drivers/gpu/drm/i915/Makefile | 14 +-
drivers/gpu/drm/i915/display/intel_dpt.c | 1 +
drivers/gpu/drm/i915/display/intel_fb_pin.c | 63 +-
drivers/gpu/drm/i915/display/intel_lpe_audio.c | 4 +-
drivers/gpu/drm/i915/gem/i915_gem_context.c | 19 +-
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 5 -
drivers/gpu/drm/i915/gem/i915_gem_internal.c | 19 +-
drivers/gpu/drm/i915/gem/i915_gem_object.c | 49 +-
drivers/gpu/drm/i915/gem/i915_gem_object.h | 8 +
drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 3 +-
drivers/gpu/drm/i915/gem/i915_gem_pages.c | 12 +
drivers/gpu/drm/i915/gem/i915_gem_pm.c | 33 +-
drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 261 +++++---
drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 78 ++-
drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 18 +-
drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 2 +-
drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 5 +-
drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 157 ++++-
.../gpu/drm/i915/gem/selftests/i915_gem_context.c | 118 ++--
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 1 +
drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 55 +-
drivers/gpu/drm/i915/gt/gen8_engine_cs.h | 12 +-
drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 92 +--
drivers/gpu/drm/i915/gt/intel_context.c | 5 +-
drivers/gpu/drm/i915/gt/intel_context.h | 11 +-
drivers/gpu/drm/i915/gt/intel_context_types.h | 9 +-
drivers/gpu/drm/i915/gt/intel_engine.h | 6 +
drivers/gpu/drm/i915/gt/intel_engine_cs.c | 113 +++-
drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 39 ++
drivers/gpu/drm/i915/gt/intel_engine_regs.h | 1 +
drivers/gpu/drm/i915/gt/intel_engine_types.h | 15 +
.../gpu/drm/i915/gt/intel_execlists_submission.c | 25 +-
drivers/gpu/drm/i915/gt/intel_ggtt.c | 26 +-
drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 4 +
drivers/gpu/drm/i915/gt/intel_gsc.c | 23 +-
drivers/gpu/drm/i915/gt/intel_gt.c | 138 +++-
drivers/gpu/drm/i915/gt/intel_gt.h | 1 +
drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 305 ++++++++-
drivers/gpu/drm/i915/gt/intel_gt_mcr.h | 24 +-
drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 196 ++----
drivers/gpu/drm/i915/gt/intel_gt_regs.h | 178 +++--
drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 15 +-
drivers/gpu/drm/i915/gt/intel_gt_sysfs.h | 7 +-
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 480 +++++++-------
drivers/gpu/drm/i915/gt/intel_gt_types.h | 6 +
drivers/gpu/drm/i915/gt/intel_gtt.c | 43 +-
drivers/gpu/drm/i915/gt/intel_gtt.h | 3 +-
drivers/gpu/drm/i915/gt/intel_lrc.c | 143 +++-
drivers/gpu/drm/i915/gt/intel_lrc.h | 2 +
drivers/gpu/drm/i915/gt/intel_migrate.c | 1 +
drivers/gpu/drm/i915/gt/intel_mocs.c | 20 +-
drivers/gpu/drm/i915/gt/intel_reset.c | 2 +-
drivers/gpu/drm/i915/gt/intel_rps.c | 265 +++++++-
drivers/gpu/drm/i915/gt/intel_rps.h | 3 +
drivers/gpu/drm/i915/gt/intel_sseu.c | 4 +-
drivers/gpu/drm/i915/gt/intel_workarounds.c | 574 ++++++++++------
drivers/gpu/drm/i915/gt/intel_workarounds_types.h | 9 +-
drivers/gpu/drm/i915/gt/selftest_execlists.c | 50 +-
drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 51 +-
drivers/gpu/drm/i915/gt/selftest_migrate.c | 1 +
drivers/gpu/drm/i915/gt/selftest_rps.c | 12 +-
drivers/gpu/drm/i915/gt/selftest_slpc.c | 190 +++++-
drivers/gpu/drm/i915/gt/selftest_workarounds.c | 2 +-
drivers/gpu/drm/i915/gt/sysfs_engines.c | 25 +-
drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h | 1 +
.../gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 9 +
drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 9 +-
drivers/gpu/drm/i915/gt/uc/intel_guc.c | 1 +
drivers/gpu/drm/i915/gt/uc/intel_guc.h | 16 +
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 71 +-
drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 119 +++-
drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c | 61 ++
drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 12 +-
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 43 ++
drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 6 +-
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 103 +++
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 4 +
drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 3 +
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 358 ++++++++--
drivers/gpu/drm/i915/gt/uc/intel_huc.c | 262 +++++++-
drivers/gpu/drm/i915/gt/uc/intel_huc.h | 31 +
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 34 +
drivers/gpu/drm/i915/gt/uc/intel_huc_fw.h | 1 +
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 24 +-
drivers/gpu/drm/i915/gvt/cfg_space.c | 4 +-
drivers/gpu/drm/i915/gvt/handlers.c | 4 +-
drivers/gpu/drm/i915/gvt/mmio_context.c | 14 +-
drivers/gpu/drm/i915/i915_driver.c | 8 +-
drivers/gpu/drm/i915/i915_drv.h | 30 +-
drivers/gpu/drm/i915/i915_gem.c | 50 +-
drivers/gpu/drm/i915/i915_getparam.c | 3 +
drivers/gpu/drm/i915/i915_gpu_error.c | 12 +-
drivers/gpu/drm/i915/i915_hwmon.c | 738 +++++++++++++++++++++
drivers/gpu/drm/i915/i915_hwmon.h | 20 +
drivers/gpu/drm/i915/i915_pci.c | 9 +-
drivers/gpu/drm/i915/i915_perf.c | 582 ++++++++++++----
drivers/gpu/drm/i915/i915_perf.h | 2 +
drivers/gpu/drm/i915/i915_perf_oa_regs.h | 6 +-
drivers/gpu/drm/i915/i915_perf_types.h | 47 +-
drivers/gpu/drm/i915/i915_reg.h | 22 +
drivers/gpu/drm/i915/i915_reg_defs.h | 27 +-
drivers/gpu/drm/i915/i915_request.c | 24 +
drivers/gpu/drm/i915/i915_request.h | 5 +
drivers/gpu/drm/i915/i915_scatterlist.h | 34 +-
drivers/gpu/drm/i915/i915_selftest.h | 2 +
drivers/gpu/drm/i915/i915_trace.h | 15 -
drivers/gpu/drm/i915/i915_vma.c | 9 +-
drivers/gpu/drm/i915/intel_device_info.h | 3 +-
drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 +-
drivers/gpu/drm/i915/intel_mchbar_regs.h | 21 +
drivers/gpu/drm/i915/intel_pci_config.h | 28 +-
drivers/gpu/drm/i915/intel_pm.c | 205 +++---
drivers/gpu/drm/i915/intel_uncore.c | 280 +++++++-
drivers/gpu/drm/i915/intel_uncore.h | 2 +
drivers/gpu/drm/i915/pxp/intel_pxp.c | 32 +-
drivers/gpu/drm/i915/pxp/intel_pxp.h | 32 -
drivers/gpu/drm/i915/pxp/intel_pxp_huc.c | 69 ++
drivers/gpu/drm/i915/pxp/intel_pxp_huc.h | 13 +
drivers/gpu/drm/i915/pxp/intel_pxp_irq.h | 8 +
drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 8 +-
drivers/gpu/drm/i915/pxp/intel_pxp_session.h | 11 +-
drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 139 +++-
drivers/gpu/drm/i915/pxp/intel_pxp_tee.h | 5 +
drivers/gpu/drm/i915/pxp/intel_pxp_tee_interface.h | 23 +-
drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 6 +
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 10 +-
drivers/gpu/drm/i915/selftests/i915_perf.c | 16 +-
drivers/gpu/drm/i915/selftests/i915_request.c | 252 ++++---
drivers/gpu/drm/i915/selftests/intel_uncore.c | 4 +
drivers/gpu/drm/i915/selftests/mock_gem_device.c | 1 -
drivers/misc/mei/bus.c | 146 +++-
drivers/misc/mei/client.c | 55 +-
drivers/misc/mei/hbm.c | 13 +
drivers/misc/mei/hw-me.c | 7 +-
drivers/misc/mei/hw.h | 89 ++-
drivers/misc/mei/interrupt.c | 47 +-
drivers/misc/mei/mei_dev.h | 8 +
drivers/misc/mei/pxp/mei_pxp.c | 38 +-
include/drm/i915_pxp_tee_interface.h | 5 +
include/linux/mei_cl_bus.h | 6 +
include/uapi/drm/i915_drm.h | 62 +-
145 files changed, 6631 insertions(+), 2010 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
create mode 100644 drivers/gpu/drm/i915/i915_hwmon.c
create mode 100644 drivers/gpu/drm/i915/i915_hwmon.h
create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_huc.c
create mode 100644 drivers/gpu/drm/i915/pxp/intel_pxp_huc.h
