kernel/git/next/linux-next.git/drivers/gpu/drm/xe, branch master

Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git

2026-09-17T19:18:01+00:00

Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git

2026-09-17T19:17:59+00:00

# Conflicts: # drivers/gpu/drm/i915/display/intel_cursor.c # drivers/gpu/drm/i915/display/skl_universal_plane.c

Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git

2026-09-17T16:01:31+00:00

# Conflicts: # drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c # drivers/gpu/drm/xe/xe_pagefault.c

drm/i915/display: stop using the configurable fence timeout

2026-09-17T12:18:38+00:00

i915 has the Kconfig option DRM_I915_FENCE_TIMEOUT, defaulting to 10 seconds. xe doesn't use it, instead defaulting to MAX_SCHEDULE_TIMEOUT. Unify the behaviour by switching to dma_fence_wait() which defaults to MAX_SCHEDULE_TIMEOUT. As dma_fence_wait() returns 0 when the fence was signaled, update the return value check. This should be possible now that commit 3aef9c94c02b ("drm/i915: Perform full wedge on display reset") has been merged, and we no longer rely on the timeout. v3: Try this again with full wedge v2: Use dma_fence_wait(), fix return value check (Maarten) Reviewed-by: Maarten Lankhorst Cc: Ville Syrjälä Link: https://patch.msgid.link/1880e49c9270049d5dfd944a1cbf712d664d02aa.1789069102.git.jani.nikula@intel.com Signed-off-by: Jani Nikula

drm/i915/xe: plug the pme_enabed implementation for xe

2026-09-16T14:15:02+00:00

Plug the pme_enabled query for xe. It will return the current PME status for the device. For supported platforms, PME is enabled during runtime suspend calls if the device is PME is capable. v2: use the xe_pm_pme_enabled() Assisted-by: GitHub_Copilot:claude-opus-5 Signed-off-by: Vinod Govindapillai Reviewed-by: Jouni Högander Link: https://patch.msgid.link/20260915092518.639448-4-vinod.govindapillai@intel.com Signed-off-by: Rodrigo Vivi

drm/xe/pm: introduce PM PME support

2026-09-16T14:15:00+00:00

Introduce PME support for PME capable devices. Whether device is PME capable is assessed during PCI probe routine. And the whether PME is enabled for a specific context is assessed during the PM runtime suspend call if the device is PME capable. If the PME is enabled, HPDs can generate PME which in turn call the runtime resume call and do the wakeup routines. Till now the driver was relying on HPD polling to wakeup in case of any HPDs. HPD polling can be avoided in platforms with PME support and instead rely on this PCI PME for HPD induced wakeup. v2: access functions for xe.pme.enabled status and clear the pme. enabled in case of error in xe_pm_runtime_suspend() v3: use the local pme_enabled flag to clear the device wakeup incase of error v4: call the devm_device_init_wakeup() only if device is PME capable to avoid false wakeup capable reporting in platforms where PME is not supported. Squash the patch which handled the lockdep deadlock handling Bspec: 52979, 52980, 68857, 68867, 68970 Assisted-by: GitHub_Copilot:claude-opus-5 Signed-off-by: Vinod Govindapillai Reviewed-by: Jouni Högander Link: https://patch.msgid.link/20260915092518.639448-2-vinod.govindapillai@intel.com Signed-off-by: Rodrigo Vivi

drm/xe/nvm: add system controller region

2026-09-16T12:45:32+00:00

Add region 5 (System Controller) to the list of regions available on device. Signed-off-by: Alexander Usyskin Reviewed-by: Rodrigo Vivi Link: https://patch.msgid.link/20260914-nvm_add_sysctl_region-v1-1-75d710daf5d0@intel.com Signed-off-by: Rodrigo Vivi

drm/xe/pf: Add _locked variant of the fair sched config function

2026-09-14T16:50:28+00:00

We will soon want to auto provision all VFs in a single step, while already holding the master mutex. Split existing function into two. Signed-off-by: Michal Wajdeczko Reviewed-by: Piotr Piórkowski Link: https://patch.msgid.link/20260911183257.14999-4-michal.wajdeczko@intel.com

drm/xe/pf: Add _locked variant of the release config function

2026-09-14T16:50:27+00:00

We will soon want to unprovision all VFs in a single step, while already holding the master mutex. Split existing function into two. Signed-off-by: Michal Wajdeczko Reviewed-by: Piotr Piórkowski Link: https://patch.msgid.link/20260911183257.14999-3-michal.wajdeczko@intel.com

drm/xe/pf: Add _locked variant of the priority config function

2026-09-14T16:50:26+00:00

We will soon want to provision VFs in a single step, while already holding the master mutex. Split existing function into two. Signed-off-by: Michal Wajdeczko Reviewed-by: Piotr Piórkowski Link: https://patch.msgid.link/20260911183257.14999-2-michal.wajdeczko@intel.com