mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-08-31 02:21:39 -04:00
Merge tag 'drm-xe-next-2026-07-03' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next
UAPI Changes:
- Add additional error components to xe drm_ras (Riana)
- Drop 'force_execlist' module parameter (Roper)
Cross-subsystem Changes:
- Perf events: Export perf_allow_{cpu,tracepoint} to be used by Xe (John)
Display Changes:
- Skip FORCE_WC and vm_bound check for external dma-bufs (Auld)
Driver Changes:
- Gate observation streams with perf_allow_cpu (John Hubbard)
- Documentation updates and fixes (Michal, Zhan)
- Remove unreleased NVL-S GuC (Daniele)
- Fix pcode init path (Michal)
- RTP fixes and improvements (Gustavo, Violet, Thomas, Roper)
- TLB invalidation fixes and improvements (Tilak)
- PXP detachment from HuC for newer platforms (Daniele)
- Multi-queue fix (Niranjana)
- Improve Kconfig.profile help (Rodrigo)
- Xe_drm_ras and hw_error updates and fixes (Raag, Riana)
- NVL-S updated PCI-IDs and W/a (Gustavo, Nitin)
- Fix dma_fence refcound (Wentao)
- Madvise: optimize invalidation path (Arvind)
- Fix a infinite gt-reset loop in the timeout recovery (Rodrigo)
- Fix wa_oob codegen recipe for external module builds (Thomas)
- Avoid global forcewake in cycle query path (Xin)
- Update TTM device benefical_order (Brost)
- Fix buffer overflow in guc capture (Tejas)
- Page-table fixes and improvements (Brian, Francois, Auld, Brost)
- Removing redundant check (Lu)
- General MCR and MMIO clean-up and improvements (Michal)
- Don't whitelist OA registers unconditionally (Ashutosh)
- SVM error return fix (Brost)
- Userptr fix and small related clean-ups (Shuicheng)
- Don't attempt to process FAST_REQ or EVENT relays on PF (Michal)
- Couple fdinfo improvements (Auld)
- Drop manual VF check on i2c (Raag)
- Probe info outside of xe_info_init functions (Gustavo)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/akf7xr96MI4Rd6Qj@intel.com
This commit is contained in:
@@ -2589,6 +2589,12 @@ enum drm_xe_ras_error_component {
|
||||
DRM_XE_RAS_ERR_COMP_CORE_COMPUTE = 1,
|
||||
/** @DRM_XE_RAS_ERR_COMP_SOC_INTERNAL: SoC Internal Error */
|
||||
DRM_XE_RAS_ERR_COMP_SOC_INTERNAL,
|
||||
/** @DRM_XE_RAS_ERR_COMP_DEVICE_MEMORY: Device Memory Error */
|
||||
DRM_XE_RAS_ERR_COMP_DEVICE_MEMORY,
|
||||
/** @DRM_XE_RAS_ERR_COMP_PCIE: PCIe Subsystem Error */
|
||||
DRM_XE_RAS_ERR_COMP_PCIE,
|
||||
/** @DRM_XE_RAS_ERR_COMP_FABRIC: Fabric Subsystem Error */
|
||||
DRM_XE_RAS_ERR_COMP_FABRIC,
|
||||
/** @DRM_XE_RAS_ERR_COMP_MAX: Max Error */
|
||||
DRM_XE_RAS_ERR_COMP_MAX /* non-ABI */
|
||||
};
|
||||
@@ -2606,7 +2612,10 @@ enum drm_xe_ras_error_component {
|
||||
*/
|
||||
#define DRM_XE_RAS_ERROR_COMPONENT_NAMES { \
|
||||
[DRM_XE_RAS_ERR_COMP_CORE_COMPUTE] = "core-compute", \
|
||||
[DRM_XE_RAS_ERR_COMP_SOC_INTERNAL] = "soc-internal" \
|
||||
[DRM_XE_RAS_ERR_COMP_SOC_INTERNAL] = "soc-internal", \
|
||||
[DRM_XE_RAS_ERR_COMP_DEVICE_MEMORY] = "device-memory", \
|
||||
[DRM_XE_RAS_ERR_COMP_PCIE] = "pcie", \
|
||||
[DRM_XE_RAS_ERR_COMP_FABRIC] = "fabric", \
|
||||
}
|
||||
|
||||
#if defined(__cplusplus)
|
||||
|
||||
Reference in New Issue
Block a user