From 29c0b3721609be414da8c11a2e3dc92f3cc3f9ed Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Mon, 18 Feb 2013 19:00:24 -0300 Subject: [PATCH] --- yaml --- r: 371155 b: refs/heads/master c: b90f517627f76640e0f6d2aa17f143dc10623a58 h: refs/heads/master i: 371153: d6be0629315d0bf2730e29f840004ad87199f8bd 371151: e414a1a75bec36438191f5817dcb594b481a227c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1f64a5424f49..708013120889 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22b8bf17c6c1db887e3e9adb0778d6f03e621e66 +refs/heads/master: b90f517627f76640e0f6d2aa17f143dc10623a58 diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c index 770ec90e37a5..00bc79f03039 100644 --- a/trunk/drivers/gpu/drm/i915/intel_dp.c +++ b/trunk/drivers/gpu/drm/i915/intel_dp.c @@ -353,7 +353,8 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp, bool has_aux_irq) #define C (((status = I915_READ_NOTRACE(ch_ctl)) & DP_AUX_CH_CTL_SEND_BUSY) == 0) if (has_aux_irq) - done = wait_event_timeout(dev_priv->gmbus_wait_queue, C, 10); + done = wait_event_timeout(dev_priv->gmbus_wait_queue, C, + msecs_to_jiffies(10)); else done = wait_for_atomic(C, 10) == 0; if (!done)