History

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>

Dave Airlie committed 4 months ago

Commit 0639cb22 parents fab6908 820de0765 files · +1432 −433Browse files

Showing the changes to include (3 of 65 files). Show all

Unified · Split

3 files
  1. include/drm/intel/pciids.h +3 −2
  2. include/linux/perf_event.h +15 −16
  3. include/uapi/drm/xe_drm.h +10 −1
include/drm/intel/pciids.h+3−2
@@ -893,8 +893,9 @@ · 892 unmodified lines
893 MACRO__(0xD741, ## __VA_ARGS__), \893 MACRO__(0xD741, ## __VA_ARGS__), \
894 MACRO__(0xD742, ## __VA_ARGS__), \894 MACRO__(0xD742, ## __VA_ARGS__), \
895 MACRO__(0xD743, ## __VA_ARGS__), \895 MACRO__(0xD743, ## __VA_ARGS__), \
896 MACRO__(0xD744, ## __VA_ARGS__), \896 MACRO__(0xD745, ## __VA_ARGS__), \
897 MACRO__(0xD745, ## __VA_ARGS__)897 MACRO__(0xD74A, ## __VA_ARGS__), \
898 MACRO__(0xD74B, ## __VA_ARGS__)
898 899
899/* CRI */900/* CRI */
900#define INTEL_CRI_IDS(MACRO__, ...) \901#define INTEL_CRI_IDS(MACRO__, ...) \
include/linux/perf_event.h+15−16
@@ -1791,22 +1791,8 @@ static inline int perf_is_paranoid(void) · 1790 unmodified lines
1791}1791}
1792 1792
1793extern int perf_allow_kernel(void);1793extern int perf_allow_kernel(void);
1794 1794extern int perf_allow_cpu(void);
1795static inline int perf_allow_cpu(void)1795extern int perf_allow_tracepoint(void);
1796{
1797 if (sysctl_perf_event_paranoid > 0 && !perfmon_capable())
1798 return -EACCES;
1799
1800 return security_perf_event_open(PERF_SECURITY_CPU);
1801}
1802
1803static inline int perf_allow_tracepoint(void)
1804{
1805 if (sysctl_perf_event_paranoid > -1 && !perfmon_capable())
1806 return -EPERM;
1807
1808 return security_perf_event_open(PERF_SECURITY_TRACEPOINT);
1809}
1810 1796
1811extern int perf_exclude_event(struct perf_event *event, struct pt_regs *regs);1797extern int perf_exclude_event(struct perf_event *event, struct pt_regs *regs);
1812 1798
@@ -2023,6 +2009,19 @@ perf_event_pause(struct perf_event *event, bool reset) { return 0; } · 210 unmodified lines
2023static inline int2009static inline int
2024perf_exclude_event(struct perf_event *event, struct pt_regs *regs) { return 0; }2010perf_exclude_event(struct perf_event *event, struct pt_regs *regs) { return 0; }
2025 2011
2012static inline int perf_allow_kernel(void)
2013{
2014 return perfmon_capable() ? 0 : -EACCES;
2015}
2016static inline int perf_allow_cpu(void)
2017{
2018 return perfmon_capable() ? 0 : -EACCES;
2019}
2020static inline int perf_allow_tracepoint(void)
2021{
2022 return perfmon_capable() ? 0 : -EPERM;
2023}
2024
2026#endif /* !CONFIG_PERF_EVENTS */2025#endif /* !CONFIG_PERF_EVENTS */
2027 2026
2028#if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_INTEL)2027#if defined(CONFIG_PERF_EVENTS) && defined(CONFIG_CPU_SUP_INTEL)
include/uapi/drm/xe_drm.h+10−1
@@ -2589,6 +2589,12 @@ enum drm_xe_ras_error_component { · 2588 unmodified lines
2589 DRM_XE_RAS_ERR_COMP_CORE_COMPUTE = 1,2589 DRM_XE_RAS_ERR_COMP_CORE_COMPUTE = 1,
2590 /** @DRM_XE_RAS_ERR_COMP_SOC_INTERNAL: SoC Internal Error */2590 /** @DRM_XE_RAS_ERR_COMP_SOC_INTERNAL: SoC Internal Error */
2591 DRM_XE_RAS_ERR_COMP_SOC_INTERNAL,2591 DRM_XE_RAS_ERR_COMP_SOC_INTERNAL,
2592 /** @DRM_XE_RAS_ERR_COMP_DEVICE_MEMORY: Device Memory Error */
2593 DRM_XE_RAS_ERR_COMP_DEVICE_MEMORY,
2594 /** @DRM_XE_RAS_ERR_COMP_PCIE: PCIe Subsystem Error */
2595 DRM_XE_RAS_ERR_COMP_PCIE,
2596 /** @DRM_XE_RAS_ERR_COMP_FABRIC: Fabric Subsystem Error */
2597 DRM_XE_RAS_ERR_COMP_FABRIC,
2592 /** @DRM_XE_RAS_ERR_COMP_MAX: Max Error */2598 /** @DRM_XE_RAS_ERR_COMP_MAX: Max Error */
2593 DRM_XE_RAS_ERR_COMP_MAX /* non-ABI */2599 DRM_XE_RAS_ERR_COMP_MAX /* non-ABI */
2594};2600};
@@ -2606,7 +2612,10 @@ enum drm_xe_ras_error_component { · 11 unmodified lines
2606 */2612 */
2607#define DRM_XE_RAS_ERROR_COMPONENT_NAMES { \2613#define DRM_XE_RAS_ERROR_COMPONENT_NAMES { \
2608 [DRM_XE_RAS_ERR_COMP_CORE_COMPUTE] = "core-compute", \2614 [DRM_XE_RAS_ERR_COMP_CORE_COMPUTE] = "core-compute", \
2609 [DRM_XE_RAS_ERR_COMP_SOC_INTERNAL] = "soc-internal" \2615 [DRM_XE_RAS_ERR_COMP_SOC_INTERNAL] = "soc-internal", \
2616 [DRM_XE_RAS_ERR_COMP_DEVICE_MEMORY] = "device-memory", \
2617 [DRM_XE_RAS_ERR_COMP_PCIE] = "pcie", \
2618 [DRM_XE_RAS_ERR_COMP_FABRIC] = "fabric", \
2610}2619}
2611 2620
2612#if defined(__cplusplus)2621#if defined(__cplusplus)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t