diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-11-17 13:39:45 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-11-17 13:45:14 +1000 |
| commit | 727bf2dc96a6e0eeb35f5adffaede020981ac17c (patch) | |
| tree | a8b923bc2626d96560333c3469ffa53c3928a792 /include | |
| parent | 61926c915f0a5e5db1a1ba45e1ecfac511307bd0 (diff) | |
| parent | 6bcb180f6f4585554cefbe8c412aa8879b15f07a (diff) | |
Merge tag 'drm-xe-next-2025-11-14' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next
Driver Changes:
Avoid TOCTOU when montoring throttle reasons (Lucas)
Add/extend workaround (Nitin)
SRIOV migration work / plumbing (Michal Wajdeczko, Michal Winiarski, Lukasz)
Drop debug flag requirement for VF resource fixup
Fix MTL vm_max_level (Rodrigo)
Changes around TILE_ADDR_RANGE for platform compatibility
(Fei, Lucas)
Add runtime registers for GFX ver >= 35 (Piotr)
Kerneldoc fix (Kriish)
Rework pcode error mapping (Lucas)
Allow lockdown the PF (Michal)
Eliminate GUC code caching of some frequency values (Sk)
Improvements around forcewake referencing (Matt Roper)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patch.msgid.link/aRcJOrisG2qPbucE@fedora
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/intel/pciids.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h index b258e79b437a..52520e684ab1 100644 --- a/include/drm/intel/pciids.h +++ b/include/drm/intel/pciids.h @@ -861,7 +861,7 @@ MACRO__(0xE216, ## __VA_ARGS__) #define INTEL_BMG_IDS(MACRO__, ...) \ - INTEL_BMG_G21_IDS(MACRO__, __VA_ARGS__), \ + INTEL_BMG_G21_IDS(MACRO__, ## __VA_ARGS__), \ MACRO__(0xE220, ## __VA_ARGS__), \ MACRO__(0xE221, ## __VA_ARGS__), \ MACRO__(0xE222, ## __VA_ARGS__), \ |
