Commit 6d15a83a authored by Imre Deak's avatar Imre Deak Committed by Greg Kroah-Hartman

drm/i915/gen9: Fix PCODE polling timeout in stable backport

The backport of
2c7d0602 - "Fix PCODE polling during CDCLK change notification"
to the 4.9 stable tree used an incorrect timeout value. Fix this up
so the backport matches the upstream commit.
Reported-by: default avatarThomas Backlund <tmb@mageia.org>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9297e0c1
...@@ -8015,14 +8015,14 @@ int skl_pcode_request(struct drm_i915_private *dev_priv, u32 mbox, u32 request, ...@@ -8015,14 +8015,14 @@ int skl_pcode_request(struct drm_i915_private *dev_priv, u32 mbox, u32 request,
* worst case) _and_ PCODE was busy for some reason even after a * worst case) _and_ PCODE was busy for some reason even after a
* (queued) request and @timeout_base_ms delay. As a workaround retry * (queued) request and @timeout_base_ms delay. As a workaround retry
* the poll with preemption disabled to maximize the number of * the poll with preemption disabled to maximize the number of
* requests. Increase the timeout from @timeout_base_ms to 50ms to * requests. Increase the timeout from @timeout_base_ms to 10ms to
* account for interrupts that could reduce the number of these * account for interrupts that could reduce the number of these
* requests. * requests.
*/ */
DRM_DEBUG_KMS("PCODE timeout, retrying with preemption disabled\n"); DRM_DEBUG_KMS("PCODE timeout, retrying with preemption disabled\n");
WARN_ON_ONCE(timeout_base_ms > 3); WARN_ON_ONCE(timeout_base_ms > 3);
preempt_disable(); preempt_disable();
ret = wait_for_atomic(COND, 50); ret = wait_for_atomic(COND, 10);
preempt_enable(); preempt_enable();
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment