diff options
| author | Imre Deak <[email protected]> | 2016-06-28 13:37:33 +0300 |
|---|---|---|
| committer | Jani Nikula <[email protected]> | 2016-06-29 11:18:16 +0300 |
| commit | ba34a65324259082dc6d2924cb82d562db1c6a6b (patch) | |
| tree | c1c00ace2b80e4d9a46f67962dd5f2ce834c70a5 | |
| parent | fa7c13e5b1e2076b0ec716ed584ab76f9e65b7a6 (diff) | |
drm/i915: Avoid early timeout during AUX transfers
Since wait_for_atomic doesn't re-check the wait-for condition after
expiry of the timeout it can fail when called from non-atomic context
even if the condition is set correctly before the expiry. Fix this by
using the non-atomic wait_for instead.
Due to the relatively long 10ms timeout, probably this didn't cause any
real problems, but fix it in any case for consistency.
Fixes: 0351b93992aa ("drm/i915: Do not lie about atomic timeout granularity")
CC: Chris Wilson <[email protected]>
CC: Tvrtko Ursulin <[email protected]>
Signed-off-by: Imre Deak <[email protected]>
Reviewed-by: Tvrtko Ursulin <[email protected]>
CC: [email protected]
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
(cherry picked from commit 713a6b668932213247b394559bc229cd0fec2777)
Signed-off-by: Jani Nikula <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 49c582d9eb5a..40745e38d438 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -663,7 +663,7 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp, bool has_aux_irq) done = wait_event_timeout(dev_priv->gmbus_wait_queue, C, msecs_to_jiffies_timeout(10)); else - done = wait_for_atomic(C, 10) == 0; + done = wait_for(C, 10) == 0; if (!done) DRM_ERROR("dp aux hw did not signal timeout (has irq: %i)!\n", has_aux_irq); |