From 171185e6731995e76005276d2ed762e3ca34a41e Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Tue, 7 Apr 2026 09:57:46 +0000
Subject: [PATCH] drm/i915: Order OP vs. timeout correctly in __wait_for()

From Ville Syrjala
859b14e0be9e7b0f26630510d337413c7747be51 in linux-6.18.y/6.18.21
6ad2a661ff0d3d94884947d2a593311ba46d34c2 in mainline linux
---
 sys/dev/pci/drm/i915/i915_wait_util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/dev/pci/drm/i915/i915_wait_util.h b/sys/dev/pci/drm/i915/i915_wait_util.h
index 7376898e3bf..e1ed7921ec7 100644
--- a/sys/dev/pci/drm/i915/i915_wait_util.h
+++ b/sys/dev/pci/drm/i915/i915_wait_util.h
@@ -25,9 +25,9 @@
 	might_sleep();							\
 	for (;;) {							\
 		const bool expired__ = ktime_after(ktime_get_raw(), end__); \
-		OP;							\
 		/* Guarantee COND check prior to timeout */		\
 		barrier();						\
+		OP;							\
 		if (COND) {						\
 			ret__ = 0;					\
 			break;						\