From deda064afa256e6b17df158fbfd7afcedc264f92 Mon Sep 17 00:00:00 2001
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date: Mon, 24 Apr 2023 15:01:48 +0200
Subject: [PATCH] fixup! drm/xe/display: Implement display support
drm/xe: Fixup small bug in xe_de.h
In display it's not called from irq context, so use xe_mmio_wait32 with
atomic = false. This fixes a splat and the need for i915_utils.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/245
---
drivers/gpu/drm/xe/display/xe_de.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/xe/display/xe_de.h b/drivers/gpu/drm/xe/display/xe_de.h
index 000379f8702e..0c76b0d24d96 100644
--- a/drivers/gpu/drm/xe/display/xe_de.h
+++ b/drivers/gpu/drm/xe/display/xe_de.h
@@ -70,8 +70,9 @@ __intel_de_wait_for_register(struct drm_i915_private *i915, i915_reg_t reg,
unsigned int fast_timeout_us,
unsigned int slow_timeout_ms, u32 *out_value)
{
- return wait_for_atomic(((*out_value = xe_mmio_read32(to_gt(i915), reg.reg)) & mask) == value,
- slow_timeout_ms);
+ return xe_mmio_wait32(to_gt(i915), reg.reg, value, mask,
+ fast_timeout_us + 1000 * slow_timeout_ms,
+ out_value, false);
}
static inline int
--
GitLab