Hi Folks,

This is an incorrect merge resolution followed by the patch already been applied.

Please skip this patch.

Thanks, Thomas

On Tue, 2025-12-16 at 12:09 +0100, Greg Kroah-Hartman wrote:

6.18-stable review patch.  If anyone has any objections, please let me know.

---

From: Matthew Brost matthew.brost@intel.com

[ Upstream commit adda4e855ab6409a3edaa585293f1f2069ab7299 ]

Prevent application hangs caused by out-of-order fence signaling when user fences are attached. Use drm_syncobj (via dma-fence-chain) to guarantee that each user fence signals in order, regardless of the signaling order of the attached fences. Ensure user fence writebacks to user space occur in the correct sequence.

v7:  - Skip drm_syncbj create of error (CI)

Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") Signed-off-by: Matthew Brost matthew.brost@intel.com Reviewed-by: Thomas Hellström thomas.hellstrom@linux.intel.com Link: https://patch.msgid.link/20251031234050.3043507-2-matthew.brost@intel.com Signed-off-by: Sasha Levin sashal@kernel.org

---

drivers/gpu/drm/xe/xe_exec_queue.c | 3 +++  1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c index cb5f204c08ed6..a6efe4e8ab556 100644 --- a/drivers/gpu/drm/xe/xe_exec_queue.c +++ b/drivers/gpu/drm/xe/xe_exec_queue.c @@ -344,6 +344,9 @@ void xe_exec_queue_destroy(struct kref *ref)   struct xe_exec_queue *q = container_of(ref, struct xe_exec_queue, refcount);   struct xe_exec_queue *eq, *next;

• if (q->ufence_syncobj)

• drm_syncobj_put(q->ufence_syncobj);
  

if (q->ufence_syncobj)   drm_syncobj_put(q->ufence_syncobj);