From: Dave Airlie <airlied@redhat.com>
Date: Fri, 10 Jan 2025 04:24:17 +0000 (+1000)
Subject: Merge tag 'v6.13-rc6' into drm-next
X-Git-Tag: v6.14-rc1~174^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6001870edeabf0f7bc0460303d0cdbb9f0b3bc4;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'v6.13-rc6' into drm-next

This backmerges Linux 6.13-rc6 this is need for the newer pulls.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

f6001870edeabf0f7bc0460303d0cdbb9f0b3bc4
diff --cc drivers/gpu/drm/xe/xe_exec_queue.c
index 8948f50ee58ff,268cd3123be9d..7e1abbbfba121
--- a/drivers/gpu/drm/xe/xe_exec_queue.c
+++ b/drivers/gpu/drm/xe/xe_exec_queue.c
@@@ -784,7 -780,9 +784,6 @@@ void xe_exec_queue_update_run_ticks(str
  	/* Synchronize with unbind while holding the xe file open */
  	if (!drm_dev_enter(&xe->drm, &idx))
  		return;
 -
 -	xef = q->vm->xef;
--
  	/*
  	 * Only sample the first LRC. For parallel submission, all of them are
  	 * scheduled together and we compensate that below by multiplying by