Skip to content
Snippets Groups Projects
Commit deda064a authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Closes: #245
parent f282448c
No related branches found
No related tags found
1 merge request!344Latest rev of upstreaming prep
...@@ -70,8 +70,9 @@ __intel_de_wait_for_register(struct drm_i915_private *i915, i915_reg_t reg, ...@@ -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 fast_timeout_us,
unsigned int slow_timeout_ms, u32 *out_value) unsigned int slow_timeout_ms, u32 *out_value)
{ {
return wait_for_atomic(((*out_value = xe_mmio_read32(to_gt(i915), reg.reg)) & mask) == value, return xe_mmio_wait32(to_gt(i915), reg.reg, value, mask,
slow_timeout_ms); fast_timeout_us + 1000 * slow_timeout_ms,
out_value, false);
} }
static inline int static inline int
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment